[Emacs-diffs] emacs/lisp ChangeLog buff-menu.el ediff-hook.el...

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/11/11 05:57:54

Modified files:
        lisp           : ChangeLog buff-menu.el ediff-hook.el 
                         menu-bar.el replace.el subr.el 

Log message:
        * subr.el (menu-bar-separator): New defconst.
        * replace.el (occur-mode-map):
        * menu-bar.el (menu-bar-file-menu, menu-bar-search-menu)
        (menu-bar-edit-menu, menu-bar-goto-menu, menu-bar-edit-menu)
        (menu-bar-custom-menu, menu-bar-showhide-menu)
        (menu-bar-options-menu, menu-bar-tools-menu)
        (menu-bar-encryption-decryption-menu, menu-bar-describe-menu)
        (menu-bar-search-documentation-menu, menu-bar-manuals-menu)
        (menu-bar-help-menu):
        * ediff-hook.el (menu-bar-ediff-menu, menu-bar-ediff-merge-menu):
        * buff-menu.el (Buffer-menu-mode-map): Use menu-bar-separator.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16593&r2=1.16594
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/buff-menu.el?cvsroot=emacs&r1=1.130&r2=1.131
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-hook.el?cvsroot=emacs&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/menu-bar.el?cvsroot=emacs&r1=1.368&r2=1.369
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/replace.el?cvsroot=emacs&r1=1.285&r2=1.286
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/subr.el?cvsroot=emacs&r1=1.663&r2=1.664

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16593
retrieving revision 1.16594
diff -u -b -r1.16593 -r1.16594
--- ChangeLog   11 Nov 2009 05:49:09 -0000      1.16593
+++ ChangeLog   11 Nov 2009 05:57:51 -0000      1.16594
@@ -1,5 +1,17 @@
 2009-11-11  Dan Nicolaescu  <address@hidden>
 
+       * subr.el (menu-bar-separator): New defconst.
+       * replace.el (occur-mode-map):
+       * menu-bar.el (menu-bar-file-menu, menu-bar-search-menu)
+       (menu-bar-edit-menu, menu-bar-goto-menu, menu-bar-edit-menu)
+       (menu-bar-custom-menu, menu-bar-showhide-menu)
+       (menu-bar-options-menu, menu-bar-tools-menu)
+       (menu-bar-encryption-decryption-menu, menu-bar-describe-menu)
+       (menu-bar-search-documentation-menu, menu-bar-manuals-menu)
+       (menu-bar-help-menu):
+       * ediff-hook.el (menu-bar-ediff-menu, menu-bar-ediff-merge-menu):
+       * buff-menu.el (Buffer-menu-mode-map): Use menu-bar-separator.
+
        * term/x-win.el (x-gtk-stock-map):
        * progmodes/vera-mode.el (auto-mode-alist):
        * progmodes/inf-lisp.el (inferior-lisp-filter-regexp)

