]> code.delx.au - gnu-emacs/blobdiff - lisp/ediff-hook.el
Fix comment for bug#5345.
[gnu-emacs] / lisp / ediff-hook.el
index ce950cd1a93a671aa0051f7048cbb6011b1666f5..390538ed009f87f8d2e540bd290223ee96556584 100644 (file)
@@ -1,7 +1,7 @@
 ;;; 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, 2009 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
   ;; 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] '("--"))
+  (define-key menu-bar-ediff-menu [separator-ediff-misc] menu-bar-separator)
   (define-key menu-bar-ediff-menu [window]
     `(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-wordwise]
     `(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] '("--"))
+  (define-key menu-bar-ediff-menu [separator-ediff-windows] menu-bar-separator)
   (define-key menu-bar-ediff-menu [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]
     `(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] '("--"))
+  (define-key menu-bar-ediff-menu [separator-ediff-regions] menu-bar-separator)
   (define-key menu-bar-ediff-menu [ediff-dir-revision]
     `(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]
     `(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] '("--"))
+  (define-key menu-bar-ediff-menu [separator-ediff-directories] menu-bar-separator)
   (define-key menu-bar-ediff-menu [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]
     `(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] '("--"))
+  (define-key menu-bar-ediff-menu [separator-ediff-files] menu-bar-separator)
   (define-key menu-bar-ediff-menu [ediff-buffers3]
     `(menu-item ,(purecopy "Three Buffers...") ediff-buffers3
                :help ,(purecopy "Compare three buffers simultaneously")))
   (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
     `(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] '("--"))
+  (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]
     `(menu-item ,(purecopy "Directories with Ancestor...")
     `(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]
     `(menu-item ,(purecopy "Buffers with Ancestor...") ediff-merge-buffers-with-ancestor