;;; ediff-hook.el --- setup for Ediff's menus and autoloads
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
:style toggle
:selected (if (featurep 'ediff-tbar)
(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)))
(symbol-value 'menu-bar-ediff-merge-menu))
(defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
(fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
-
- ;; define ediff-menu
+
+ ;; define ediff compare menu
+ (define-key menu-bar-ediff-menu [ediff-misc]
+ `(menu-item ,(purecopy "Ediff Miscellanea") menu-bar-ediff-misc-menu))
+ (define-key menu-bar-ediff-menu [separator-ediff-misc] menu-bar-separator)
(define-key menu-bar-ediff-menu [window]
- '("This Window and Next Window" . compare-windows))
+ `(menu-item ,(purecopy "This Window and Next Window") compare-windows
+ :help ,(purecopy "Compare the current window and the next window")))
(define-key menu-bar-ediff-menu [ediff-windows-linewise]
- '("Windows Line-by-line..." . ediff-windows-linewise))
+ `(menu-item ,(purecopy "Windows Line-by-line...") ediff-windows-linewise
+ :help ,(purecopy "Compare windows line-wise")))
(define-key menu-bar-ediff-menu [ediff-windows-wordwise]
- '("Windows Word-by-word..." . ediff-windows-wordwise))
- (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
+ `(menu-item ,(purecopy "Windows Word-by-word...") ediff-windows-wordwise
+ :help ,(purecopy "Compare windows word-wise")))
+ (define-key menu-bar-ediff-menu [separator-ediff-windows] menu-bar-separator)
(define-key menu-bar-ediff-menu [ediff-regions-linewise]
- '("Regions Line-by-line..." . ediff-regions-linewise))
+ `(menu-item ,(purecopy "Regions Line-by-line...") ediff-regions-linewise
+ :help ,(purecopy "Compare regions line-wise")))
(define-key menu-bar-ediff-menu [ediff-regions-wordwise]
- '("Regions Word-by-word..." . ediff-regions-wordwise))
- (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
+ `(menu-item ,(purecopy "Regions Word-by-word...") ediff-regions-wordwise
+ :help ,(purecopy "Compare regions word-wise")))
+ (define-key menu-bar-ediff-menu [separator-ediff-regions] menu-bar-separator)
(define-key menu-bar-ediff-menu [ediff-dir-revision]
- '("Directory Revisions..." . ediff-directory-revisions))
+ `(menu-item ,(purecopy "Directory Revisions...") ediff-directory-revisions
+ :help ,(purecopy "Compare directory files with their older versions")))
(define-key menu-bar-ediff-menu [ediff-revision]
- '("File with Revision..." . ediff-revision))
- (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
+ `(menu-item ,(purecopy "File with Revision...") ediff-revision
+ :help ,(purecopy "Compare file with its older versions")))
+ (define-key menu-bar-ediff-menu [separator-ediff-directories] menu-bar-separator)
(define-key menu-bar-ediff-menu [ediff-directories3]
- '("Three Directories..." . ediff-directories3))
+ `(menu-item ,(purecopy "Three Directories...") ediff-directories3
+ :help ,(purecopy "Compare files common to three directories simultaneously")))
(define-key menu-bar-ediff-menu [ediff-directories]
- '("Two Directories..." . ediff-directories))
- (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
+ `(menu-item ,(purecopy "Two Directories...") ediff-directories
+ :help ,(purecopy "Compare files common to two directories simultaneously")))
+ (define-key menu-bar-ediff-menu [separator-ediff-files] menu-bar-separator)
(define-key menu-bar-ediff-menu [ediff-buffers3]
- '("Three Buffers..." . ediff-buffers3))
+ `(menu-item ,(purecopy "Three Buffers...") ediff-buffers3
+ :help ,(purecopy "Compare three buffers simultaneously")))
(define-key menu-bar-ediff-menu [ediff-files3]
- '("Three Files..." . ediff-files3))
+ `(menu-item ,(purecopy "Three Files...") ediff-files3
+ :help ,(purecopy "Compare three files simultaneously")))
(define-key menu-bar-ediff-menu [ediff-buffers]
- '("Two Buffers..." . ediff-buffers))
+ `(menu-item ,(purecopy "Two Buffers...") ediff-buffers
+ :help ,(purecopy "Compare two buffers simultaneously")))
(define-key menu-bar-ediff-menu [ediff-files]
- '("Two Files..." . ediff-files))
+ `(menu-item ,(purecopy "Two Files...") ediff-files
+ :help ,(purecopy "Compare two files simultaneously")))
- ;; define merge menu
+ ;; define ediff merge menu
(define-key
menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
- '("Directory Revisions with Ancestor..."
- . ediff-merge-directory-revisions-with-ancestor))
+ `(menu-item ,(purecopy "Directory Revisions with Ancestor...")
+ ediff-merge-directory-revisions-with-ancestor
+ :help ,(purecopy "Merge versions of the files in the same directory by comparing the files with common ancestors")))
(define-key
menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
- '("Directory Revisions..." . ediff-merge-directory-revisions))
+ `(menu-item ,(purecopy "Directory Revisions...") ediff-merge-directory-revisions
+ :help ,(purecopy "Merge versions of the files in the same directory (without using ancestor information)")))
(define-key
menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
- '("Revisions with Ancestor..."
- . ediff-merge-revisions-with-ancestor))
+ `(menu-item ,(purecopy "Revisions with Ancestor...")
+ ediff-merge-revisions-with-ancestor
+ :help ,(purecopy "Merge versions of the same file by comparing them with a common ancestor")))
(define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
- '("Revisions..." . ediff-merge-revisions))
- (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
+ `(menu-item ,(purecopy "Revisions...") ediff-merge-revisions
+ :help ,(purecopy "Merge versions of the same file (without using ancestor information)")))
+ (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] menu-bar-separator)
(define-key
menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
- '("Directories with Ancestor..."
- . ediff-merge-directories-with-ancestor))
+ `(menu-item ,(purecopy "Directories with Ancestor...")
+ ediff-merge-directories-with-ancestor
+ :help ,(purecopy "Merge files common to a pair of directories by comparing the files with common ancestors")))
(define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
- '("Directories..." . ediff-merge-directories))
+ `(menu-item ,(purecopy "Directories...") ediff-merge-directories
+ :help ,(purecopy "Merge files common to a pair of directories")))
(define-key
- menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
+ menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] menu-bar-separator)
(define-key
menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
- '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
+ `(menu-item ,(purecopy "Buffers with Ancestor...") ediff-merge-buffers-with-ancestor
+ :help ,(purecopy "Merge buffers by comparing their contents with a common ancestor")))
(define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
- '("Buffers..." . ediff-merge-buffers))
+ `(menu-item ,(purecopy "Buffers...") ediff-merge-buffers
+ :help ,(purecopy "Merge buffers (without using ancestor information)")))
(define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
- '("Files with Ancestor..." . ediff-merge-files-with-ancestor))
+ `(menu-item ,(purecopy "Files with Ancestor...") ediff-merge-files-with-ancestor
+ :help ,(purecopy "Merge files by comparing them with a common ancestor")))
(define-key menu-bar-ediff-merge-menu [ediff-merge-files]
- '("Files..." . ediff-merge-files))
+ `(menu-item ,(purecopy "Files...") ediff-merge-files
+ :help ,(purecopy "Merge files (without using ancestor information)")))
;; define epatch menu
(define-key menu-bar-epatch-menu [ediff-patch-buffer]
- '("To a Buffer..." . ediff-patch-buffer))
+ `(menu-item ,(purecopy "To a Buffer...") ediff-patch-buffer
+ :help ,(purecopy "Apply a patch to the contents of a buffer")))
(define-key menu-bar-epatch-menu [ediff-patch-file]
- '("To a File..." . ediff-patch-file))
+ `(menu-item ,(purecopy "To a File...") ediff-patch-file
+ :help ,(purecopy "Apply a patch to a file")))
;; define ediff miscellanea
(define-key menu-bar-ediff-misc-menu [emultiframe]
- '("Toggle use of separate control buffer frame"
- . ediff-toggle-multiframe))
+ `(menu-item ,(purecopy "Use separate control buffer frame")
+ ediff-toggle-multiframe
+ :help ,(purecopy "Switch between the single-frame presentation mode and the multi-frame mode")))
(define-key menu-bar-ediff-misc-menu [eregistry]
- '("List Ediff Sessions" . ediff-show-registry))
+ `(menu-item ,(purecopy "List Ediff Sessions") ediff-show-registry
+ :help ,(purecopy "List all active Ediff sessions; it is a convenient way to find and resume such a session")))
(define-key menu-bar-ediff-misc-menu [ediff-cust]
- '("Customize Ediff" . ediff-customize))
+ `(menu-item ,(purecopy "Customize Ediff") ediff-customize
+ :help ,(purecopy "Change some of the parameters that govern the behavior of Ediff")))
(define-key menu-bar-ediff-misc-menu [ediff-doc]
- '("Ediff Manual" . ediff-documentation)))
+ `(menu-item ,(purecopy "Ediff Manual") ediff-documentation
+ :help ,(purecopy "Bring up the Ediff manual"))))
(provide 'ediff-hook)