;;; ediff-hook.el --- setup for Ediff's menus and autoloads
-;;; Copyright (C) 1995 Free Software Foundation, Inc.
+
+;; Copyright (C) 1995 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.sunysb.edu>
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+;;; Code:
-;;; These must be placed in menu-bar.el in Emacs
+;; These must be placed in menu-bar.el in Emacs
;;
;; (define-key menu-bar-tools-menu [eregistry]
;; '("List Ediff Sessions" . ediff-show-registry))
(cond ((string-match "XEmacs" emacs-version)
(defvar ediff-menu
'("Compare"
- ["Two Files ..." ediff-files t]
- ["Two Buffers ..." ediff-buffers t]
- ["Three Files ..." ediff-files3 t]
- ["Three Buffers ..." ediff-buffers3 t]
+ ["Two Files..." ediff-files t]
+ ["Two Buffers..." ediff-buffers t]
+ ["Three Files..." ediff-files3 t]
+ ["Three Buffers..." ediff-buffers3 t]
"---"
- ["Two Directories ..." ediff-directories t]
- ["Three Directories ..." ediff-directories3 t]
+ ["Two Directories..." ediff-directories t]
+ ["Three Directories..." ediff-directories3 t]
"---"
- ["File with Revision ..." ediff-revision t]
- ["Directory Revisions ..." ediff-directory-revisions t]
+ ["File with Revision..." ediff-revision t]
+ ["Directory Revisions..." ediff-directory-revisions t]
"---"
- ["Windows Word-by-word ..." ediff-windows-wordwise t]
- ["Windows Line-by-line ..." ediff-windows-linewise t]
+ ["Windows Word-by-word..." ediff-windows-wordwise t]
+ ["Windows Line-by-line..." ediff-windows-linewise t]
"---"
- ["Regions Word-by-word ..." ediff-regions-wordwise t]
- ["Regions Line-by-line ..." ediff-regions-linewise t]))
+ ["Regions Word-by-word..." ediff-regions-wordwise t]
+ ["Regions Line-by-line..." ediff-regions-linewise t]))
(defvar ediff-merge-menu
'("Merge"
- ["Files ..." ediff-merge-files t]
- ["Files with Ancestor ..." ediff-merge-files-with-ancestor t]
- ["Buffers ..." ediff-merge-buffers t]
- ["Buffers with Ancestor ..."
+ ["Files..." ediff-merge-files t]
+ ["Files with Ancestor..." ediff-merge-files-with-ancestor t]
+ ["Buffers..." ediff-merge-buffers t]
+ ["Buffers with Ancestor..."
ediff-merge-buffers-with-ancestor t]
"---"
- ["Directories ..." ediff-merge-directories t]
- ["Directories with Ancestor ..."
+ ["Directories..." ediff-merge-directories t]
+ ["Directories with Ancestor..."
ediff-merge-directories-with-ancestor t]
"---"
- ["Revisions ..." ediff-merge-revisions t]
- ["Revisions with Ancestor ..."
+ ["Revisions..." ediff-merge-revisions t]
+ ["Revisions with Ancestor..."
ediff-merge-revisions-with-ancestor t]
- ["Directory Revisions ..." ediff-merge-directory-revisions t]
- ["Directory Revisions with Ancestor ..."
+ ["Directory Revisions..." ediff-merge-directory-revisions t]
+ ["Directory Revisions with Ancestor..."
ediff-merge-directory-revisions-with-ancestor t]))
(defvar epatch-menu
'("Apply Patch"
- ["To a file ..." ediff-patch-file t]
- ["To a buffer ..." ediff-patch-buffer t]))
+ ["To a file..." ediff-patch-file t]
+ ["To a buffer..." ediff-patch-buffer t]))
;; put these menus before Object-Oriented-Browser in Tools menu
(add-hook 'before-init-hook 'ediff-xemacs-init-menus)
(define-key menu-bar-ediff-menu [window]
'("This Window And Next Window" . compare-windows))
(define-key menu-bar-ediff-menu [ediff-dir-revision]
- '("Directory Revisions ..." . ediff-directory-revisions))
+ '("Directory Revisions..." . ediff-directory-revisions))
(define-key menu-bar-ediff-menu [ediff-revision]
- '("File with Revision ..." . ediff-revision))
+ '("File with Revision..." . ediff-revision))
(define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
(define-key menu-bar-ediff-menu [ediff-directories3]
- '("Three Directories ..." . ediff-directories3))
+ '("Three Directories..." . ediff-directories3))
(define-key menu-bar-ediff-menu [ediff-directories]
- '("Two Directories ..." . ediff-directories))
+ '("Two Directories..." . ediff-directories))
(define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
(define-key menu-bar-ediff-menu [ediff-buffers3]
- '("Three Buffers ..." . ediff-buffers3))
+ '("Three Buffers..." . ediff-buffers3))
(define-key menu-bar-ediff-menu [ediff-files3]
- '("Three Files ..." . ediff-files3))
+ '("Three Files..." . ediff-files3))
(define-key menu-bar-ediff-menu [ediff-buffers]
- '("Two Buffers ..." . ediff-buffers))
+ '("Two Buffers..." . ediff-buffers))
(define-key menu-bar-ediff-menu [ediff-files]
- '("Two Files ..." . ediff-files))
+ '("Two Files..." . ediff-files))
(define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
(define-key menu-bar-ediff-menu [ediff-regions-linewise]
- '("Regions Line-by-line ..." . ediff-regions-linewise))
+ '("Regions Line-by-line..." . ediff-regions-linewise))
(define-key menu-bar-ediff-menu [ediff-regions-wordwise]
- '("Regions Word-by-word ..." . ediff-regions-wordwise))
+ '("Regions Word-by-word..." . ediff-regions-wordwise))
(define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
(define-key menu-bar-ediff-menu [ediff-windows-linewise]
- '("Windows Line-by-line ..." . ediff-windows-linewise))
+ '("Windows Line-by-line..." . ediff-windows-linewise))
(define-key menu-bar-ediff-menu [ediff-windows-wordwise]
- '("Windows Word-by-word ..." . ediff-windows-wordwise))
+ '("Windows Word-by-word..." . ediff-windows-wordwise))
;; define merge menu
(define-key
menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
- '("Directory Revisions with Ancestor ..."
+ '("Directory Revisions with Ancestor..."
. ediff-merge-directory-revisions-with-ancestor))
(define-key
menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
- '("Directory Revisions ..." . ediff-merge-directory-revisions))
+ '("Directory Revisions..." . ediff-merge-directory-revisions))
(define-key
menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
- '("Revisions with Ancestor ..."
+ '("Revisions with Ancestor..."
. ediff-merge-revisions-with-ancestor))
(define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
- '("Revisions ..." . ediff-merge-revisions))
+ '("Revisions..." . ediff-merge-revisions))
(define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
(define-key
menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
- '("Directories with Ancestor ..."
+ '("Directories with Ancestor..."
. ediff-merge-directories-with-ancestor))
(define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
- '("Directories ..." . ediff-merge-directories))
+ '("Directories..." . ediff-merge-directories))
(define-key
menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
(define-key
menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
- '("Buffers with Ancestor ..." . ediff-merge-buffers-with-ancestor))
+ '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
(define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
- '("Buffers ..." . ediff-merge-buffers))
+ '("Buffers..." . ediff-merge-buffers))
(define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
- '("Files with Ancestor ..." . ediff-merge-files-with-ancestor))
+ '("Files with Ancestor..." . ediff-merge-files-with-ancestor))
(define-key menu-bar-ediff-merge-menu [ediff-merge-files]
- '("Files ..." . ediff-merge-files))
+ '("Files..." . ediff-merge-files))
;; define epatch menu
(define-key menu-bar-epatch-menu [ediff-patch-buffer]
- '("To a Buffer ..." . ediff-patch-buffer))
+ '("To a Buffer..." . ediff-patch-buffer))
(define-key menu-bar-epatch-menu [ediff-patch-file]
- '("To a File ..." . ediff-patch-file)))
+ '("To a File..." . ediff-patch-file)))
) ; cond
HCoop / bpt / emacs.git / blobdiff