/[emacs]/emacs/lisp/ediff-hook.el
ViewVC logotype

Diff of /emacs/lisp/ediff-hook.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.18 by kifer, Tue Jan 8 16:32:10 2002 UTC revision 1.19 by rms, Fri Feb 1 04:16:02 2002 UTC
# Line 44  Line 44 
44  ;; end pacifier  ;; end pacifier
45    
46  ;; allow menus to be set up without ediff-wind.el being loaded  ;; allow menus to be set up without ediff-wind.el being loaded
 ;;;###autoload  
47  (defvar ediff-window-setup-function)  (defvar ediff-window-setup-function)
48    
49  ;; This is used to avoid compilation warnings. When emacs/xemacs forms can  ;; This is used to avoid compilation warnings. When emacs/xemacs forms can
# Line 52  Line 51 
51  ;; In this case, the macro will expand into the form that is appropriate to the  ;; In this case, the macro will expand into the form that is appropriate to the
52  ;; compiler at hand.  ;; compiler at hand.
53  ;; Suggested by rms.  ;; Suggested by rms.
 ;;;###autoload  
54  (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)  (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
55    (if (string-match "XEmacs" emacs-version)    (if (string-match "XEmacs" emacs-version)
56        xemacs-form emacs-form))        xemacs-form emacs-form))
# Line 60  Line 58 
58  ;; Note we wrap this in a progn so that we pick up the whole def  ;; Note we wrap this in a progn so that we pick up the whole def
59  ;; for auto-autoload. That way we do not load ediff-hook.el when defining  ;; for auto-autoload. That way we do not load ediff-hook.el when defining
60  ;; the menus.  ;; the menus.
 ;;;###autoload  
61  (progn  (progn
62    (ediff-cond-compile-for-xemacs-or-emacs    (ediff-cond-compile-for-xemacs-or-emacs
63     ;; xemacs form     ;; xemacs form
# Line 82  Line 79 
79     ))     ))
80    
81    
 ;;;###autoload  
82  (ediff-cond-compile-for-xemacs-or-emacs  (ediff-cond-compile-for-xemacs-or-emacs
83   (progn   (progn
84     (defvar ediff-menu     (defvar ediff-menu

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26