Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-help.el @ 14:9ee227acff29 r19-15b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents bcdc7deadc19
children 0293115a14e9
comparison
equal deleted inserted replaced
13:13c6d0aaafe5 14:9ee227acff29
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22 ;; Boston, MA 02111-1307, USA. 22 ;; Boston, MA 02111-1307, USA.
23 23
24 ;;; Code: 24 ;;; Code:
25 25
26 (require 'ediff-init) 26 (provide 'ediff-help)
27 27
28 ;; Compiler pacifier start 28 ;; Compiler pacifier start
29 (defvar ediff-multiframe) 29 (defvar ediff-multiframe)
30 (and noninteractive 30
31 (eval-when-compile 31 (eval-when-compile
32 (let ((load-path (cons (expand-file-name ".") load-path))) 32 (let ((load-path (cons "." load-path)))
33 (load-file "ediff-init.el")))) 33 (or (featurep 'ediff-init)
34 (load "ediff-init.el" nil nil 'nosuffix))
35 ))
34 ;; end pacifier 36 ;; end pacifier
37
38 (require 'ediff-init)
35 39
36 ;; Help messages 40 ;; Help messages
37 41
38 (defconst ediff-long-help-message-head 42 (defconst ediff-long-help-message-head
39 " Move around | Toggle features | Manipulate 43 " Move around | Toggle features | Manipulate
176 180
177 (defun ediff-help-for-quick-help () 181 (defun ediff-help-for-quick-help ()
178 "Explain Ediff commands in more detail." 182 "Explain Ediff commands in more detail."
179 (interactive) 183 (interactive)
180 (ediff-barf-if-not-control-buffer) 184 (ediff-barf-if-not-control-buffer)
181 (let ((ctl-buf (current-buffer)) 185 (let ((pos (ediff-event-point last-command-event))
182 (pos (ediff-event-point last-command-event))
183 overl cmd) 186 overl cmd)
184 187
185 (if ediff-xemacs-p 188 (if ediff-xemacs-p
186 (setq overl (extent-at pos (current-buffer) 'ediff-help-info) 189 (setq overl (extent-at pos (current-buffer) 'ediff-help-info)
187 cmd (ediff-overlay-get overl 'ediff-help-info)) 190 cmd (ediff-overlay-get overl 'ediff-help-info))
304 (setq ediff-help-message (if ediff-use-long-help-message 307 (setq ediff-help-message (if ediff-use-long-help-message
305 ediff-long-help-message 308 ediff-long-help-message
306 ediff-brief-help-message)) 309 ediff-brief-help-message))
307 (run-hooks 'ediff-display-help-hook)) 310 (run-hooks 'ediff-display-help-hook))
308 311
309 (provide 'ediff-help)
310 312
311 ;;; ediff-help.el ends here 313 ;;; ediff-help.el ends here