[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-hook.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-hook.el,v |
Date: |
Wed, 05 Mar 2008 08:51:06 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/03/05 08:51:06
Index: ediff-hook.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-hook.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- ediff-hook.el 5 Mar 2008 04:09:24 -0000 1.36
+++ ediff-hook.el 5 Mar 2008 08:51:06 -0000 1.37
@@ -45,28 +45,15 @@
;; end pacifier
;; allow menus to be set up without ediff-wind.el being loaded
-;;;###autoload
(defvar ediff-window-setup-function)
-;; This macro is used to avoid compilation warnings.
-;; The macro will expand into the form that is appropriate to the
-;; compiler at hand (emacs or xemacs).
-;; The autoload, below, is useless in Emacs because ediff-hook.el
-;; is dumped with emacs, but it is needed in XEmacs
-;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form
emacs-form) (if (featurep 'xemacs) xemacs-form emacs-form))
-
-(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
- (if (featurep 'xemacs)
- xemacs-form emacs-form))
-
;; This autoload is useless in Emacs because ediff-hook.el is dumped with
;; emacs, but it is needed in XEmacs
;;;###autoload
-(ediff-cond-compile-for-xemacs-or-emacs
+(if (featurep 'xemacs)
;; xemacs form
(defun ediff-xemacs-init-menus ()
- (if (featurep 'menubar)
- (progn
+ (when (featurep 'menubar)
(add-submenu
'("Tools") ediff-menu "OO-Browser...")
(add-submenu
@@ -78,14 +65,12 @@
(add-menu-button
'("Tools") "-------" "OO-Browser...")
)))
- nil ; emacs form
- )
;; This autoload is useless in Emacs because ediff-hook.el is dumped with
;; emacs, but it is needed in XEmacs
;;;###autoload
-(ediff-cond-compile-for-xemacs-or-emacs
+(if (featurep 'xemacs)
(progn
(defvar ediff-menu
'("Compare"
@@ -146,16 +131,13 @@
ediff-toggle-use-toolbar
:style toggle
:selected (if (featurep 'ediff-tbar)
- (ediff-use-toolbar-p))]
- ))
+ (ediff-use-toolbar-p))]))
;; put these menus before Object-Oriented-Browser in Tools menu
(if (and (featurep 'menubar) (not (featurep 'infodock))
(not (featurep 'ediff-hook)))
(ediff-xemacs-init-menus)))
-
;; Emacs
- (progn
;; initialize menu bar keymaps
(defvar menu-bar-ediff-misc-menu
(make-sparse-keymap "Ediff Miscellanea"))
@@ -249,9 +231,7 @@
(define-key menu-bar-ediff-misc-menu [ediff-cust]
'("Customize Ediff" . ediff-customize))
(define-key menu-bar-ediff-misc-menu [ediff-doc]
- '("Ediff Manual" . ediff-documentation))
- ) ; emacs case
- ) ; ediff-cond-compile-for-xemacs-or-emacs
+ '("Ediff Manual" . ediff-documentation)))
;; arrange for autoloads
(if purify-flag