;;; menu-bar.el --- define a default menu bar
-;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: RMS
;; Maintainer: FSF
;; Keywords: internal, mouse
+;; Package: emacs
;; This file is part of GNU Emacs.
;; help key.
(setq menu-bar-final-items '(help-menu))
-(define-key global-map [menu-bar help-menu] (cons "Help" menu-bar-help-menu))
+(define-key global-map [menu-bar help-menu] (cons (purecopy "Help") menu-bar-help-menu))
(defvar menu-bar-tools-menu (make-sparse-keymap "Tools"))
-(define-key global-map [menu-bar tools] (cons "Tools" menu-bar-tools-menu))
+(define-key global-map [menu-bar tools] (cons (purecopy "Tools") menu-bar-tools-menu))
;; This definition is just to show what this looks like.
;; It gets modified in place when menu-bar-update-buffers is called.
(defvar global-buffers-menu-map (make-sparse-keymap "Buffers"))
(define-key global-map [menu-bar buffer]
- (cons "Buffers" global-buffers-menu-map))
+ (cons (purecopy "Buffers") global-buffers-menu-map))
(defvar menu-bar-options-menu (make-sparse-keymap "Options"))
(define-key global-map [menu-bar options]
- (cons "Options" menu-bar-options-menu))
+ (cons (purecopy "Options") menu-bar-options-menu))
(defvar menu-bar-edit-menu (make-sparse-keymap "Edit"))
-(define-key global-map [menu-bar edit] (cons "Edit" menu-bar-edit-menu))
+(define-key global-map [menu-bar edit] (cons (purecopy "Edit") menu-bar-edit-menu))
(defvar menu-bar-file-menu (make-sparse-keymap "File"))
-(define-key global-map [menu-bar file] (cons "File" menu-bar-file-menu))
+(define-key global-map [menu-bar file] (cons (purecopy "File") menu-bar-file-menu))
;; This alias is for compatibility with 19.28 and before.
(defvar menu-bar-files-menu menu-bar-file-menu)
;; This is referenced by some code below; it is defined in uniquify.el
(defvar uniquify-buffer-name-style)
+;; From emulation/cua-base.el; used below
+(defvar cua-enable-cua-keys)
+
\f
;; The "File" menu items
(define-key menu-bar-file-menu [exit-emacs]
- '(menu-item "Exit Emacs" save-buffers-kill-emacs
- :keys "C-x C-c"
- :help "Save unsaved buffers, then exit"))
+ `(menu-item ,(purecopy "Quit") save-buffers-kill-terminal
+ :help ,(purecopy "Save unsaved buffers, then exit")))
(define-key menu-bar-file-menu [separator-exit]
- '("--"))
+ menu-bar-separator)
;; Don't use delete-frame as event name because that is a special
;; event.
(define-key menu-bar-file-menu [delete-this-frame]
- '(menu-item "Delete Frame" delete-frame
+ `(menu-item ,(purecopy "Delete Frame") delete-frame
:visible (fboundp 'delete-frame)
:enable (delete-frame-enabled-p)
- :help "Delete currently selected frame"))
+ :help ,(purecopy "Delete currently selected frame")))
(define-key menu-bar-file-menu [make-frame-on-display]
- '(menu-item "New Frame on Display..." make-frame-on-display
+ `(menu-item ,(purecopy "New Frame on Display...") make-frame-on-display
:visible (fboundp 'make-frame-on-display)
- :help "Open a new frame on another display"))
+ :help ,(purecopy "Open a new frame on another display")))
(define-key menu-bar-file-menu [make-frame]
- '(menu-item "New Frame" make-frame-command
+ `(menu-item ,(purecopy "New Frame") make-frame-command
:visible (fboundp 'make-frame-command)
- :help "Open a new frame"))
+ :help ,(purecopy "Open a new frame")))
(define-key menu-bar-file-menu [one-window]
- '(menu-item "Remove Splits" delete-other-windows
+ `(menu-item ,(purecopy "Remove Splits") delete-other-windows
:enable (not (one-window-p t nil))
- :help "Selected window grows to fill the whole frame"))
+ :help ,(purecopy "Selected window grows to fill the whole frame")))
(define-key menu-bar-file-menu [split-window]
- '(menu-item "Split Window" split-window-vertically
+ `(menu-item ,(purecopy "Split Window") split-window-vertically
:enable (and (menu-bar-menu-frame-live-and-visible-p)
(menu-bar-non-minibuffer-window-p))
- :help "Split selected window in two windows"))
+ :help ,(purecopy "Split selected window in two windows")))
(define-key menu-bar-file-menu [separator-window]
- '(menu-item "--"))
+ menu-bar-separator)
(define-key menu-bar-file-menu [ps-print-region]
- '(menu-item "Postscript Print Region (B+W)" ps-print-region
+ `(menu-item ,(purecopy "Postscript Print Region (B+W)") ps-print-region
:enable mark-active
- :help "Pretty-print marked region in black and white to PostScript printer"))
+ :help ,(purecopy "Pretty-print marked region in black and white to PostScript printer")))
(define-key menu-bar-file-menu [ps-print-buffer]
- '(menu-item "Postscript Print Buffer (B+W)" ps-print-buffer
+ `(menu-item ,(purecopy "Postscript Print Buffer (B+W)") ps-print-buffer
:enable (menu-bar-menu-frame-live-and-visible-p)
- :help "Pretty-print current buffer in black and white to PostScript printer"))
+ :help ,(purecopy "Pretty-print current buffer in black and white to PostScript printer")))
(define-key menu-bar-file-menu [ps-print-region-faces]
- '(menu-item "Postscript Print Region" ps-print-region-with-faces
+ `(menu-item ,(purecopy "Postscript Print Region") ps-print-region-with-faces
:enable mark-active
- :help "Pretty-print marked region to PostScript printer"))
+ :help ,(purecopy "Pretty-print marked region to PostScript printer")))
(define-key menu-bar-file-menu [ps-print-buffer-faces]
- '(menu-item "Postscript Print Buffer" ps-print-buffer-with-faces
+ `(menu-item ,(purecopy "Postscript Print Buffer") ps-print-buffer-with-faces
:enable (menu-bar-menu-frame-live-and-visible-p)
- :help "Pretty-print current buffer to PostScript printer"))
+ :help ,(purecopy "Pretty-print current buffer to PostScript printer")))
(define-key menu-bar-file-menu [print-region]
- '(menu-item "Print Region" print-region
+ `(menu-item ,(purecopy "Print Region") print-region
:enable mark-active
- :help "Print region between mark and current position"))
+ :help ,(purecopy "Print region between mark and current position")))
(define-key menu-bar-file-menu [print-buffer]
- '(menu-item "Print Buffer" print-buffer
+ `(menu-item ,(purecopy "Print Buffer") print-buffer
:enable (menu-bar-menu-frame-live-and-visible-p)
- :help "Print current buffer with page headings"))
+ :help ,(purecopy "Print current buffer with page headings")))
(define-key menu-bar-file-menu [separator-print]
- '(menu-item "--"))
+ menu-bar-separator)
(define-key menu-bar-file-menu [recover-session]
- '(menu-item "Recover Crashed Session" recover-session
+ `(menu-item ,(purecopy "Recover Crashed Session") recover-session
:enable (and auto-save-list-file-prefix
(file-directory-p
(file-name-directory auto-save-list-file-prefix))
(file-name-nondirectory
auto-save-list-file-prefix)))
t))
- :help "Recover edits from a crashed session"))
+ :help ,(purecopy "Recover edits from a crashed session")))
(define-key menu-bar-file-menu [revert-buffer]
- '(menu-item "Revert Buffer" revert-buffer
+ `(menu-item ,(purecopy "Revert Buffer") revert-buffer
:enable (or revert-buffer-function
revert-buffer-insert-file-contents-function
(and buffer-file-number
(or (buffer-modified-p)
(not (verify-visited-file-modtime
(current-buffer))))))
- :help "Re-read current buffer from its file"))
+ :help ,(purecopy "Re-read current buffer from its file")))
(define-key menu-bar-file-menu [write-file]
- '(menu-item "Save As..." write-file
+ `(menu-item ,(purecopy "Save As...") write-file
:enable (and (menu-bar-menu-frame-live-and-visible-p)
(menu-bar-non-minibuffer-window-p))
- :help "Write current buffer to another file"))
+ :help ,(purecopy "Write current buffer to another file")))
(define-key menu-bar-file-menu [save-buffer]
- '(menu-item "Save" save-buffer
+ `(menu-item ,(purecopy "Save") save-buffer
:enable (and (buffer-modified-p)
(buffer-file-name)
(menu-bar-non-minibuffer-window-p))
- :help "Save current buffer to its file"))
+ :help ,(purecopy "Save current buffer to its file")))
(define-key menu-bar-file-menu [separator-save]
- '(menu-item "--"))
+ menu-bar-separator)
(defun menu-find-file-existing ()
"Edit the existing file FILENAME."
(define-key menu-bar-file-menu [kill-buffer]
- '(menu-item "Close" kill-this-buffer
+ `(menu-item ,(purecopy "Close") kill-this-buffer
:enable (kill-this-buffer-enabled-p)
- :help "Discard (kill) current buffer"))
+ :help ,(purecopy "Discard (kill) current buffer")))
(define-key menu-bar-file-menu [insert-file]
- '(menu-item "Insert File..." insert-file
+ `(menu-item ,(purecopy "Insert File...") insert-file
:enable (menu-bar-non-minibuffer-window-p)
- :help "Insert another file into current buffer"))
+ :help ,(purecopy "Insert another file into current buffer")))
(define-key menu-bar-file-menu [dired]
- '(menu-item "Open Directory..." dired
+ `(menu-item ,(purecopy "Open Directory...") dired
:enable (menu-bar-non-minibuffer-window-p)
- :help "Read a directory, to operate on its files"))
+ :help ,(purecopy "Read a directory, to operate on its files")))
(define-key menu-bar-file-menu [open-file]
- '(menu-item "Open File..." menu-find-file-existing
+ `(menu-item ,(purecopy "Open File...") menu-find-file-existing
:enable (menu-bar-non-minibuffer-window-p)
- :help "Read an existing file into an Emacs buffer"))
+ :help ,(purecopy "Read an existing file into an Emacs buffer")))
(define-key menu-bar-file-menu [new-file]
- '(menu-item "Visit New File..." find-file
+ `(menu-item ,(purecopy "Visit New File...") find-file
:enable (menu-bar-non-minibuffer-window-p)
- :help "Specify a new file's name, to edit the file"))
+ :help ,(purecopy "Specify a new file's name, to edit the file")))
\f
;; The "Edit" menu items
(make-sparse-keymap "Incremental Search"))
(define-key menu-bar-i-search-menu [isearch-backward-regexp]
- '(menu-item "Backward Regexp..." isearch-backward-regexp
- :help "Search backwards for a regular expression as you type it"))
+ `(menu-item ,(purecopy "Backward Regexp...") isearch-backward-regexp
+ :help ,(purecopy "Search backwards for a regular expression as you type it")))
(define-key menu-bar-i-search-menu [isearch-forward-regexp]
- '(menu-item "Forward Regexp..." isearch-forward-regexp
- :help "Search forward for a regular expression as you type it"))
+ `(menu-item ,(purecopy "Forward Regexp...") isearch-forward-regexp
+ :help ,(purecopy "Search forward for a regular expression as you type it")))
(define-key menu-bar-i-search-menu [isearch-backward]
- '(menu-item "Backward String..." isearch-backward
- :help "Search backwards for a string as you type it"))
+ `(menu-item ,(purecopy "Backward String...") isearch-backward
+ :help ,(purecopy "Search backwards for a string as you type it")))
(define-key menu-bar-i-search-menu [isearch-forward]
- '(menu-item "Forward String..." isearch-forward
- :help "Search forward for a string as you type it"))
-
+ `(menu-item ,(purecopy "Forward String...") isearch-forward
+ :help ,(purecopy "Search forward for a string as you type it")))
(define-key menu-bar-search-menu [i-search]
- (list 'menu-item "Incremental Search" menu-bar-i-search-menu))
+ `(menu-item ,(purecopy "Incremental Search") ,menu-bar-i-search-menu))
(define-key menu-bar-search-menu [separator-tag-isearch]
- '(menu-item "--"))
+ menu-bar-separator)
(define-key menu-bar-search-menu [tags-continue]
- '(menu-item "Continue Tags Search" tags-loop-continue
- :help "Continue last tags search operation"))
+ `(menu-item ,(purecopy "Continue Tags Search") tags-loop-continue
+ :help ,(purecopy "Continue last tags search operation")))
(define-key menu-bar-search-menu [tags-srch]
- '(menu-item "Search Tagged Files..." tags-search
- :help "Search for a regexp in all tagged files"))
+ `(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 "--"))
+ menu-bar-separator)
(define-key menu-bar-search-menu [repeat-search-back]
- '(menu-item "Repeat Backwards" nonincremental-repeat-search-backward
+ `(menu-item ,(purecopy "Repeat Backwards") nonincremental-repeat-search-backward
:enable (or (and (eq menu-bar-last-search-type 'string)
search-ring)
(and (eq menu-bar-last-search-type 'regexp)
regexp-search-ring))
- :help "Repeat last search backwards"))
+ :help ,(purecopy "Repeat last search backwards")))
(define-key menu-bar-search-menu [repeat-search-fwd]
- '(menu-item "Repeat Forward" nonincremental-repeat-search-forward
+ `(menu-item ,(purecopy "Repeat Forward") nonincremental-repeat-search-forward
:enable (or (and (eq menu-bar-last-search-type 'string)
search-ring)
(and (eq menu-bar-last-search-type 'regexp)
regexp-search-ring))
- :help "Repeat last search forward"))
+ :help ,(purecopy "Repeat last search forward")))
(define-key menu-bar-search-menu [separator-repeat-search]
- '(menu-item "--"))
+ menu-bar-separator)
(define-key menu-bar-search-menu [re-search-backward]
- '(menu-item "Regexp Backwards..." nonincremental-re-search-backward
- :help "Search backwards for a regular expression"))
+ `(menu-item ,(purecopy "Regexp Backwards...") nonincremental-re-search-backward
+ :help ,(purecopy "Search backwards for a regular expression")))
(define-key menu-bar-search-menu [re-search-forward]
- '(menu-item "Regexp Forward..." nonincremental-re-search-forward
- :help "Search forward for a regular expression"))
+ `(menu-item ,(purecopy "Regexp Forward...") nonincremental-re-search-forward
+ :help ,(purecopy "Search forward for a regular expression")))
(define-key menu-bar-search-menu [search-backward]
- '(menu-item "String Backwards..." nonincremental-search-backward
- :help "Search backwards for a string"))
+ `(menu-item ,(purecopy "String Backwards...") nonincremental-search-backward
+ :help ,(purecopy "Search backwards for a string")))
(define-key menu-bar-search-menu [search-forward]
- '(menu-item "String Forward..." nonincremental-search-forward
- :help "Search forward for a string"))
+ `(menu-item ,(purecopy "String Forward...") nonincremental-search-forward
+ :help ,(purecopy "Search forward for a string")))
;; The Edit->Replace submenu
(defvar menu-bar-replace-menu (make-sparse-keymap "Replace"))
(define-key menu-bar-replace-menu [tags-repl-continue]
- '(menu-item "Continue Replace" tags-loop-continue
- :help "Continue last tags replace operation"))
+ `(menu-item ,(purecopy "Continue Replace") tags-loop-continue
+ :help ,(purecopy "Continue last tags replace operation")))
(define-key menu-bar-replace-menu [tags-repl]
- '(menu-item "Replace in Tagged Files..." tags-query-replace
- :help "Interactively replace a regexp in all tagged files"))
+ `(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 "--"))
+ menu-bar-separator)
(define-key menu-bar-replace-menu [query-replace-regexp]
- '(menu-item "Replace Regexp..." query-replace-regexp
+ `(menu-item ,(purecopy "Replace Regexp...") query-replace-regexp
:enable (not buffer-read-only)
- :help "Replace regular expression interactively, ask about each occurrence"))
+ :help ,(purecopy "Replace regular expression interactively, ask about each occurrence")))
(define-key menu-bar-replace-menu [query-replace]
- '(menu-item "Replace String..." query-replace
+ `(menu-item ,(purecopy "Replace String...") query-replace
:enable (not buffer-read-only)
- :help "Replace string interactively, ask about each occurrence"))
+ :help ,(purecopy "Replace string interactively, ask about each occurrence")))
;;; Assemble the top-level Edit menu items.
(define-key menu-bar-edit-menu [props]
- '(menu-item "Text Properties" facemenu-menu))
+ `(menu-item ,(purecopy "Text Properties") facemenu-menu))
+
+;; ns-win.el said: Add spell for platorm consistency.
+(if (featurep 'ns)
+ (define-key menu-bar-edit-menu [spell]
+ `(menu-item ,(purecopy "Spell") ispell-menu-map)))
(define-key menu-bar-edit-menu [fill]
- '(menu-item "Fill" fill-region
+ `(menu-item ,(purecopy "Fill") fill-region
:enable (and mark-active (not buffer-read-only))
:help
- "Fill text in region to fit between left and right margin"))
+ ,(purecopy "Fill text in region to fit between left and right margin")))
(define-key menu-bar-edit-menu [separator-bookmark]
- '(menu-item "--"))
+ menu-bar-separator)
(define-key menu-bar-edit-menu [bookmark]
- '(menu-item "Bookmarks" menu-bar-bookmark-map))
+ `(menu-item ,(purecopy "Bookmarks") menu-bar-bookmark-map))
(defvar menu-bar-goto-menu (make-sparse-keymap "Go To"))
(define-key menu-bar-goto-menu [set-tags-name]
- '(menu-item "Set Tags File Name..." visit-tags-table
- :help "Tell Tags commands which tag table file to use"))
+ `(menu-item ,(purecopy "Set Tags File Name...") visit-tags-table
+ :help ,(purecopy "Tell Tags commands which tag table file to use")))
(define-key menu-bar-goto-menu [separator-tag-file]
- '(menu-item "--"))
+ menu-bar-separator)
(define-key menu-bar-goto-menu [apropos-tags]
- '(menu-item "Tags Apropos..." tags-apropos
- :help "Find function/variables whose names match regexp"))
+ `(menu-item ,(purecopy "Tags Apropos...") tags-apropos
+ :help ,(purecopy "Find function/variables whose names match regexp")))
(define-key menu-bar-goto-menu [next-tag-otherw]
- '(menu-item "Next Tag in Other Window"
+ `(menu-item ,(purecopy "Next Tag in Other Window")
menu-bar-next-tag-other-window
:enable (and (boundp 'tags-location-ring)
(not (ring-empty-p tags-location-ring)))
- :help "Find next function/variable matching last tag name in another window"))
+ :help ,(purecopy "Find next function/variable matching last tag name in another window")))
(defun menu-bar-next-tag-other-window ()
"Find the next definition of the tag already specified."
(find-tag nil t))
(define-key menu-bar-goto-menu [next-tag]
- '(menu-item "Find Next Tag"
+ `(menu-item ,(purecopy "Find Next Tag")
menu-bar-next-tag
:enable (and (boundp 'tags-location-ring)
(not (ring-empty-p tags-location-ring)))
- :help "Find next function/variable matching last tag name"))
+ :help ,(purecopy "Find next function/variable matching last tag name")))
(define-key menu-bar-goto-menu [find-tag-otherw]
- '(menu-item "Find Tag in Other Window..." find-tag-other-window
- :help "Find function/variable definition in another window"))
+ `(menu-item ,(purecopy "Find Tag in Other Window...") find-tag-other-window
+ :help ,(purecopy "Find function/variable definition in another window")))
(define-key menu-bar-goto-menu [find-tag]
- '(menu-item "Find Tag..." find-tag
- :help "Find definition of function or variable"))
+ `(menu-item ,(purecopy "Find Tag...") find-tag
+ :help ,(purecopy "Find definition of function or variable")))
(define-key menu-bar-goto-menu [separator-tags]
- '(menu-item "--"))
+ menu-bar-separator)
(define-key menu-bar-goto-menu [end-of-buf]
- '(menu-item "Goto End of Buffer" end-of-buffer))
+ `(menu-item ,(purecopy "Goto End of Buffer") end-of-buffer))
(define-key menu-bar-goto-menu [beg-of-buf]
- '(menu-item "Goto Beginning of Buffer" beginning-of-buffer))
+ `(menu-item ,(purecopy "Goto Beginning of Buffer") beginning-of-buffer))
(define-key menu-bar-goto-menu [go-to-pos]
- '(menu-item "Goto Buffer Position..." goto-char
- :help "Read a number N and go to buffer position N"))
+ `(menu-item ,(purecopy "Goto Buffer Position...") goto-char
+ :help ,(purecopy "Read a number N and go to buffer position N")))
(define-key menu-bar-goto-menu [go-to-line]
- '(menu-item "Goto Line..." goto-line
- :help "Read a line number and go to that line"))
+ `(menu-item ,(purecopy "Goto Line...") goto-line
+ :help ,(purecopy "Read a line number and go to that line")))
(define-key menu-bar-edit-menu [goto]
- (list 'menu-item "Go To" menu-bar-goto-menu))
+ `(menu-item ,(purecopy "Go To") ,menu-bar-goto-menu))
(define-key menu-bar-edit-menu [replace]
- (list 'menu-item "Replace" menu-bar-replace-menu))
+ `(menu-item ,(purecopy "Replace") ,menu-bar-replace-menu))
(define-key menu-bar-edit-menu [search]
- (list 'menu-item "Search" menu-bar-search-menu))
+ `(menu-item ,(purecopy "Search") ,menu-bar-search-menu))
(define-key menu-bar-edit-menu [separator-search]
- '(menu-item "--"))
+ menu-bar-separator)
(define-key menu-bar-edit-menu [mark-whole-buffer]
- '(menu-item "Select All" mark-whole-buffer
- :help "Mark the whole buffer for a subsequent cut/copy."))
+ `(menu-item ,(purecopy "Select All") mark-whole-buffer
+ :help ,(purecopy "Mark the whole buffer for a subsequent cut/copy")))
(define-key menu-bar-edit-menu [clear]
- '(menu-item "Clear" delete-region
+ `(menu-item ,(purecopy "Clear") delete-region
:enable (and mark-active
(not buffer-read-only)
(not (mouse-region-match)))
:help
- "Delete the text in region between mark and current position"))
-(defvar yank-menu (cons "Select Yank" nil))
+ ,(purecopy "Delete the text in region between mark and current position")))
+(defvar yank-menu (cons (purecopy "Select Yank") nil))
(fset 'yank-menu (cons 'keymap yank-menu))
-(define-key menu-bar-edit-menu [paste-from-menu]
- '(menu-item "Paste from kill menu" yank-menu
+;; The ns differences here seem silly.
+(define-key menu-bar-edit-menu (if (featurep 'ns) [select-paste]
+ [paste-from-menu])
+ ;; ns-win.el said: Change text to be more consistent with
+ ;; surrounding menu items `paste', etc."
+ `(menu-item ,(purecopy (if (featurep 'ns) "Select and Paste"
+ "Paste from Kill Menu")) yank-menu
:enable (and (cdr yank-menu) (not buffer-read-only))
- :help "Choose a string from the kill ring and paste it"))
+ :help ,(purecopy "Choose a string from the kill ring and paste it")))
(define-key menu-bar-edit-menu [paste]
- '(menu-item "Paste" yank
- :enable (and
- ;; Emacs compiled --without-x doesn't have
- ;; x-selection-exists-p.
- (fboundp 'x-selection-exists-p)
- (x-selection-exists-p) (not buffer-read-only))
- :help "Paste (yank) text most recently cut/copied"))
+ `(menu-item ,(purecopy "Paste") yank
+ :enable (and (or
+ ;; Emacs compiled --without-x (or --with-ns)
+ ;; doesn't have x-selection-exists-p.
+ (and (fboundp 'x-selection-exists-p)
+ (x-selection-exists-p 'CLIPBOARD))
+ (if (featurep 'ns) ; like paste-from-menu
+ (cdr yank-menu)
+ kill-ring))
+ (not buffer-read-only))
+ :help ,(purecopy "Paste (yank) text most recently cut/copied")))
(define-key menu-bar-edit-menu [copy]
- '(menu-item "Copy" menu-bar-kill-ring-save
- :enable mark-active
- :help "Copy text in region between mark and current position"
- :keys "\\[kill-ring-save]"))
+ ;; ns-win.el said: Substitute a Copy function that works better
+ ;; under X (for GNUstep).
+ `(menu-item ,(purecopy "Copy") ,(if (featurep 'ns)
+ 'ns-copy-including-secondary
+ 'menu-bar-kill-ring-save)
+ :enable mark-active
+ :help ,(purecopy "Copy text in region between mark and current position")
+ :keys ,(purecopy (if (featurep 'ns)
+ "\\[ns-copy-including-secondary]"
+ "\\[kill-ring-save]"))))
(define-key menu-bar-edit-menu [cut]
- '(menu-item "Cut" kill-region
+ `(menu-item ,(purecopy "Cut") kill-region
:enable (and mark-active (not buffer-read-only))
:help
- "Cut (kill) text in region between mark and current position"))
+ ,(purecopy "Cut (kill) text in region between mark and current position")))
+;; ns-win.el said: Separate undo from cut/paste section.
+(if (featurep 'ns)
+ (define-key menu-bar-edit-menu [separator-undo] `(,(purecopy "--"))))
(define-key menu-bar-edit-menu [undo]
- '(menu-item "Undo" undo
+ `(menu-item ,(purecopy "Undo") undo
:enable (and (not buffer-read-only)
(not (eq t buffer-undo-list))
(if (eq last-command 'undo)
(listp pending-undo-list)
(consp buffer-undo-list)))
- :help "Undo last operation"))
-
+ :help ,(purecopy "Undo last operation")))
(defun menu-bar-kill-ring-save (beg end)
(interactive "r")
'(and mark-active (not buffer-read-only)))
(put 'clipboard-kill-ring-save 'menu-enable 'mark-active)
(put 'clipboard-yank 'menu-enable
- '(and (or (and (fboundp 'x-selection-exists-p)
- (x-selection-exists-p))
+ '(and (or (not (fboundp 'x-selection-exists-p))
+ (x-selection-exists-p)
(x-selection-exists-p 'CLIPBOARD))
- (not buffer-read-only)))
+ (not buffer-read-only)))
(defun clipboard-yank ()
"Insert the clipboard contents, or the last stretch of killed text."
"Make CUT, PASTE and COPY (keys and menu bar items) use the clipboard.
Do the same for the keys of the same name."
(interactive)
- ;; We can't use constant list structure here because it becomes pure,
- ;; and because it gets modified with cache data.
- (define-key menu-bar-edit-menu [paste]
- (cons "Paste" (cons "Paste text from clipboard" 'clipboard-yank)))
- (define-key menu-bar-edit-menu [copy]
- (cons "Copy" (cons "Copy text in region to the clipboard"
- 'clipboard-kill-ring-save)))
- (define-key menu-bar-edit-menu [cut]
- (cons "Cut" (cons "Delete text in region and copy it to the clipboard"
- 'clipboard-kill-region)))
-
;; These are Sun server keysyms for the Cut, Copy and Paste keys
;; (also for XFree86 on Sun keyboard):
(define-key global-map [f20] 'clipboard-kill-region)
(defvar menu-bar-custom-menu (make-sparse-keymap "Customize"))
(define-key menu-bar-custom-menu [customize-apropos-groups]
- '(menu-item "Groups Matching Regexp..." customize-apropos-groups
- :help "Browse groups whose names match regexp"))
+ `(menu-item ,(purecopy "Groups Matching Regexp...") customize-apropos-groups
+ :help ,(purecopy "Browse groups whose names match regexp")))
(define-key menu-bar-custom-menu [customize-apropos-faces]
- '(menu-item "Faces Matching Regexp..." customize-apropos-faces
- :help "Browse faces whose names match regexp"))
+ `(menu-item ,(purecopy "Faces Matching Regexp...") customize-apropos-faces
+ :help ,(purecopy "Browse faces whose names match regexp")))
(define-key menu-bar-custom-menu [customize-apropos-options]
- '(menu-item "Options Matching Regexp..." customize-apropos-options
- :help "Browse options whose names match regexp"))
+ `(menu-item ,(purecopy "Options Matching Regexp...") customize-apropos-options
+ :help ,(purecopy "Browse options whose names match regexp")))
(define-key menu-bar-custom-menu [customize-apropos]
- '(menu-item "Settings Matching Regexp..." customize-apropos
- :help "Browse customizable settings whose names match regexp"))
+ `(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 "Specific Group..." customize-group
- :help "Customize settings of specific group"))
+ `(menu-item ,(purecopy "Specific Group...") customize-group
+ :help ,(purecopy "Customize settings of specific group")))
(define-key menu-bar-custom-menu [customize-face]
- '(menu-item "Specific Face..." customize-face
- :help "Customize attributes of specific face"))
+ `(menu-item ,(purecopy "Specific Face...") customize-face
+ :help ,(purecopy "Customize attributes of specific face")))
(define-key menu-bar-custom-menu [customize-option]
- '(menu-item "Specific Option..." customize-option
- :help "Customize value of specific option"))
+ `(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 "New Options..." customize-changed-options
- :help "Options added or changed in recent Emacs versions"))
+ `(menu-item ,(purecopy "New Options...") customize-changed-options
+ :help ,(purecopy "Options added or changed in recent Emacs versions")))
(define-key menu-bar-custom-menu [customize-saved]
- '(menu-item "Saved Options" customize-saved
- :help "Customize previously saved options"))
+ `(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 "Browse Customization Groups" customize-browse
- :help "Browse all customization groups"))
+ `(menu-item ,(purecopy "Browse Customization Groups") customize-browse
+ :help ,(purecopy "Browse all customization groups")))
(define-key menu-bar-custom-menu [customize]
- '(menu-item "Top-level Customization Group" customize
- :help "The master group called `Emacs'"))
+ `(menu-item ,(purecopy "Top-level Customization Group") customize
+ :help ,(purecopy "The master group called `Emacs'")))
;(defvar menu-bar-preferences-menu (make-sparse-keymap "Preferences"))
DOC is the text to use for the menu entry.
HELP is the text to use for the tooltip.
PROPS are additional properties."
- `'(menu-item ,doc ,fname
- ,@props
- :help ,help
- :button (:toggle . (and (default-boundp ',fname)
- (default-value ',fname)))))
+ `(list 'menu-item (purecopy ,doc) ',fname
+ ,@(mapcar (lambda (p) (list 'quote p)) props)
+ :help (purecopy ,help)
+ :button '(:toggle . (and (default-boundp ',fname)
+ (default-value ',fname)))))
(defmacro menu-bar-make-toggle (name variable doc message help &rest body)
`(progn
;; a candidate for "Save Options", and we do not want to save options
;; the user have already set explicitly in his init file.
(if interactively (customize-mark-as-set ',variable)))
- '(menu-item ,doc ,name
- :help ,help
- :button (:toggle . (and (default-boundp ',variable)
- (default-value ',variable))))))
+ (list 'menu-item (purecopy ,doc) ',name
+ :help (purecopy ,help)
+ :button '(:toggle . (and (default-boundp ',variable)
+ (default-value ',variable))))))
;; Function for setting/saving default font.
(mouse-select-font)))
spec)
(when font
- (set-face-attribute 'default nil :font font)
+ ;; Be careful here: when set-face-attribute is called for the
+ ;; :font attribute, Emacs tries to guess the best matching font
+ ;; by examining the other face attributes (Bug#2476).
+ (set-face-attribute 'default (selected-frame)
+ :width 'normal
+ :weight 'normal
+ :slant 'normal
+ :font font)
+ (let ((font-object (face-attribute 'default :font)))
+ (dolist (f (frame-list))
+ (and (not (eq f (selected-frame)))
+ (display-graphic-p f)
+ (set-face-attribute 'default f :font font-object)))
+ (set-face-attribute 'default t :font font-object))
(setq spec (list (list t (face-attr-construct 'default))))
(put 'default 'customized-face spec)
(custom-push-theme 'theme-face 'default 'user 'set spec)
(put 'default 'face-modified nil))))
+
+
;;; Assemble all the top-level items of the "Options" menu
(define-key menu-bar-options-menu [customize]
- (list 'menu-item "Customize Emacs" menu-bar-custom-menu))
+ `(menu-item ,(purecopy "Customize Emacs") ,menu-bar-custom-menu))
(defun menu-bar-options-save ()
"Save current values of Options menu items using Custom."
;; put on a customized-value property.
(dolist (elt '(line-number-mode column-number-mode size-indication-mode
cua-mode show-paren-mode transient-mark-mode
- blink-cursor-mode display-time-mode display-battery-mode))
+ blink-cursor-mode display-time-mode display-battery-mode
+ ;; These are set by other functions that don't set
+ ;; the customized state. Having them here has the
+ ;; side-effect that turning them off via X
+ ;; resources acts like having customized them, but
+ ;; that seems harmless.
+ menu-bar-mode tool-bar-mode))
+ ;; FIXME ? It's a little annoying that running this command
+ ;; always loads cua-base, paren, time, and battery, even if they
+ ;; have not been customized in any way. (Due to custom-load-symbol.)
(and (customize-mark-to-save elt)
(setq need-save t)))
;; These are set with `customize-set-variable'.
(dolist (elt '(scroll-bar-mode
debug-on-quit debug-on-error
- tooltip-mode menu-bar-mode tool-bar-mode
+ ;; Somehow this works, when tool-bar and menu-bar don't.
+ tooltip-mode
save-place uniquify-buffer-name-style fringe-mode
indicate-empty-lines indicate-buffer-boundaries
- case-fold-search
+ case-fold-search font-use-system-font
current-language-environment default-input-method
;; Saving `text-mode-hook' is somewhat questionable,
;; as we might get more than we bargain for, if
;; Nonetheless, not saving it would like be confuse
;; more often.
;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-11.
- text-mode-hook))
+ text-mode-hook tool-bar-position))
(and (get elt 'customized-value)
(customize-mark-to-save elt)
(setq need-save t)))
(when need-save
(custom-save-all))))
+(define-key menu-bar-options-menu [package]
+ '(menu-item "Manage Emacs Packages" package-list-packages
+ :help "Install or uninstall additional Emacs packages"))
+
(define-key menu-bar-options-menu [save]
- '(menu-item "Save Options" menu-bar-options-save
- :help "Save options set from the menu above"))
+ `(menu-item ,(purecopy "Save Options") menu-bar-options-save
+ :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 "Set Default Font..." menu-set-font
+ `(menu-item ,(purecopy "Set Default Font...") menu-set-font
:visible (display-multi-font-p)
- :help "Select a default font"))
+ :help ,(purecopy "Select a default font")))
+
+(if (featurep 'system-font-setting)
+ (define-key menu-bar-options-menu [menu-system-font]
+ (menu-bar-make-toggle toggle-use-system-font font-use-system-font
+ "Use system font"
+ "Use system font: %s"
+ "Use the monospaced font defined by the system")))
+
;; The "Show/Hide" submenu of menu "Options"
"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
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 "Speedbar" speedbar-frame-mode
- :help "Display a Speedbar quick-navigation frame"
+ `(menu-item ,(purecopy "Speedbar") speedbar-frame-mode
+ :help ,(purecopy "Display a Speedbar quick-navigation frame")
:button (:toggle
. (and (boundp 'speedbar-frame)
(frame-live-p (symbol-value 'speedbar-frame))
(customize-variable 'indicate-buffer-boundaries))
(define-key menu-bar-showhide-fringe-ind-menu [customize]
- '(menu-item "Other (Customize)"
+ `(menu-item ,(purecopy "Other (Customize)")
menu-bar-showhide-fringe-ind-customize
- :help "Additional choices available through Custom buffer"
+ :help ,(purecopy "Additional choices available through Custom buffer")
:visible (display-graphic-p)
:button (:radio . (not (member indicate-buffer-boundaries
'(nil left right
'((t . right) (top . left))))
(define-key menu-bar-showhide-fringe-ind-menu [mixed]
- '(menu-item "Opposite, Arrows Right" menu-bar-showhide-fringe-ind-mixed
+ `(menu-item ,(purecopy "Opposite, Arrows Right") menu-bar-showhide-fringe-ind-mixed
:help
- "Show top/bottom indicators in opposite fringes, arrows in right"
+ ,(purecopy "Show top/bottom indicators in opposite fringes, arrows in right")
:visible (display-graphic-p)
:button (:radio . (equal indicate-buffer-boundaries
'((t . right) (top . left))))))
'((top . left) (bottom . right))))
(define-key menu-bar-showhide-fringe-ind-menu [box]
- '(menu-item "Opposite, No Arrows" menu-bar-showhide-fringe-ind-box
- :help "Show top/bottom indicators in opposite fringes, no arrows"
+ `(menu-item ,(purecopy "Opposite, No Arrows") menu-bar-showhide-fringe-ind-box
+ :help ,(purecopy "Show top/bottom indicators in opposite fringes, no arrows")
:visible (display-graphic-p)
:button (:radio . (equal indicate-buffer-boundaries
'((top . left) (bottom . right))))))
(customize-set-variable 'indicate-buffer-boundaries 'right))
(define-key menu-bar-showhide-fringe-ind-menu [right]
- '(menu-item "In Right Fringe" menu-bar-showhide-fringe-ind-right
- :help "Show buffer boundaries and arrows in right fringe"
+ `(menu-item ,(purecopy "In Right Fringe") menu-bar-showhide-fringe-ind-right
+ :help ,(purecopy "Show buffer boundaries and arrows in right fringe")
:visible (display-graphic-p)
:button (:radio . (eq indicate-buffer-boundaries 'right))))
(customize-set-variable 'indicate-buffer-boundaries 'left))
(define-key menu-bar-showhide-fringe-ind-menu [left]
- '(menu-item "In Left Fringe" menu-bar-showhide-fringe-ind-left
- :help "Show buffer boundaries and arrows in left fringe"
+ `(menu-item ,(purecopy "In Left Fringe") menu-bar-showhide-fringe-ind-left
+ :help ,(purecopy "Show buffer boundaries and arrows in left fringe")
:visible (display-graphic-p)
:button (:radio . (eq indicate-buffer-boundaries 'left))))
(customize-set-variable 'indicate-buffer-boundaries nil))
(define-key menu-bar-showhide-fringe-ind-menu [none]
- '(menu-item "No Indicators" menu-bar-showhide-fringe-ind-none
- :help "Hide all buffer boundary indicators and arrows"
+ `(menu-item ,(purecopy "No Indicators") menu-bar-showhide-fringe-ind-none
+ :help ,(purecopy "Hide all buffer boundary indicators and arrows")
:visible (display-graphic-p)
:button (:radio . (eq indicate-buffer-boundaries nil))))
(define-key menu-bar-showhide-fringe-menu [showhide-fringe-ind]
- (list 'menu-item "Buffer Boundaries" menu-bar-showhide-fringe-ind-menu
- :visible `(display-graphic-p)
- :help "Indicate buffer boundaries in fringe"))
+ `(menu-item ,(purecopy "Buffer Boundaries") ,menu-bar-showhide-fringe-ind-menu
+ :visible (display-graphic-p)
+ :help ,(purecopy "Indicate buffer boundaries in fringe")))
(define-key menu-bar-showhide-fringe-menu [indicate-empty-lines]
(menu-bar-make-toggle toggle-indicate-empty-lines indicate-empty-lines
(customize-variable 'fringe-mode))
(define-key menu-bar-showhide-fringe-menu [customize]
- '(menu-item "Customize Fringe" menu-bar-showhide-fringe-menu-customize
- :help "Detailed customization of fringe"
+ `(menu-item ,(purecopy "Customize Fringe") menu-bar-showhide-fringe-menu-customize
+ :help ,(purecopy "Detailed customization of fringe")
:visible (display-graphic-p)))
(defun menu-bar-showhide-fringe-menu-customize-reset ()
(customize-set-variable 'fringe-mode nil))
(define-key menu-bar-showhide-fringe-menu [default]
- '(menu-item "Default" menu-bar-showhide-fringe-menu-customize-reset
- :help "Default width fringe on both left and right side"
+ `(menu-item ,(purecopy "Default") menu-bar-showhide-fringe-menu-customize-reset
+ :help ,(purecopy "Default width fringe on both left and right side")
:visible (display-graphic-p)
:button (:radio . (eq fringe-mode nil))))
(customize-set-variable 'fringe-mode '(0 . nil)))
(define-key menu-bar-showhide-fringe-menu [right]
- '(menu-item "On the Right" menu-bar-showhide-fringe-menu-customize-right
- :help "Fringe only on the right side"
+ `(menu-item ,(purecopy "On the Right") menu-bar-showhide-fringe-menu-customize-right
+ :help ,(purecopy "Fringe only on the right side")
:visible (display-graphic-p)
:button (:radio . (equal fringe-mode '(0 . nil)))))
(customize-set-variable 'fringe-mode '(nil . 0)))
(define-key menu-bar-showhide-fringe-menu [left]
- '(menu-item "On the Left" menu-bar-showhide-fringe-menu-customize-left
- :help "Fringe only on the left side"
+ `(menu-item ,(purecopy "On the Left") menu-bar-showhide-fringe-menu-customize-left
+ :help ,(purecopy "Fringe only on the left side")
:visible (display-graphic-p)
:button (:radio . (equal fringe-mode '(nil . 0)))))
(customize-set-variable 'fringe-mode 0))
(define-key menu-bar-showhide-fringe-menu [none]
- '(menu-item "None" menu-bar-showhide-fringe-menu-customize-disable
- :help "Turn off fringe"
+ `(menu-item ,(purecopy "None") menu-bar-showhide-fringe-menu-customize-disable
+ :help ,(purecopy "Turn off fringe")
:visible (display-graphic-p)
:button (:radio . (eq fringe-mode 0))))
(define-key menu-bar-showhide-menu [showhide-fringe]
- (list 'menu-item "Fringe" menu-bar-showhide-fringe-menu
- :visible `(display-graphic-p)))
+ `(menu-item ,(purecopy "Fringe") ,menu-bar-showhide-fringe-menu
+ :visible (display-graphic-p)))
(defvar menu-bar-showhide-scroll-bar-menu (make-sparse-keymap "Scroll-bar"))
(define-key menu-bar-showhide-scroll-bar-menu [right]
- '(menu-item "On the Right"
+ `(menu-item ,(purecopy "On the Right")
menu-bar-right-scroll-bar
- :help "Scroll-bar on the right side"
+ :help ,(purecopy "Scroll-bar on the right side")
:visible (display-graphic-p)
:button (:radio . (eq (cdr (assq 'vertical-scroll-bars
(frame-parameters))) 'right))))
(customize-set-variable 'scroll-bar-mode 'right))
(define-key menu-bar-showhide-scroll-bar-menu [left]
- '(menu-item "On the Left"
+ `(menu-item ,(purecopy "On the Left")
menu-bar-left-scroll-bar
- :help "Scroll-bar on the left side"
+ :help ,(purecopy "Scroll-bar on the left side")
:visible (display-graphic-p)
:button (:radio . (eq (cdr (assq 'vertical-scroll-bars
(frame-parameters))) 'left))))
(customize-set-variable 'scroll-bar-mode 'left))
(define-key menu-bar-showhide-scroll-bar-menu [none]
- '(menu-item "None"
+ `(menu-item ,(purecopy "None")
menu-bar-no-scroll-bar
- :help "Turn off scroll-bar"
+ :help ,(purecopy "Turn off scroll-bar")
:visible (display-graphic-p)
:button (:radio . (eq (cdr (assq 'vertical-scroll-bars
(frame-parameters))) nil))))
(customize-set-variable 'scroll-bar-mode nil))
(define-key menu-bar-showhide-menu [showhide-scroll-bar]
- (list 'menu-item "Scroll-bar" menu-bar-showhide-scroll-bar-menu
- :visible `(display-graphic-p)))
+ `(menu-item ,(purecopy "Scroll-bar") ,menu-bar-showhide-scroll-bar-menu
+ :visible (display-graphic-p)))
(define-key menu-bar-showhide-menu [showhide-tooltip-mode]
- (list 'menu-item "Tooltips" 'tooltip-mode
- :help "Turn tooltips on/off"
- :visible `(and (display-graphic-p) (fboundp 'x-show-tip))
- :button `(:toggle . tooltip-mode)))
+ `(menu-item ,(purecopy "Tooltips") tooltip-mode
+ :help ,(purecopy "Turn tooltips on/off")
+ :visible (and (display-graphic-p) (fboundp 'x-show-tip))
+ :button (:toggle . tooltip-mode)))
(define-key menu-bar-showhide-menu [menu-bar-mode]
- '(menu-item "Menu-bar" toggle-menu-bar-mode-from-frame
- :help "Turn menu-bar on/off"
+ `(menu-item ,(purecopy "Menu-bar") toggle-menu-bar-mode-from-frame
+ :help ,(purecopy "Turn menu-bar on/off")
:button (:toggle . (> (frame-parameter nil 'menu-bar-lines) 0))))
-(define-key menu-bar-showhide-menu [showhide-tool-bar]
- (list 'menu-item "Tool-bar" 'toggle-tool-bar-mode-from-frame
- :help "Toggle tool-bar on/off"
- :visible `(display-graphic-p)
- :button `(:toggle . (> (frame-parameter nil 'tool-bar-lines) 0))))
+(defun menu-bar-set-tool-bar-position (position)
+ (customize-set-variable 'tool-bar-mode t)
+ (customize-set-variable 'tool-bar-position position))
+(defun menu-bar-showhide-tool-bar-menu-customize-disable ()
+ "Do not display tool bars."
+ (interactive)
+ (customize-set-variable 'tool-bar-mode nil))
+(defun menu-bar-showhide-tool-bar-menu-customize-enable-left ()
+ "Display tool bars on the left side."
+ (interactive)
+ (menu-bar-set-tool-bar-position 'left))
+(defun menu-bar-showhide-tool-bar-menu-customize-enable-right ()
+ "Display tool bars on the right side."
+ (interactive)
+ (menu-bar-set-tool-bar-position 'right))
+(defun menu-bar-showhide-tool-bar-menu-customize-enable-top ()
+ "Display tool bars on the top side."
+ (interactive)
+ (menu-bar-set-tool-bar-position 'top))
+(defun menu-bar-showhide-tool-bar-menu-customize-enable-bottom ()
+ "Display tool bars on the bottom side."
+ (interactive)
+ (menu-bar-set-tool-bar-position 'bottom))
+
+(if (featurep 'move-toolbar)
+ (progn
+ (defvar menu-bar-showhide-tool-bar-menu (make-sparse-keymap "Tool-bar"))
+
+ (define-key menu-bar-showhide-tool-bar-menu [showhide-tool-bar-left]
+ `(menu-item ,(purecopy "On the left")
+ menu-bar-showhide-tool-bar-menu-customize-enable-left
+ :help ,(purecopy "Tool-bar at the left side")
+ :visible (display-graphic-p)
+ :button
+ (:radio . (and tool-bar-mode
+ (eq (frame-parameter nil 'tool-bar-position)
+ 'left)))))
+
+ (define-key menu-bar-showhide-tool-bar-menu [showhide-tool-bar-right]
+ `(menu-item ,(purecopy "On the right")
+ menu-bar-showhide-tool-bar-menu-customize-enable-right
+ :help ,(purecopy "Tool-bar at the right side")
+ :visible (display-graphic-p)
+ :button
+ (:radio . (and tool-bar-mode
+ (eq (frame-parameter nil 'tool-bar-position)
+ 'right)))))
+
+ (define-key menu-bar-showhide-tool-bar-menu [showhide-tool-bar-bottom]
+ `(menu-item ,(purecopy "On the bottom")
+ menu-bar-showhide-tool-bar-menu-customize-enable-bottom
+ :help ,(purecopy "Tool-bar at the bottom")
+ :visible (display-graphic-p)
+ :button
+ (:radio . (and tool-bar-mode
+ (eq (frame-parameter nil 'tool-bar-position)
+ 'bottom)))))
+
+ (define-key menu-bar-showhide-tool-bar-menu [showhide-tool-bar-top]
+ `(menu-item ,(purecopy "On the top")
+ menu-bar-showhide-tool-bar-menu-customize-enable-top
+ :help ,(purecopy "Tool-bar at the top")
+ :visible (display-graphic-p)
+ :button
+ (:radio . (and tool-bar-mode
+ (eq (frame-parameter nil 'tool-bar-position)
+ 'top)))))
+
+ (define-key menu-bar-showhide-tool-bar-menu [showhide-tool-bar-none]
+ `(menu-item ,(purecopy "None")
+ menu-bar-showhide-tool-bar-menu-customize-disable
+ :help ,(purecopy "Turn tool-bar off")
+ :visible (display-graphic-p)
+ :button (:radio . (eq tool-bar-mode nil))))
+
+ (define-key menu-bar-showhide-menu [showhide-tool-bar]
+ `(menu-item ,(purecopy "Tool-bar") ,menu-bar-showhide-tool-bar-menu
+ :visible (display-graphic-p)))
+
+ )
+ ;; else not tool bar that can move.
+ (define-key menu-bar-showhide-menu [showhide-tool-bar]
+ `(menu-item ,(purecopy "Tool-bar") toggle-tool-bar-mode-from-frame
+ :help ,(purecopy "Turn tool-bar on/off")
+ :visible (display-graphic-p)
+ :button (:toggle . (> (frame-parameter nil 'tool-bar-lines) 0))))
+)
(define-key menu-bar-options-menu [showhide]
- (list 'menu-item "Show/Hide" menu-bar-showhide-menu))
+ `(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,
;; because that makes a bootstrapping problem
;; if you need to recompile all the Lisp files using interpreted code.
- (list 'menu-item "Mule (Multilingual Environment)" mule-menu-keymap
+ `(menu-item ,(purecopy "Mule (Multilingual Environment)") ,mule-menu-keymap
;; Most of the MULE menu actually does make sense in unibyte mode,
;; e.g. language selection.
-;;; ':visible 'default-enable-multibyte-characters
+;;; :visible '(default-value 'enable-multibyte-characters)
))
;(setq menu-bar-final-items (cons 'mule menu-bar-final-items))
;(define-key menu-bar-options-menu [preferences]
-; (list 'menu-item "Preferences" menu-bar-preferences-menu
-; :help "Toggle important global options"))
+; `(menu-item ,(purecopy "Preferences") ,menu-bar-preferences-menu
+; :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
"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
'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)"
(define-key menu-bar-options-menu [cua-emulation-mode]
(menu-bar-make-mm-toggle cua-mode
"Shift movement mark region (CUA)"
- "Use shifted movement keys to set and extend the region."
+ "Use shifted movement keys to set and extend the region"
(:visible (and (boundp 'cua-enable-cua-keys)
(not cua-enable-cua-keys)))))
(customize-mark-as-set 'text-mode-hook))
(define-key menu-bar-options-menu [auto-fill-mode]
- '(menu-item "Auto Fill in Text Modes"
+ `(menu-item ,(purecopy "Auto Fill in Text Modes")
menu-bar-text-mode-auto-fill
- :help "Automatically fill text while typing (Auto Fill Mode)"
+ :help ,(purecopy "Automatically fill text while typing (Auto Fill mode)")
:button (:toggle . (if (listp text-mode-hook)
(member 'turn-on-auto-fill text-mode-hook)
(eq 'turn-on-auto-fill text-mode-hook)))))
(defvar menu-bar-line-wrapping-menu (make-sparse-keymap "Line Wrapping"))
(define-key menu-bar-line-wrapping-menu [word-wrap]
- '(menu-item "Word Wrap (Visual Line mode)"
+ `(menu-item ,(purecopy "Word Wrap (Visual Line mode)")
(lambda ()
(interactive)
(unless visual-line-mode
(visual-line-mode 1))
- (message "Visual-Line mode enabled"))
- :help "Wrap long lines at word boundaries"
+ (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))
word-wrap))
:visible (menu-bar-menu-frame-live-and-visible-p)))
(define-key menu-bar-line-wrapping-menu [truncate]
- '(menu-item "Truncate Long Lines"
+ `(menu-item ,(purecopy "Truncate Long Lines")
(lambda ()
(interactive)
(if visual-line-mode (visual-line-mode 0))
(setq word-wrap nil)
(toggle-truncate-lines 1))
- :help "Truncate long lines at window edge"
+ :help ,(purecopy "Truncate long lines at window edge")
:button (:radio . (or truncate-lines
(truncated-partial-width-window-p)))
:visible (menu-bar-menu-frame-live-and-visible-p)
:enable (not (truncated-partial-width-window-p))))
(define-key menu-bar-line-wrapping-menu [window-wrap]
- '(menu-item "Wrap at Window Edge"
+ `(menu-item ,(purecopy "Wrap at Window Edge")
(lambda () (interactive)
(if visual-line-mode (visual-line-mode 0))
(setq word-wrap nil)
(if truncate-lines (toggle-truncate-lines -1)))
- :help "Wrap long lines at window edge"
+ :help ,(purecopy "Wrap long lines at window edge")
:button (:radio . (and (null truncate-lines)
(not (truncated-partial-width-window-p))
(not word-wrap)))
:enable (not (truncated-partial-width-window-p))))
(define-key menu-bar-options-menu [line-wrapping]
- (list 'menu-item "Line Wrapping in this Buffer" menu-bar-line-wrapping-menu))
+ `(menu-item ,(purecopy "Line Wrapping in this Buffer") ,menu-bar-line-wrapping-menu))
(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"
(defvar menu-bar-games-menu (make-sparse-keymap "Games"))
(define-key menu-bar-tools-menu [games]
- (list 'menu-item "Games" menu-bar-games-menu))
+ `(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 "Zone Out" zone
- :help "Play tricks with Emacs display when Emacs is idle"))
+ `(menu-item ,(purecopy "Zone Out") zone
+ :help ,(purecopy "Play tricks with Emacs display when Emacs is idle")))
(define-key menu-bar-games-menu [tetris]
- '(menu-item "Tetris" tetris
- :help "Falling blocks game"))
+ `(menu-item ,(purecopy "Tetris") tetris
+ :help ,(purecopy "Falling blocks game")))
(define-key menu-bar-games-menu [solitaire]
- '(menu-item "Solitaire" solitaire
- :help "Get rid of all the stones"))
+ `(menu-item ,(purecopy "Solitaire") solitaire
+ :help ,(purecopy "Get rid of all the stones")))
(define-key menu-bar-games-menu [snake]
- '(menu-item "Snake" snake
- :help "Move snake around avoiding collisions"))
+ `(menu-item ,(purecopy "Snake") snake
+ :help ,(purecopy "Move snake around avoiding collisions")))
(define-key menu-bar-games-menu [pong]
- '(menu-item "Pong" pong
- :help "Bounce the ball to your opponent"))
+ `(menu-item ,(purecopy "Pong") pong
+ :help ,(purecopy "Bounce the ball to your opponent")))
(define-key menu-bar-games-menu [mult]
- '(menu-item "Multiplication Puzzle" mpuz
- :help "Exercise brain with multiplication"))
+ `(menu-item ,(purecopy "Multiplication Puzzle") mpuz
+ :help ,(purecopy "Exercise brain with multiplication")))
(define-key menu-bar-games-menu [life]
- '(menu-item "Life" life
- :help "Watch how John Conway's cellular automaton evolves"))
+ `(menu-item ,(purecopy "Life") life
+ :help ,(purecopy "Watch how John Conway's cellular automaton evolves")))
+(define-key menu-bar-games-menu [land]
+ `(menu-item ,(purecopy "Landmark") landmark
+ :help ,(purecopy "Watch a neural-network robot learn landmarks")))
(define-key menu-bar-games-menu [hanoi]
- '(menu-item "Towers of Hanoi" hanoi
- :help "Watch Towers-of-Hanoi puzzle solved by Emacs"))
+ `(menu-item ,(purecopy "Towers of Hanoi") hanoi
+ :help ,(purecopy "Watch Towers-of-Hanoi puzzle solved by Emacs")))
(define-key menu-bar-games-menu [gomoku]
- '(menu-item "Gomoku" gomoku
- :help "Mark 5 contiguous squares (like tic-tac-toe)"))
+ `(menu-item ,(purecopy "Gomoku") gomoku
+ :help ,(purecopy "Mark 5 contiguous squares (like tic-tac-toe)")))
(define-key menu-bar-games-menu [bubbles]
- '(menu-item "Bubbles" bubbles
- :help "Remove all bubbles using the fewest moves"))
+ `(menu-item ,(purecopy "Bubbles") bubbles
+ :help ,(purecopy "Remove all bubbles using the fewest moves")))
(define-key menu-bar-games-menu [black-box]
- '(menu-item "Blackbox" blackbox
- :help "Find balls in a black box by shooting rays"))
+ `(menu-item ,(purecopy "Blackbox") blackbox
+ :help ,(purecopy "Find balls in a black box by shooting rays")))
(define-key menu-bar-games-menu [adventure]
- '(menu-item "Adventure" dunnet
- :help "Dunnet, a text Adventure game for Emacs"))
+ `(menu-item ,(purecopy "Adventure") dunnet
+ :help ,(purecopy "Dunnet, a text Adventure game for Emacs")))
(define-key menu-bar-games-menu [5x5]
- '(menu-item "5x5" 5x5
- :help "Fill in all the squares on a 5x5 board"))
+ `(menu-item ,(purecopy "5x5") 5x5
+ :help ,(purecopy "Fill in all the squares on a 5x5 board")))
(defvar menu-bar-encryption-decryption-menu
(make-sparse-keymap "Encryption/Decryption"))
(define-key menu-bar-tools-menu [encryption-decryption]
- (list 'menu-item "Encryption/Decryption" menu-bar-encryption-decryption-menu))
+ `(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 "Insert Keys" epa-insert-keys
- :help "Insert public keys after the current point"))
+ `(menu-item ,(purecopy "Insert Keys") epa-insert-keys
+ :help ,(purecopy "Insert public keys after the current point")))
(define-key menu-bar-encryption-decryption-menu [export-keys]
- '(menu-item "Export Keys" epa-export-keys
- :help "Export public keys to a file"))
+ `(menu-item ,(purecopy "Export Keys") epa-export-keys
+ :help ,(purecopy "Export public keys to a file")))
(define-key menu-bar-encryption-decryption-menu [import-keys-region]
- '(menu-item "Import Keys from Region" epa-import-keys-region
- :help "Import public keys from the current region"))
+ `(menu-item ,(purecopy "Import Keys from Region") epa-import-keys-region
+ :help ,(purecopy "Import public keys from the current region")))
(define-key menu-bar-encryption-decryption-menu [import-keys]
- '(menu-item "Import Keys from File..." epa-import-keys
- :help "Import public keys from a file"))
+ `(menu-item ,(purecopy "Import Keys from File...") epa-import-keys
+ :help ,(purecopy "Import public keys from a file")))
(define-key menu-bar-encryption-decryption-menu [list-keys]
- '(menu-item "List Keys" epa-list-keys
- :help "Browse your public keyring"))
+ `(menu-item ,(purecopy "List Keys") epa-list-keys
+ :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 "Sign Region" epa-sign-region
- :help "Create digital signature of the current region"))
+ `(menu-item ,(purecopy "Sign Region") epa-sign-region
+ :help ,(purecopy "Create digital signature of the current region")))
(define-key menu-bar-encryption-decryption-menu [verify-region]
- '(menu-item "Verify Region" epa-verify-region
- :help "Verify digital signature of the current region"))
+ `(menu-item ,(purecopy "Verify Region") epa-verify-region
+ :help ,(purecopy "Verify digital signature of the current region")))
(define-key menu-bar-encryption-decryption-menu [encrypt-region]
- '(menu-item "Encrypt Region" epa-encrypt-region
- :help "Encrypt the current region"))
+ `(menu-item ,(purecopy "Encrypt Region") epa-encrypt-region
+ :help ,(purecopy "Encrypt the current region")))
(define-key menu-bar-encryption-decryption-menu [decrypt-region]
- '(menu-item "Decrypt Region" epa-decrypt-region
- :help "Decrypt the current region"))
+ `(menu-item ,(purecopy "Decrypt Region") epa-decrypt-region
+ :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 "Sign File..." epa-sign-file
- :help "Create digital signature of a file"))
+ `(menu-item ,(purecopy "Sign File...") epa-sign-file
+ :help ,(purecopy "Create digital signature of a file")))
(define-key menu-bar-encryption-decryption-menu [verify-file]
- '(menu-item "Verify File..." epa-verify-file
- :help "Verify digital signature of a file"))
+ `(menu-item ,(purecopy "Verify File...") epa-verify-file
+ :help ,(purecopy "Verify digital signature of a file")))
(define-key menu-bar-encryption-decryption-menu [encrypt-file]
- '(menu-item "Encrypt File..." epa-encrypt-file
- :help "Encrypt a file"))
+ `(menu-item ,(purecopy "Encrypt File...") epa-encrypt-file
+ :help ,(purecopy "Encrypt a file")))
(define-key menu-bar-encryption-decryption-menu [decrypt-file]
- '(menu-item "Decrypt File..." epa-decrypt-file
- :help "Decrypt a file"))
+ `(menu-item ,(purecopy "Decrypt File...") epa-decrypt-file
+ :help ,(purecopy "Decrypt a file")))
(define-key menu-bar-tools-menu [simple-calculator]
- '(menu-item "Simple Calculator" calculator
- :help "Invoke the Emacs built-in quick calculator"))
+ `(menu-item ,(purecopy "Simple Calculator") calculator
+ :help ,(purecopy "Invoke the Emacs built-in quick calculator")))
(define-key menu-bar-tools-menu [calc]
- '(menu-item "Programmable Calculator" calc
- :help "Invoke the Emacs built-in full scientific calculator"))
+ `(menu-item ,(purecopy "Programmable Calculator") calc
+ :help ,(purecopy "Invoke the Emacs built-in full scientific calculator")))
(define-key menu-bar-tools-menu [calendar]
- '(menu-item "Calendar" calendar
- :help "Invoke the Emacs built-in calendar"))
+ `(menu-item ,(purecopy "Calendar") calendar
+ :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 "Directory Search" eudc-tools-menu))
+ `(menu-item ,(purecopy "Directory Search") eudc-tools-menu))
(define-key menu-bar-tools-menu [compose-mail]
- (list
- 'menu-item `(format "Send Mail (with %s)" (send-mail-item-name))
- 'compose-mail
- :visible `(and mail-user-agent (not (eq mail-user-agent 'ignore)))
- :help "Send a mail message"))
+ `(menu-item (format "Send Mail (with %s)" (send-mail-item-name)) compose-mail
+ :visible (and mail-user-agent (not (eq mail-user-agent 'ignore)))
+ :help ,(purecopy "Send a mail message")))
(define-key menu-bar-tools-menu [rmail]
- (list
- 'menu-item `(format "Read Mail (with %s)" (read-mail-item-name))
- 'menu-bar-read-mail
- :visible `(and read-mail-command (not (eq read-mail-command 'ignore)))
- :help "Read your mail and reply to it"))
+ `(menu-item (format "Read Mail (with %s)" (read-mail-item-name))
+ menu-bar-read-mail
+ :visible (and read-mail-command
+ (not (eq read-mail-command 'ignore)))
+ :help ,(purecopy "Read your mail and reply to it")))
(defun menu-bar-read-mail ()
"Read mail using `read-mail-command'."
(call-interactively read-mail-command))
(define-key menu-bar-tools-menu [gnus]
- '(menu-item "Read Net News (Gnus)" gnus
- :help "Read network news groups"))
+ `(menu-item ,(purecopy "Read Net News (Gnus)") gnus
+ :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 "PCL-CVS" cvs-global-menu))
+ `(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 [ediff-misc]
- '(menu-item "Ediff Miscellanea" menu-bar-ediff-misc-menu))
(define-key menu-bar-tools-menu [epatch]
- '(menu-item "Apply Patch" menu-bar-epatch-menu))
+ `(menu-item ,(purecopy "Apply Patch") menu-bar-epatch-menu))
(define-key menu-bar-tools-menu [ediff-merge]
- '(menu-item "Merge" menu-bar-ediff-merge-menu))
+ `(menu-item ,(purecopy "Merge") menu-bar-ediff-merge-menu))
(define-key menu-bar-tools-menu [compare]
- '(menu-item "Compare (Ediff)" menu-bar-ediff-menu))
+ `(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 "Spell Checking" ispell-menu-map))
+ `(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)")
+ semantic-mode
+ :help ,(purecopy "Toggle automatic parsing in source code buffers (Semantic mode)")
+ :button (:toggle . (bound-and-true-p semantic-mode))))
+
+(define-key menu-bar-tools-menu [ede]
+ `(menu-item ,(purecopy "Project support (EDE)")
+ global-ede-mode
+ :help ,(purecopy "Toggle the Emacs Development Environment (Global EDE mode)")
+ :button (:toggle . (bound-and-true-p global-ede-mode))))
(define-key menu-bar-tools-menu [gdb]
- '(menu-item "Debugger (GDB)..." gdb
- :help "Debug a program from within Emacs with GDB"))
+ `(menu-item ,(purecopy "Debugger (GDB)...") gdb
+ :help ,(purecopy "Debug a program from within Emacs with GDB")))
(define-key menu-bar-tools-menu [shell-on-region]
- '(menu-item "Shell Command on Region..." shell-command-on-region
+ `(menu-item ,(purecopy "Shell Command on Region...") shell-command-on-region
:enable mark-active
- :help "Pass marked region to a shell command"))
+ :help ,(purecopy "Pass marked region to a shell command")))
(define-key menu-bar-tools-menu [shell]
- '(menu-item "Shell Command..." shell-command
- :help "Invoke a shell command and catch its output"))
+ `(menu-item ,(purecopy "Shell Command...") shell-command
+ :help ,(purecopy "Invoke a shell command and catch its output")))
(define-key menu-bar-tools-menu [compile]
- '(menu-item "Compile..." compile
- :help "Invoke compiler or Make, view compilation errors"))
+ `(menu-item ,(purecopy "Compile...") compile
+ :help ,(purecopy "Invoke compiler or Make, view compilation errors")))
(define-key menu-bar-tools-menu [grep]
- '(menu-item "Search Files (Grep)..." grep
- :help "Search files for strings or regexps (with Grep)"))
+ `(menu-item ,(purecopy "Search Files (Grep)...") grep
+ :help ,(purecopy "Search files for strings or regexps (with Grep)")))
\f
;; The "Help" menu items
(defvar menu-bar-describe-menu (make-sparse-keymap "Describe"))
(define-key menu-bar-describe-menu [mule-diag]
- '(menu-item "Show All of Mule Status" mule-diag
- :visible default-enable-multibyte-characters
- :help "Display multilingual environment settings"))
+ `(menu-item ,(purecopy "Show All of Mule Status") mule-diag
+ :visible (default-value 'enable-multibyte-characters)
+ :help ,(purecopy "Display multilingual environment settings")))
(define-key menu-bar-describe-menu [describe-coding-system-briefly]
- '(menu-item "Describe Coding System (Briefly)"
+ `(menu-item ,(purecopy "Describe Coding System (Briefly)")
describe-current-coding-system-briefly
- :visible default-enable-multibyte-characters))
+ :visible (default-value 'enable-multibyte-characters)))
(define-key menu-bar-describe-menu [describe-coding-system]
- '(menu-item "Describe Coding System..." describe-coding-system
- :visible default-enable-multibyte-characters))
+ `(menu-item ,(purecopy "Describe Coding System...") describe-coding-system
+ :visible (default-value 'enable-multibyte-characters)))
(define-key menu-bar-describe-menu [describe-input-method]
- '(menu-item "Describe Input Method..." describe-input-method
- :visible default-enable-multibyte-characters
- :help "Keyboard layout for specific input method"))
+ `(menu-item ,(purecopy "Describe Input Method...") describe-input-method
+ :visible (default-value 'enable-multibyte-characters)
+ :help ,(purecopy "Keyboard layout for specific input method")))
(define-key menu-bar-describe-menu [describe-language-environment]
- (list 'menu-item "Describe Language Environment"
- describe-language-environment-map))
+ `(menu-item ,(purecopy "Describe Language Environment")
+ ,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 "List Key Bindings" describe-bindings
- :help "Display all current keybindings (keyboard shortcuts)"))
+ `(menu-item ,(purecopy "List Key Bindings") describe-bindings
+ :help ,(purecopy "Display all current key bindings (keyboard shortcuts)")))
(define-key menu-bar-describe-menu [describe-current-display-table]
- '(menu-item "Describe Display Table" describe-current-display-table
- :help "Describe the current display table"))
+ `(menu-item ,(purecopy "Describe Display Table") describe-current-display-table
+ :help ,(purecopy "Describe the current display table")))
+(define-key menu-bar-describe-menu [describe-package]
+ `(menu-item ,(purecopy "Describe Package...") describe-package
+ :help ,(purecopy "Display documentation of a Lisp package")))
(define-key menu-bar-describe-menu [describe-face]
- '(menu-item "Describe Face..." describe-face
- :help "Display the properties of a face"))
+ `(menu-item ,(purecopy "Describe Face...") describe-face
+ :help ,(purecopy "Display the properties of a face")))
(define-key menu-bar-describe-menu [describe-variable]
- '(menu-item "Describe Variable..." describe-variable
- :help "Display documentation of variable/option"))
+ `(menu-item ,(purecopy "Describe Variable...") describe-variable
+ :help ,(purecopy "Display documentation of variable/option")))
(define-key menu-bar-describe-menu [describe-function]
- '(menu-item "Describe Function..." describe-function
- :help "Display documentation of function/command"))
+ `(menu-item ,(purecopy "Describe Function...") describe-function
+ :help ,(purecopy "Display documentation of function/command")))
(define-key menu-bar-describe-menu [describe-key-1]
- '(menu-item "Describe Key or Mouse Operation..." describe-key
+ `(menu-item ,(purecopy "Describe Key or Mouse Operation...") describe-key
;; Users typically don't identify keys and menu items...
- :help "Display documentation of command bound to a \
-key, a click, or a menu-item"))
+ :help ,(purecopy "Display documentation of command bound to a \
+key, a click, or a menu-item")))
(define-key menu-bar-describe-menu [describe-mode]
- '(menu-item "Describe Buffer Modes" describe-mode
- :help "Describe this buffer's major and minor mode"))
+ `(menu-item ,(purecopy "Describe Buffer Modes") describe-mode
+ :help ,(purecopy "Describe this buffer's major and minor mode")))
(defvar menu-bar-search-documentation-menu
(make-sparse-keymap "Search Documentation"))
(Info-index topic))
(define-key menu-bar-search-documentation-menu [search-documentation-strings]
- '(menu-item "Search Documentation Strings..." apropos-documentation
+ `(menu-item ,(purecopy "Search Documentation Strings...") apropos-documentation
:help
- "Find functions and variables whose doc strings match a regexp"))
+ ,(purecopy "Find functions and variables whose doc strings match a regexp")))
(define-key menu-bar-search-documentation-menu [find-any-object-by-name]
- '(menu-item "Find Any Object by Name..." apropos
- :help "Find symbols of any kind whose names match a regexp"))
+ `(menu-item ,(purecopy "Find Any Object by Name...") apropos
+ :help ,(purecopy "Find symbols of any kind whose names match a regexp")))
(define-key menu-bar-search-documentation-menu [find-option-by-value]
- '(menu-item "Find Options by Value..." apropos-value
- :help "Find variables whose values match a regexp"))
+ `(menu-item ,(purecopy "Find Options by Value...") apropos-value
+ :help ,(purecopy "Find variables whose values match a regexp")))
(define-key menu-bar-search-documentation-menu [find-options-by-name]
- '(menu-item "Find Options by Name..." apropos-variable
- :help "Find variables whose names match a regexp"))
+ `(menu-item ,(purecopy "Find Options by Name...") apropos-variable
+ :help ,(purecopy "Find variables whose names match a regexp")))
(define-key menu-bar-search-documentation-menu [find-commands-by-name]
- '(menu-item "Find Commands by Name..." apropos-command
- :help "Find commands whose names match a regexp"))
+ `(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 "Look Up Command in User Manual..." Info-goto-emacs-command-node
- :help "Display manual section that describes a command"))
+ `(menu-item ,(purecopy "Look Up Command in User Manual...") Info-goto-emacs-command-node
+ :help ,(purecopy "Display manual section that describes a command")))
(define-key menu-bar-search-documentation-menu [lookup-key-in-manual]
- '(menu-item "Look Up Key in User Manual..." Info-goto-emacs-key-command-node
- :help "Display manual section that describes a key"))
+ `(menu-item ,(purecopy "Look Up Key in User Manual...") Info-goto-emacs-key-command-node
+ :help ,(purecopy "Display manual section that describes a key")))
(define-key menu-bar-search-documentation-menu [lookup-subject-in-elisp-manual]
- '(menu-item "Look Up Subject in ELisp Manual..." elisp-index-search
- :help "Find description of a subject in Emacs Lisp manual"))
+ `(menu-item ,(purecopy "Look Up Subject in ELisp Manual...") elisp-index-search
+ :help ,(purecopy "Find description of a subject in Emacs Lisp manual")))
(define-key menu-bar-search-documentation-menu [lookup-subject-in-emacs-manual]
- '(menu-item "Look Up Subject in User Manual..." emacs-index-search
- :help "Find description of a subject in Emacs User manual"))
+ `(menu-item ,(purecopy "Look Up Subject in User Manual...") emacs-index-search
+ :help ,(purecopy "Find description of a subject in Emacs User manual")))
(define-key menu-bar-search-documentation-menu [emacs-terminology]
- '(menu-item "Emacs Terminology" search-emacs-glossary
- :help "Display the Glossary section of the Emacs manual"))
+ `(menu-item ,(purecopy "Emacs Terminology") search-emacs-glossary
+ :help ,(purecopy "Display the Glossary section of the Emacs manual")))
(defvar menu-bar-manuals-menu (make-sparse-keymap "More Manuals"))
(define-key menu-bar-manuals-menu [man]
- '(menu-item "Read Man Page..." manual-entry
- :help "Man-page docs for external commands and libraries"))
+ `(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 "Ordering Manuals" view-order-manuals
- :help "How to order manuals from the Free Software Foundation"))
+ `(menu-item ,(purecopy "Ordering Manuals") view-order-manuals
+ :help ,(purecopy "How to order manuals from the Free Software Foundation")))
(define-key menu-bar-manuals-menu [lookup-subject-in-all-manuals]
- '(menu-item "Lookup Subject in all manuals..." info-apropos
- :help "Find description of a subject in all installed manuals"))
+ `(menu-item ,(purecopy "Lookup Subject in all Manuals...") info-apropos
+ :help ,(purecopy "Find description of a subject in all installed manuals")))
(define-key menu-bar-manuals-menu [other-manuals]
- '(menu-item "All Other Manuals (Info)" Info-directory
- :help "Read any of the installed manuals"))
+ `(menu-item ,(purecopy "All Other Manuals (Info)") Info-directory
+ :help ,(purecopy "Read any of the installed manuals")))
(define-key menu-bar-manuals-menu [emacs-lisp-reference]
- '(menu-item "Emacs Lisp Reference" menu-bar-read-lispref
- :help "Read the Emacs Lisp Reference manual"))
-(define-key menu-bar-manuals-menu [emac-lisp-intro]
- '(menu-item "Introduction to Emacs Lisp" menu-bar-read-lispintro
- :help "Read the Introduction to Emacs Lisp Programming"))
+ `(menu-item ,(purecopy "Emacs Lisp Reference") menu-bar-read-lispref
+ :help ,(purecopy "Read the Emacs Lisp Reference manual")))
+(define-key menu-bar-manuals-menu [emacs-lisp-intro]
+ `(menu-item ,(purecopy "Introduction to Emacs Lisp") menu-bar-read-lispintro
+ :help ,(purecopy "Read the Introduction to Emacs Lisp Programming")))
(define-key menu-bar-help-menu [about-gnu-project]
- '(menu-item "About GNU" describe-gnu-project
- :help "About the GNU System, GNU Project, and GNU/Linux"))
+ `(menu-item ,(purecopy "About GNU") describe-gnu-project
+ :help ,(purecopy "About the GNU System, GNU Project, and GNU/Linux")))
(define-key menu-bar-help-menu [about-emacs]
- '(menu-item "About Emacs" about-emacs
- :help "Display version number, copyright info, and basic help"))
+ `(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 "(Non)Warranty" describe-no-warranty
- :help "Explain that Emacs has NO WARRANTY"))
+ `(menu-item ,(purecopy "(Non)Warranty") describe-no-warranty
+ :help ,(purecopy "Explain that Emacs has NO WARRANTY")))
(define-key menu-bar-help-menu [describe-copying]
- '(menu-item "Copying Conditions" describe-copying
- :help "Show the Emacs license (GPL)"))
+ `(menu-item ,(purecopy "Copying Conditions") describe-copying
+ :help ,(purecopy "Show the Emacs license (GPL)")))
(define-key menu-bar-help-menu [getting-new-versions]
- '(menu-item "Getting New Versions" describe-distribution
- :help "How to get latest versions of Emacs"))
+ `(menu-item ,(purecopy "Getting New Versions") describe-distribution
+ :help ,(purecopy "How to get the latest version of Emacs")))
(defun menu-bar-help-extra-packages ()
"Display help about some additional packages available for Emacs."
(interactive)
(let (enable-local-variables)
(view-file (expand-file-name "MORE.STUFF"
data-directory))
- (goto-address)))
+ (goto-address-mode 1)))
(define-key menu-bar-help-menu [sep2]
- '("--"))
+ menu-bar-separator)
(define-key menu-bar-help-menu [external-packages]
- '(menu-item "External Packages" menu-bar-help-extra-packages
- :help "Lisp packages distributed separately for use in Emacs"))
+ `(menu-item ,(purecopy "Finding Extra Packages") menu-bar-help-extra-packages
+ :help ,(purecopy "Lisp packages distributed separately for use in Emacs")))
(define-key menu-bar-help-menu [find-emacs-packages]
- '(menu-item "Find Emacs Packages" finder-by-keyword
- :help "Find packages and features by keyword"))
+ `(menu-item ,(purecopy "Search Built-in Packages") finder-by-keyword
+ :help ,(purecopy "Find built-in packages and features by keyword")))
(define-key menu-bar-help-menu [more-manuals]
- (list 'menu-item "More Manuals" menu-bar-manuals-menu))
+ `(menu-item ,(purecopy "More Manuals") ,menu-bar-manuals-menu))
(define-key menu-bar-help-menu [emacs-manual]
- '(menu-item "Read the Emacs Manual" info-emacs-manual
- :help "Full documentation of Emacs features"))
+ `(menu-item ,(purecopy "Read the Emacs Manual") info-emacs-manual
+ :help ,(purecopy "Full documentation of Emacs features")))
(define-key menu-bar-help-menu [describe]
- (list 'menu-item "Describe" menu-bar-describe-menu))
+ `(menu-item ,(purecopy "Describe") ,menu-bar-describe-menu))
(define-key menu-bar-help-menu [search-documentation]
- (list 'menu-item "Search Documentation" menu-bar-search-documentation-menu))
+ `(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 "Emacs Psychotherapist" doctor
- :help "Our doctor will help you feel better"))
+ `(menu-item ,(purecopy "Emacs Psychotherapist") doctor
+ :help ,(purecopy "Our doctor will help you feel better")))
(define-key menu-bar-help-menu [send-emacs-bug-report]
- '(menu-item "Send Bug Report..." report-emacs-bug
- :help "Send e-mail to Emacs maintainers"))
+ `(menu-item ,(purecopy "Send Bug Report...") report-emacs-bug
+ :help ,(purecopy "Send e-mail to Emacs maintainers")))
(define-key menu-bar-help-menu [emacs-known-problems]
- '(menu-item "Emacs Known Problems" view-emacs-problems
- :help "Read about known problems with Emacs"))
+ `(menu-item ,(purecopy "Emacs Known Problems") view-emacs-problems
+ :help ,(purecopy "Read about known problems with Emacs")))
(define-key menu-bar-help-menu [emacs-news]
- '(menu-item "Emacs News" view-emacs-news
- :help "New features of this version"))
+ `(menu-item ,(purecopy "Emacs News") view-emacs-news
+ :help ,(purecopy "New features of this version")))
(define-key menu-bar-help-menu [emacs-faq]
- '(menu-item "Emacs FAQ" view-emacs-FAQ
- :help "Frequently asked (and answered) questions about Emacs"))
+ `(menu-item ,(purecopy "Emacs FAQ") view-emacs-FAQ
+ :help ,(purecopy "Frequently asked (and answered) questions about Emacs")))
(defun help-with-tutorial-spec-language ()
"Use the Emacs tutorial, specifying which language you want."
(help-with-tutorial t))
(define-key menu-bar-help-menu [emacs-tutorial-language-specific]
- '(menu-item "Emacs Tutorial (choose language)..."
+ `(menu-item ,(purecopy "Emacs Tutorial (choose language)...")
help-with-tutorial-spec-language
- :help "Learn how to use Emacs (choose a language)"))
+ :help ,(purecopy "Learn how to use Emacs (choose a language)")))
(define-key menu-bar-help-menu [emacs-tutorial]
- '(menu-item "Emacs Tutorial" help-with-tutorial
- :help "Learn how to use Emacs"))
+ `(menu-item ,(purecopy "Emacs Tutorial") help-with-tutorial
+ :help ,(purecopy "Learn how to use Emacs")))
(defun menu-bar-menu-frame-live-and-visible-p ()
"Return non-nil if the menu frame is alive and visible.
(> count 1)))
(defcustom yank-menu-length 20
- "*Maximum length to display in the yank-menu."
+ "Maximum length to display in the yank-menu."
:type 'integer
:group 'menu)
;;; Buffers Menu
(defcustom buffers-menu-max-size 10
- "*Maximum number of entries which may appear on the Buffers menu.
+ "Maximum number of entries which may appear on the Buffers menu.
If this is 10, then only the ten most-recently-selected buffers are shown.
If this is nil, then all buffers are shown.
A large number or nil slows down menu responsiveness."
:group 'menu)
(defcustom buffers-menu-buffer-name-length 30
- "*Maximum length of the buffer name on the Buffers menu.
+ "Maximum length of the buffer name on the Buffers menu.
If this is a number, then buffer names are truncated to this length.
If this is nil, then buffer names are shown in full.
A large number or nil makes the menu too wide."
:type 'boolean
:group 'menu)
-(defvar list-buffers-directory nil)
+(defvar list-buffers-directory nil
+ "String to display in buffer listings for buffers not visiting a file.")
+(make-variable-buffer-local 'list-buffers-directory)
(defun menu-bar-select-buffer ()
(interactive)
;;nil means the buffer shouldn't be listed. You can redefine this."
;; (if (string-match "\\` " (buffer-name buffer))
;; nil
-;; (save-excursion
-;; (set-buffer buffer)
+;; (with-current-buffer buffer
;; (let ((size (buffer-size)))
;; (format "%s%s %-19s %6s %-15s %s"
;; (if (buffer-modified-p) "*" " ")
;; bug in keymap.c that I don't understand yet. -stef
minibuffer-local-completion-map))
(define-key map [menu-bar minibuf]
- (cons "Minibuf" (make-sparse-keymap "Minibuf"))))
+ (cons (purecopy "Minibuf") (make-sparse-keymap "Minibuf"))))
(let ((map minibuffer-local-completion-map))
(define-key map [menu-bar minibuf ?\?]
- (list 'menu-item "List Completions" 'minibuffer-completion-help
- :help "Display all possible completions"))
+ `(menu-item ,(purecopy "List Completions") minibuffer-completion-help
+ :help ,(purecopy "Display all possible completions")))
(define-key map [menu-bar minibuf space]
- (list 'menu-item "Complete Word" 'minibuffer-complete-word
- :help "Complete at most one word"))
+ `(menu-item ,(purecopy "Complete Word") minibuffer-complete-word
+ :help ,(purecopy "Complete at most one word")))
(define-key map [menu-bar minibuf tab]
- (list 'menu-item "Complete" 'minibuffer-complete
- :help "Complete as far as possible")))
+ `(menu-item ,(purecopy "Complete") minibuffer-complete
+ :help ,(purecopy "Complete as far as possible"))))
(let ((map minibuffer-local-map))
(define-key map [menu-bar minibuf quit]
- (list 'menu-item "Quit" 'abort-recursive-edit
- :help "Abort input and exit minibuffer"))
+ `(menu-item ,(purecopy "Quit") abort-recursive-edit
+ :help ,(purecopy "Abort input and exit minibuffer")))
(define-key map [menu-bar minibuf return]
- (list 'menu-item "Enter" 'exit-minibuffer
- :key-sequence "\r"
- :help "Terminate input and exit minibuffer"))
+ `(menu-item ,(purecopy "Enter") exit-minibuffer
+ :key-sequence ,(purecopy "\r")
+ :help ,(purecopy "Terminate input and exit minibuffer")))
(define-key map [menu-bar minibuf isearch-forward]
- (list 'menu-item "Isearch History Forward" 'isearch-forward
- :help "Incrementally search minibuffer history forward"))
+ `(menu-item ,(purecopy "Isearch History Forward") isearch-forward
+ :help ,(purecopy "Incrementally search minibuffer history forward")))
(define-key map [menu-bar minibuf isearch-backward]
- (list 'menu-item "Isearch History Backward" 'isearch-backward
- :help "Incrementally search minibuffer history backward"))
+ `(menu-item ,(purecopy "Isearch History Backward") isearch-backward
+ :help ,(purecopy "Incrementally search minibuffer history backward")))
(define-key map [menu-bar minibuf next]
- (list 'menu-item "Next History Item" 'next-history-element
- :help "Put next minibuffer history element in the minibuffer"))
+ `(menu-item ,(purecopy "Next History Item") next-history-element
+ :help ,(purecopy "Put next minibuffer history element in the minibuffer")))
(define-key map [menu-bar minibuf previous]
- (list 'menu-item "Previous History Item" 'previous-history-element
- :help "Put previous minibuffer history element in the minibuffer")))
+ `(menu-item ,(purecopy "Previous History Item") previous-history-element
+ :help ,(purecopy "Put previous minibuffer history element in the minibuffer"))))
\f
-;;;###autoload
-;; This comment is taken from tool-bar.el near
-;; (put 'tool-bar-mode ...)
-;; We want to pretend the menu bar by standard is on, as this will make
-;; customize consider disabling the menu bar a customization, and save
-;; that. We could do this for real by setting :init-value below, but
-;; that would overwrite disabling the tool bar from X resources.
-(put 'menu-bar-mode 'standard-value '(t))
-
(define-minor-mode menu-bar-mode
"Toggle display of a menu bar on each frame.
This command applies to all frames that exist and frames to be
created in the future.
With a numeric argument, if the argument is positive,
turn on menu bars; otherwise, turn off menu bars."
- :init-value nil
+ :init-value t
:global t
:group 'frames
- ;; Make menu-bar-mode and default-frame-alist consistent.
- (modify-all-frames-parameters (list (cons 'menu-bar-lines
- (if menu-bar-mode 1 0))))
-
+ ;; Turn the menu-bars on all frames on or off.
+ (let ((val (if menu-bar-mode 1 0)))
+ (dolist (frame (frame-list))
+ (set-frame-parameter frame 'menu-bar-lines val))
+ ;; If the user has given `default-frame-alist' a `menu-bar-lines'
+ ;; parameter, replace it.
+ (if (assq 'menu-bar-lines default-frame-alist)
+ (setq default-frame-alist
+ (cons (cons 'menu-bar-lines val)
+ (assq-delete-all 'menu-bar-lines
+ default-frame-alist)))))
;; Make the message appear when Emacs is idle. We can not call message
;; directly. The minor-mode message "Menu-bar mode disabled" comes
;; after this function returns, overwriting any message we do here.
- (when (and (interactive-p) (not menu-bar-mode))
+ (when (and (called-interactively-p 'interactive) (not menu-bar-mode))
(run-with-idle-timer 0 nil 'message
- "Menu-bar mode disabled. Use M-x menu-bar-mode to make the menu bar appear."))
- menu-bar-mode)
+ "Menu-bar mode disabled. Use M-x menu-bar-mode to make the menu bar appear.")))
+
+;;;###autoload
+;; (This does not work right unless it comes after the above definition.)
+;; This comment is taken from tool-bar.el near
+;; (put 'tool-bar-mode ...)
+;; We want to pretend the menu bar by standard is on, as this will make
+;; customize consider disabling the menu bar a customization, and save
+;; that. We could do this for real by setting :init-value above, but
+;; that would overwrite disabling the menu bar from X resources.
+(put 'menu-bar-mode 'standard-value '(t))
(defun toggle-menu-bar-mode-from-frame (&optional arg)
"Toggle menu bar on or off, based on the status of the current frame.
(provide 'menu-bar)
-;; arch-tag: 6e6a3c22-4ec4-4d3d-8190-583f8ef94ced
;;; menu-bar.el ends here
HCoop / bpt / emacs.git / blobdiff