Index: buff-menu.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/buff-menu.el,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- buff-menu.el        6 Nov 2009 19:15:29 -0000       1.130
+++ buff-menu.el        11 Nov 2009 05:57:54 -0000      1.131
@@ -158,12 +158,12 @@
     (define-key menu-map [rev]
       `(menu-item ,(purecopy "Refresh") revert-buffer
                 :help ,(purecopy "Refresh the *Buffer List* buffer contents")))
-    (define-key menu-map [s0] '("--"))
+    (define-key menu-map [s0] menu-bar-separator)
     (define-key menu-map [tf]
       `(menu-item ,(purecopy "Show only file buffers") 
Buffer-menu-toggle-files-only
                  :button (:toggle . Buffer-menu-files-only)
                  :help ,(purecopy "Toggle whether the current buffer-menu 
displays only file buffers")))
-    (define-key menu-map [s1] '("--"))
+    (define-key menu-map [s1] menu-bar-separator)
     ;; FIXME: The "Select" entries could use better names...
     (define-key menu-map [sel]
       `(menu-item ,(purecopy "Select marked") Buffer-menu-select
@@ -180,14 +180,14 @@
     (define-key menu-map [tw]
       `(menu-item ,(purecopy "Select in current window") 
Buffer-menu-this-window
                 :help ,(purecopy "Select this line's buffer in this window")))
-    (define-key menu-map [s2] '("--"))
+    (define-key menu-map [s2] menu-bar-separator)
     (define-key menu-map [is]
       `(menu-item ,(purecopy "Regexp Isearch marked buffers") 
Buffer-menu-isearch-buffers-regexp
                 :help ,(purecopy "Search for a regexp through all marked 
buffers using Isearch")))
     (define-key menu-map [ir]
       `(menu-item ,(purecopy "Isearch marked buffers") 
Buffer-menu-isearch-buffers
                 :help ,(purecopy "Search for a string through all marked 
buffers using Isearch")))
-    (define-key menu-map [s3] '("--"))
+    (define-key menu-map [s3] menu-bar-separator)
     (define-key menu-map [by]
       `(menu-item ,(purecopy "Bury") Buffer-menu-bury
                 :help ,(purecopy "Bury the buffer listed on this line")))
@@ -197,7 +197,7 @@
     (define-key menu-map [ex]
       `(menu-item ,(purecopy "Execute") Buffer-menu-execute
                 :help ,(purecopy "Save and/or delete buffers marked with s or 
k commands")))
-    (define-key menu-map [s4] '("--"))
+    (define-key menu-map [s4] menu-bar-separator)
     (define-key menu-map [delb]
       `(menu-item ,(purecopy "Mark for delete and move backwards") 
Buffer-menu-delete-backwards
                 :help ,(purecopy "Mark buffer on this line to be deleted by x 
command and move up one line")))

Index: ediff-hook.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-hook.el,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- ediff-hook.el       24 Oct 2009 06:32:07 -0000      1.47
+++ ediff-hook.el       11 Nov 2009 05:57:54 -0000      1.48
@@ -145,7 +145,7 @@
   ;; 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")))
@@ -155,28 +155,28 @@
   (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")))
@@ -208,7 +208,7 @@
   (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...")
@@ -218,7 +218,7 @@
     `(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

Index: menu-bar.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/menu-bar.el,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -b -r1.368 -r1.369
--- menu-bar.el 6 Nov 2009 05:16:28 -0000       1.368
+++ menu-bar.el 11 Nov 2009 05:57:54 -0000      1.369
@@ -71,7 +71,7 @@
              :help ,(purecopy "Save unsaved buffers, then exit")))
 
 (define-key menu-bar-file-menu [separator-exit]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 ;; Don't use delete-frame as event name because that is a special
 ;; event.
@@ -101,7 +101,7 @@
              :help ,(purecopy "Split selected window in two windows")))
 
 (define-key menu-bar-file-menu [separator-window]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 (define-key menu-bar-file-menu [ps-print-region]
   `(menu-item ,(purecopy "Postscript Print Region (B+W)") ps-print-region
@@ -129,7 +129,7 @@
              :help ,(purecopy "Print current buffer with page headings")))
 
 (define-key menu-bar-file-menu [separator-print]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 (define-key menu-bar-file-menu [recover-session]
   `(menu-item ,(purecopy "Recover Crashed Session") recover-session
@@ -167,7 +167,7 @@
              :help ,(purecopy "Save current buffer to its file")))
 
 (define-key menu-bar-file-menu [separator-save]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 (defun menu-find-file-existing ()
   "Edit the existing file FILENAME."
@@ -292,7 +292,7 @@
 (define-key menu-bar-search-menu [i-search]
   `(menu-item ,(purecopy "Incremental Search") ,menu-bar-i-search-menu))
 (define-key menu-bar-search-menu [separator-tag-isearch]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 (define-key menu-bar-search-menu [tags-continue]
   `(menu-item ,(purecopy "Continue Tags Search") tags-loop-continue
@@ -301,7 +301,7 @@
   `(menu-item ,(purecopy "Search Tagged Files...") tags-search
              :help ,(purecopy "Search for a regexp in all tagged files")))
 (define-key menu-bar-search-menu [separator-tag-search]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 (define-key menu-bar-search-menu [repeat-search-back]
   `(menu-item ,(purecopy "Repeat Backwards") 
nonincremental-repeat-search-backward
@@ -318,7 +318,7 @@
                               regexp-search-ring))
              :help ,(purecopy "Repeat last search forward")))
 (define-key menu-bar-search-menu [separator-repeat-search]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 (define-key menu-bar-search-menu [re-search-backward]
   `(menu-item ,(purecopy "Regexp Backwards...") 
nonincremental-re-search-backward
@@ -345,7 +345,7 @@
   `(menu-item ,(purecopy "Replace in Tagged Files...") tags-query-replace
              :help ,(purecopy "Interactively replace a regexp in all tagged 
files")))
 (define-key menu-bar-replace-menu [separator-replace-tags]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 (define-key menu-bar-replace-menu [query-replace-regexp]
   `(menu-item ,(purecopy "Replace Regexp...") query-replace-regexp
@@ -367,7 +367,7 @@
              ,(purecopy "Fill text in region to fit between left and right 
margin")))
 
 (define-key menu-bar-edit-menu [separator-bookmark]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 (define-key menu-bar-edit-menu [bookmark]
   `(menu-item ,(purecopy "Bookmarks") menu-bar-bookmark-map))
@@ -379,7 +379,7 @@
              :help ,(purecopy "Tell Tags commands which tag table file to 
use")))
 
 (define-key menu-bar-goto-menu [separator-tag-file]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 (define-key menu-bar-goto-menu [apropos-tags]
   `(menu-item ,(purecopy "Tags Apropos...") tags-apropos
@@ -415,7 +415,7 @@
              :help ,(purecopy "Find definition of function or variable")))
 
 (define-key menu-bar-goto-menu [separator-tags]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 (define-key menu-bar-goto-menu [end-of-buf]
   `(menu-item ,(purecopy "Goto End of Buffer") end-of-buffer))
@@ -438,7 +438,7 @@
   `(menu-item ,(purecopy "Search") ,menu-bar-search-menu))
 
 (define-key menu-bar-edit-menu [separator-search]
-  `(menu-item ,(purecopy "--")))
+  menu-bar-separator)
 
 (define-key menu-bar-edit-menu [mark-whole-buffer]
   `(menu-item ,(purecopy "Select All") mark-whole-buffer
@@ -470,7 +470,7 @@
   `(menu-item ,(purecopy "Copy") menu-bar-kill-ring-save
              :enable mark-active
              :help ,(purecopy "Copy text in region between mark and current 
position")
-             :keys "\\[kill-ring-save]"))
+             :keys ,(purecopy "\\[kill-ring-save]")))
 (define-key menu-bar-edit-menu [cut]
   `(menu-item ,(purecopy "Cut") kill-region
              :enable (and mark-active (not buffer-read-only))
@@ -564,7 +564,7 @@
   `(menu-item ,(purecopy "Settings Matching Regexp...") customize-apropos
              :help ,(purecopy "Browse customizable settings whose names match 
regexp")))
 (define-key menu-bar-custom-menu [separator-1]
-  '("--"))
+  menu-bar-separator)
 (define-key menu-bar-custom-menu [customize-group]
   `(menu-item ,(purecopy "Specific Group...") customize-group
              :help ,(purecopy "Customize settings of specific group")))
@@ -575,7 +575,7 @@
   `(menu-item ,(purecopy "Specific Option...") customize-option
              :help ,(purecopy "Customize value of specific option")))
 (define-key menu-bar-custom-menu [separator-2]
-  '("--"))
+  menu-bar-separator)
 (define-key menu-bar-custom-menu [customize-changed-options]
   `(menu-item ,(purecopy "New Options...") customize-changed-options
              :help ,(purecopy "Options added or changed in recent Emacs 
versions")))
@@ -583,7 +583,7 @@
   `(menu-item ,(purecopy "Saved Options") customize-saved
              :help ,(purecopy "Customize previously saved options")))
 (define-key menu-bar-custom-menu [separator-3]
-  '("--"))
+  menu-bar-separator)
 (define-key menu-bar-custom-menu [customize-browse]
   `(menu-item ,(purecopy "Browse Customization Groups") customize-browse
              :help ,(purecopy "Browse all customization groups")))
@@ -706,7 +706,7 @@
              :help ,(purecopy "Save options set from the menu above")))
 
 (define-key menu-bar-options-menu [custom-separator]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-options-menu [menu-set-font]
   `(menu-item ,(purecopy "Set Default Font...") menu-set-font
@@ -733,7 +733,7 @@
                           "Show the size of the buffer in the mode line"))
 
 (define-key menu-bar-showhide-menu [linecolumn-separator]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-showhide-menu [showhide-battery]
   (menu-bar-make-mm-toggle display-battery-mode
@@ -747,7 +747,7 @@
 mail status in mode line"))
 
 (define-key menu-bar-showhide-menu [datetime-separator]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-showhide-menu [showhide-speedbar]
   `(menu-item ,(purecopy "Speedbar") speedbar-frame-mode
@@ -975,7 +975,7 @@
   `(menu-item ,(purecopy "Show/Hide") ,menu-bar-showhide-menu))
 
 (define-key menu-bar-options-menu [showhide-separator]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-options-menu [mule]
   ;; It is better not to use backquote here,
@@ -992,7 +992,7 @@
 ;            :help ,(purecopy "Toggle important global options")))
 
 (define-key menu-bar-options-menu [mule-separator]
-  '("--"))
+   menu-bar-separator)
 
 (define-key menu-bar-options-menu [debug-on-quit]
   (menu-bar-make-toggle toggle-debug-on-quit debug-on-quit
@@ -1003,14 +1003,14 @@
                        "Enter Debugger on Error" "Debug on Error %s"
                        "Enter Lisp debugger when an error is signaled"))
 (define-key menu-bar-options-menu [debugger-separator]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-options-menu [blink-cursor-mode]
   (menu-bar-make-mm-toggle blink-cursor-mode
                           "Blinking Cursor"
                           "Whether the cursor blinks (Blink Cursor mode)"))
 (define-key menu-bar-options-menu [cursor-separator]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-options-menu [save-place]
   (menu-bar-make-toggle toggle-save-place-globally save-place
@@ -1034,7 +1034,7 @@
                                  'forward))))
 
 (define-key menu-bar-options-menu [edit-options-separator]
-  '("--"))
+  menu-bar-separator)
 (define-key menu-bar-options-menu [cua-mode]
   (menu-bar-make-mm-toggle cua-mode
                           "C-x/C-c/C-v Cut and Paste (CUA)"
@@ -1080,7 +1080,7 @@
                (interactive)
                (unless visual-line-mode
                  (visual-line-mode 1))
-               (message "Visual-Line mode enabled"))
+               (message ,(purecopy "Visual-Line mode enabled")))
              :help ,(purecopy "Wrap long lines at word boundaries")
              :button (:radio . (and (null truncate-lines)
                                     (not (truncated-partial-width-window-p))
@@ -1118,7 +1118,7 @@
 
 
 (define-key menu-bar-options-menu [highlight-separator]
-  '("--"))
+  menu-bar-separator)
 (define-key menu-bar-options-menu [highlight-paren-mode]
   (menu-bar-make-mm-toggle show-paren-mode
                           "Paren Match Highlighting"
@@ -1158,7 +1158,7 @@
   `(menu-item ,(purecopy "Games") ,menu-bar-games-menu))
 
 (define-key menu-bar-tools-menu [separator-games]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-games-menu [zone]
   `(menu-item ,(purecopy "Zone Out")  zone
@@ -1207,7 +1207,7 @@
   `(menu-item ,(purecopy "Encryption/Decryption") 
,menu-bar-encryption-decryption-menu))
 
 (define-key menu-bar-tools-menu [separator-encryption-decryption]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-encryption-decryption-menu [insert-keys]
   `(menu-item ,(purecopy "Insert Keys") epa-insert-keys
@@ -1230,7 +1230,7 @@
              :help ,(purecopy "Browse your public keyring")))
 
 (define-key menu-bar-encryption-decryption-menu [separator-keys]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-encryption-decryption-menu [sign-region]
   `(menu-item ,(purecopy "Sign Region") epa-sign-region
@@ -1249,7 +1249,7 @@
              :help ,(purecopy "Decrypt the current region")))
 
 (define-key menu-bar-encryption-decryption-menu [separator-file]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-encryption-decryption-menu [sign-file]
   `(menu-item ,(purecopy "Sign File...") epa-sign-file
@@ -1278,7 +1278,7 @@
              :help ,(purecopy "Invoke the Emacs built-in calendar")))
 
 (define-key menu-bar-tools-menu [separator-net]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-tools-menu [directory-search]
   `(menu-item ,(purecopy "Directory Search") eudc-tools-menu))
@@ -1301,14 +1301,14 @@
              :help ,(purecopy "Read network news groups")))
 
 (define-key menu-bar-tools-menu [separator-vc]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-tools-menu [pcl-cvs]
   `(menu-item ,(purecopy "PCL-CVS") cvs-global-menu))
 (define-key menu-bar-tools-menu [vc] nil) ;Create the place for the VC menu.
 
 (define-key menu-bar-tools-menu [separator-compare]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-tools-menu [epatch]
   `(menu-item ,(purecopy "Apply Patch") menu-bar-epatch-menu))
@@ -1318,13 +1318,13 @@
   `(menu-item ,(purecopy "Compare (Ediff)") menu-bar-ediff-menu))
 
 (define-key menu-bar-tools-menu [separator-spell]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-tools-menu [spell]
   `(menu-item ,(purecopy "Spell Checking") ispell-menu-map))
 
 (define-key menu-bar-tools-menu [separator-prog]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-tools-menu [semantic]
   `(menu-item ,(purecopy "Source Code Parsers (Semantic)")
@@ -1380,7 +1380,7 @@
              ,describe-language-environment-map))
 
 (define-key menu-bar-describe-menu [separator-desc-mule]
-  '("--"))
+  menu-bar-separator)
 
 (define-key menu-bar-describe-menu [list-keybindings]
   `(menu-item ,(purecopy "List Key Bindings") describe-bindings
@@ -1452,7 +1452,7 @@
   `(menu-item ,(purecopy "Find Commands by Name...") apropos-command
              :help ,(purecopy "Find commands whose names match a regexp")))
 (define-key menu-bar-search-documentation-menu [sep1]
-  '("--"))
+  menu-bar-separator)
 (define-key menu-bar-search-documentation-menu [lookup-command-in-manual]
   `(menu-item ,(purecopy "Look Up Command in User Manual...") 
Info-goto-emacs-command-node
              :help ,(purecopy "Display manual section that describes a 
command")))
@@ -1475,7 +1475,7 @@
   `(menu-item ,(purecopy "Read Man Page...") manual-entry
              :help ,(purecopy "Man-page docs for external commands and 
libraries")))
 (define-key menu-bar-manuals-menu [sep2]
-  '("--"))
+  menu-bar-separator)
 (define-key menu-bar-manuals-menu [order-emacs-manuals]
   `(menu-item ,(purecopy "Ordering Manuals") view-order-manuals
              :help ,(purecopy "How to order manuals from the Free Software 
Foundation")))
@@ -1499,7 +1499,7 @@
   `(menu-item ,(purecopy "About Emacs") about-emacs
              :help ,(purecopy "Display version number, copyright info, and 
basic help")))
 (define-key menu-bar-help-menu [sep4]
-  '("--"))
+  menu-bar-separator)
 (define-key menu-bar-help-menu [describe-no-warranty]
   `(menu-item ,(purecopy "(Non)Warranty") describe-no-warranty
              :help ,(purecopy "Explain that Emacs has NO WARRANTY")))
@@ -1517,7 +1517,7 @@
                                 data-directory))
     (goto-address-mode 1)))
 (define-key menu-bar-help-menu [sep2]
-  '("--"))
+  menu-bar-separator)
 (define-key menu-bar-help-menu [external-packages]
   `(menu-item ,(purecopy "External Packages") menu-bar-help-extra-packages
              :help ,(purecopy "Lisp packages distributed separately for use in 
Emacs")))
@@ -1534,7 +1534,7 @@
 (define-key menu-bar-help-menu [search-documentation]
   `(menu-item ,(purecopy "Search Documentation") 
,menu-bar-search-documentation-menu))
 (define-key menu-bar-help-menu [sep1]
-  '("--"))
+  menu-bar-separator)
 (define-key menu-bar-help-menu [emacs-psychotherapist]
   `(menu-item ,(purecopy "Emacs Psychotherapist") doctor
              :help ,(purecopy "Our doctor will help you feel better")))

Index: replace.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/replace.el,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -b -r1.285 -r1.286
--- replace.el  23 Oct 2009 05:15:30 -0000      1.285
+++ replace.el  11 Nov 2009 05:57:54 -0000      1.286
@@ -789,7 +789,7 @@
     (define-key map [occur-rename-buffer]
       `(menu-item ,(purecopy "Rename occur buffer") occur-rename-buffer
                  :help ,(purecopy "Rename the current *Occur* buffer to 
*Occur: original-buffer-name*.")))
-    (define-key map [separator-2] '("--"))
+    (define-key map [separator-2] menu-bar-separator)
     (define-key map [occur-mode-goto-occurrence-other-window]
       `(menu-item ,(purecopy "Go To Occurrence Other Window") 
occur-mode-goto-occurrence-other-window
                  :help ,(purecopy "Go to the occurrence the current line 
describes, in another window")))

Index: subr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/subr.el,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -b -r1.663 -r1.664
--- subr.el     11 Nov 2009 05:49:13 -0000      1.663
+++ subr.el     11 Nov 2009 05:57:54 -0000      1.664
@@ -3759,6 +3759,8 @@
 
 
 ;;; Misc.
+(defconst menu-bar-separator '("--")
+  "Separator for menus.")
 
 ;; The following statement ought to be in print.c, but `provide' can't
 ;; be used there.