X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7faa9d02211cc1a401c5f962d1c7b7f8f573c9d4..b36a53f4be733b326739fdebb2285d106eecbd06:/lisp/menu-bar.el diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 093969d572..a44165ff63 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1,6 +1,7 @@ ;;; menu-bar.el --- define a default menu bar -;; Copyright (C) 1993,94,1995,2000,01,02,2003 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006, 2007 Free Software Foundation, Inc. ;; Author: RMS ;; Maintainer: FSF @@ -10,7 +11,7 @@ ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) +;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, @@ -20,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;; Avishai Yacobi suggested some menu rearrangements. @@ -55,9 +56,10 @@ A large number or nil slows down menu responsiveness." (defvar menu-bar-tools-menu (make-sparse-keymap "Tools")) (define-key global-map [menu-bar tools] (cons "Tools" menu-bar-tools-menu)) ;; This definition is just to show what this looks like. -;; It gets overridden below when menu-bar-update-buffers is called. +;; 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" (make-sparse-keymap "Buffers"))) + (cons "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)) @@ -98,13 +100,15 @@ A large number or nil slows down menu responsiveness." :help "Open a new frame")) (define-key menu-bar-file-menu [one-window] - '(menu-item "Unsplit Windows" delete-other-windows + '(menu-item "Remove Splits" delete-other-windows :enable (not (one-window-p t nil)) - :help "Make selected window fill its frame")) + :help "Selected window grows to fill the whole frame")) (define-key menu-bar-file-menu [split-window] '(menu-item "Split Window" split-window-vertically - :help "Split selected window in two")) + :enable (and (menu-bar-menu-frame-live-and-visible-p) + (menu-bar-non-minibuffer-window-p)) + :help "Split selected window in two windows")) (define-key menu-bar-file-menu [separator-window] '(menu-item "--")) @@ -115,6 +119,7 @@ A large number or nil slows down menu responsiveness." :help "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 + :enable (menu-bar-menu-frame-live-and-visible-p) :help "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 @@ -122,6 +127,7 @@ A large number or nil slows down menu responsiveness." :help "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 + :enable (menu-bar-menu-frame-live-and-visible-p) :help "Pretty-print current buffer to PostScript printer")) (define-key menu-bar-file-menu [print-region] '(menu-item "Print Region" print-region @@ -129,13 +135,14 @@ A large number or nil slows down menu responsiveness." :help "Print region between mark and current position")) (define-key menu-bar-file-menu [print-buffer] '(menu-item "Print Buffer" print-buffer + :enable (menu-bar-menu-frame-live-and-visible-p) :help "Print current buffer with page headings")) (define-key menu-bar-file-menu [separator-print] '(menu-item "--")) (define-key menu-bar-file-menu [recover-session] - '(menu-item "Recover Crashed Session..." recover-session + '(menu-item "Recover Crashed Session" recover-session :enable (and auto-save-list-file-prefix (file-directory-p (file-name-directory auto-save-list-file-prefix)) @@ -158,43 +165,51 @@ A large number or nil slows down menu responsiveness." (current-buffer)))))) :help "Re-read current buffer from its file")) (define-key menu-bar-file-menu [write-file] - '(menu-item "Save Buffer As..." write-file - :enable (not (window-minibuffer-p - (frame-selected-window menu-updating-frame))) + '(menu-item "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")) (define-key menu-bar-file-menu [save-buffer] - '(menu-item "Save (current buffer)" save-buffer + '(menu-item "Save" save-buffer :enable (and (buffer-modified-p) (buffer-file-name) - (not (window-minibuffer-p - (frame-selected-window menu-updating-frame)))) + (menu-bar-non-minibuffer-window-p)) :help "Save current buffer to its file")) (define-key menu-bar-file-menu [separator-save] '(menu-item "--")) +(defun menu-find-file-existing () + "Edit the existing file FILENAME." + (interactive) + (let* ((mustmatch (not (and (fboundp 'x-uses-old-gtk-dialog) + (x-uses-old-gtk-dialog)))) + (filename (car (find-file-read-args "Find file: " mustmatch)))) + (if mustmatch + (find-file-existing filename) + (find-file filename)))) + + (define-key menu-bar-file-menu [kill-buffer] - '(menu-item "Close (current buffer)" kill-this-buffer + '(menu-item "Close" kill-this-buffer :enable (kill-this-buffer-enabled-p) - :help "Discard current buffer")) + :help "Discard (kill) current buffer")) (define-key menu-bar-file-menu [insert-file] '(menu-item "Insert File..." insert-file - :enable (not (window-minibuffer-p - (frame-selected-window menu-updating-frame))) + :enable (menu-bar-non-minibuffer-window-p) :help "Insert another file into current buffer")) (define-key menu-bar-file-menu [dired] '(menu-item "Open Directory..." dired - :help "Read a directory, operate on its files")) + :enable (menu-bar-non-minibuffer-window-p) + :help "Read a directory, to operate on its files")) (define-key menu-bar-file-menu [open-file] - '(menu-item "Open File..." find-file-existing - :enable (not (window-minibuffer-p - (frame-selected-window menu-updating-frame))) + '(menu-item "Open File..." menu-find-file-existing + :enable (menu-bar-non-minibuffer-window-p) :help "Read an existing file into an Emacs buffer")) (define-key menu-bar-file-menu [new-file] - '(menu-item "New File..." find-file - :enable (not (window-minibuffer-p - (frame-selected-window menu-updating-frame))) - :help "Read or create a file and edit it")) + '(menu-item "Visit New File..." find-file + :enable (menu-bar-non-minibuffer-window-p) + :help "Specify a new file's name, to edit the file")) ;; The "Edit" menu items @@ -286,8 +301,7 @@ A large number or nil slows down menu responsiveness." (define-key menu-bar-search-menu [i-search] - (list 'menu-item "Incremental Search" menu-bar-i-search-menu - :help "Incremental Search finds partial matches while you type the search string.\nIt is most convenient from the keyboard. Try it!")) + (list 'menu-item "Incremental Search" menu-bar-i-search-menu)) (define-key menu-bar-search-menu [separator-tag-isearch] '(menu-item "--")) @@ -295,7 +309,7 @@ A large number or nil slows down menu responsiveness." '(menu-item "Continue Tags Search" tags-loop-continue :help "Continue last tags search operation")) (define-key menu-bar-search-menu [tags-srch] - '(menu-item "Search tagged files" tags-search + '(menu-item "Search tagged files..." tags-search :help "Search for a regexp in all tagged files")) (define-key menu-bar-search-menu [separator-tag-search] '(menu-item "--")) @@ -339,7 +353,7 @@ A large number or nil slows down menu responsiveness." '(menu-item "Continue Replace" tags-loop-continue :help "Continue last tags replace operation")) (define-key menu-bar-replace-menu [tags-repl] - '(menu-item "Replace in tagged files" tags-query-replace + '(menu-item "Replace in tagged files..." tags-query-replace :help "Interactively replace a regexp in all tagged files")) (define-key menu-bar-replace-menu [separator-replace-tags] '(menu-item "--")) @@ -355,8 +369,7 @@ A large number or nil slows down menu responsiveness." ;;; Assemble the top-level Edit menu items. (define-key menu-bar-edit-menu [props] - '(menu-item "Text Properties" facemenu-menu - :help "Change properties of text in region")) + '(menu-item "Text Properties" facemenu-menu)) (define-key menu-bar-edit-menu [fill] '(menu-item "Fill" fill-region @@ -368,20 +381,19 @@ A large number or nil slows down menu responsiveness." '(menu-item "--")) (define-key menu-bar-edit-menu [bookmark] - '(menu-item "Bookmarks" menu-bar-bookmark-map - :help "Record positions and jump between them")) + '(menu-item "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 + '(menu-item "Set Tags File Name..." visit-tags-table :help "Tell Tags commands which tag table file to use")) (define-key menu-bar-goto-menu [separator-tag-file] '(menu-item "--")) (define-key menu-bar-goto-menu [apropos-tags] - '(menu-item "Tags Apropos" tags-apropos + '(menu-item "Tags Apropos..." tags-apropos :help "Find function/variables whose names match regexp")) (define-key menu-bar-goto-menu [next-tag-otherw] '(menu-item "Next Tag in Other Window" @@ -451,10 +463,10 @@ A large number or nil slows down menu responsiveness." "Delete the text in region between mark and current position")) (defvar yank-menu (cons "Select Yank" nil)) (fset 'yank-menu (cons 'keymap yank-menu)) -(define-key menu-bar-edit-menu [select-paste] - '(menu-item "Select and Paste" yank-menu +(define-key menu-bar-edit-menu [paste-from-menu] + '(menu-item "Paste from kill menu" yank-menu :enable (and (cdr yank-menu) (not buffer-read-only)) - :help "Paste (yank) text cut or copied earlier")) + :help "Choose a string from the kill ring and paste it")) (define-key menu-bar-edit-menu [paste] '(menu-item "Paste" yank :enable (and @@ -478,7 +490,7 @@ A large number or nil slows down menu responsiveness." :enable (and (not buffer-read-only) (not (eq t buffer-undo-list)) (if (eq last-command 'undo) - pending-undo-list + (listp pending-undo-list) (consp buffer-undo-list))) :help "Undo last operation")) @@ -500,7 +512,7 @@ A large number or nil slows down menu responsiveness." (defun clipboard-yank () "Insert the clipboard contents, or the last stretch of killed text." - (interactive) + (interactive "*") (let ((x-select-enable-clipboard t)) (yank))) @@ -594,7 +606,7 @@ 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 - ,@(if props props) + ,@props :help ,help :button (:toggle . (and (default-boundp ',fname) (default-value ',fname))))) @@ -603,7 +615,7 @@ PROPS are additional properties." `(progn (defun ,name (&optional interactively) ,(concat "Toggle whether to " (downcase (substring help 0 1)) - (substring help 1) ".\ + (substring help 1) ". In an interactive call, record this option as a candidate for saving by \"Save Options\" in Custom buffers.") (interactive "p") @@ -613,8 +625,8 @@ by \"Save Options\" in Custom buffers.") (let ((set (or (get ',variable 'custom-set) 'set-default)) (get (or (get ',variable 'custom-get) 'default-value))) (funcall set ',variable (not (funcall get ',variable)))))) - (message ,message "enabled") - (message ,message "disabled")) + (message ,message "enabled globally") + (message ,message "disabled globally")) ;; The function `customize-mark-as-set' must only be called when ;; a variable is set interactively, as the purpose is to mark it as ;; a candidate for "Save Options", and we do not want to save options @@ -627,8 +639,7 @@ by \"Save Options\" in Custom buffers.") ;;; 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 - :help "Full customization of every Emacs feature")) + (list 'menu-item "Customize Emacs" menu-bar-custom-menu)) (defun menu-bar-options-save () "Save current values of Options menu items using Custom." @@ -636,17 +647,18 @@ by \"Save Options\" in Custom buffers.") (let ((need-save nil)) ;; These are set with menu-bar-make-mm-toggle, which does not ;; put on a customized-value property. - (dolist (elt '(line-number-mode column-number-mode cua-mode show-paren-mode - transient-mark-mode global-font-lock-mode - blink-cursor-mode)) + (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)) (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 menu-bar-mode tool-bar-mode + debug-on-quit debug-on-error + tooltip-mode menu-bar-mode tool-bar-mode save-place uniquify-buffer-name-style fringe-mode - fringe-indicators case-fold-search - display-time-mode auto-compression-mode + indicate-empty-lines indicate-buffer-boundaries + case-fold-search current-language-environment default-input-method ;; Saving `text-mode-hook' is somewhat questionable, ;; as we might get more than we bargain for, if @@ -670,7 +682,7 @@ by \"Save Options\" in Custom buffers.") '("--")) (define-key menu-bar-options-menu [mouse-set-font] - '(menu-item "Set Font/Fontset" mouse-set-font + '(menu-item "Set Font/Fontset..." mouse-set-font :visible (display-multi-font-p) :help "Select a font from list of known fonts/fontsets")) @@ -688,21 +700,24 @@ by \"Save Options\" in Custom buffers.") "Line Numbers" "Show the current line number in the mode line")) +(define-key menu-bar-showhide-menu [size-indication-mode] + (menu-bar-make-mm-toggle size-indication-mode + "Size Indication" + "Show the size of the buffer in the mode line")) + (define-key menu-bar-showhide-menu [linecolumn-separator] '("--")) -(defun showhide-date-time () - "Toggle whether to show date and time in the mode-line." - (interactive) - (if (display-time-mode) - (message "Display-time mode enabled.") - (message "Display-time mode disabled.")) - (customize-mark-as-set 'display-time-mode)) +(define-key menu-bar-showhide-menu [showhide-battery] + (menu-bar-make-mm-toggle display-battery-mode + "Battery Status" + "Display battery status information in mode line")) (define-key menu-bar-showhide-menu [showhide-date-time] - '(menu-item "Date, Time and Mail" showhide-date-time - :help "Display date, time, mail status in mode line" - :button (:toggle . display-time-mode))) + (menu-bar-make-mm-toggle display-time-mode + "Time, Load and Mail" + "Display time, system load averages and \ +mail status in mode line")) (define-key menu-bar-showhide-menu [datetime-separator] '("--")) @@ -716,88 +731,92 @@ by \"Save Options\" in Custom buffers.") (frame-visible-p (symbol-value 'speedbar-frame)))))) +(defvar menu-bar-showhide-fringe-menu (make-sparse-keymap "Fringe")) -(defvar menu-bar-showhide-fringe-ind-menu (make-sparse-keymap "Indicators")) - -;; The real definition is in fringe.el. -;; This is to prevent errors in the :radio conditions below. -(setq fringe-indicators nil) +(defvar menu-bar-showhide-fringe-ind-menu + (make-sparse-keymap "Buffer boundaries")) -(defun menu-bar-showhide-fringe-ind-empty () - "Display empty line indicators in the left or right fringe." +(defun menu-bar-showhide-fringe-ind-customize () + "Show customization buffer for `indicate-buffer-boundaries'." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators 'empty)) + (customize-variable 'indicate-buffer-boundaries)) -(define-key menu-bar-showhide-fringe-ind-menu [empty] - '(menu-item "Empty lines only" menu-bar-showhide-fringe-ind-empty - :help "Show empty line indicators in fringe" - :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators 'empty)))) +(define-key menu-bar-showhide-fringe-ind-menu [customize] + '(menu-item "Other (Customize)" + menu-bar-showhide-fringe-ind-customize + :help "Additional choices available through Custom buffer" + :visible (display-graphic-p))) (defun menu-bar-showhide-fringe-ind-mixed () - "Display top and bottom indicators in opposite fringes, arrow in right." + "Display top and bottom indicators in opposite fringes, arrows in right." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators 'mixed)) + (customize-set-variable 'indicate-buffer-boundaries + '((t . right) (top . left)))) (define-key menu-bar-showhide-fringe-ind-menu [mixed] - '(menu-item "Opposite, arrows right" menu-bar-showhide-fringe-ind-mixed - :help "Show top/bottom indicators in opposite fringes, arrows in right" + '(menu-item "Opposite, Arrows Right" menu-bar-showhide-fringe-ind-mixed + :help + "Show top/bottom indicators in opposite fringes, arrows in right" :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators 'mixed)))) + :button (:radio . (eq indicate-buffer-boundaries + '((t . right) (top . left)))))) (defun menu-bar-showhide-fringe-ind-box () "Display top and bottom indicators in opposite fringes." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators 'box)) + (customize-set-variable 'indicate-buffer-boundaries + '((top . left) (bottom . right)))) (define-key menu-bar-showhide-fringe-ind-menu [box] - '(menu-item "Opposite, no arrows" menu-bar-showhide-fringe-ind-box + '(menu-item "Opposite, No Arrows" menu-bar-showhide-fringe-ind-box :help "Show top/bottom indicators in opposite fringes, no arrows" :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators 'box)))) + :button (:radio . (eq indicate-buffer-boundaries + '((top . left) (bottom . right)))))) (defun menu-bar-showhide-fringe-ind-right () - "Display fringe indicators in the right fringe." + "Display buffer boundaries and arrows in the right fringe." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators '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 indicators in right fringe" + '(menu-item "In Right Fringe" menu-bar-showhide-fringe-ind-right + :help "Show buffer boundaries and arrows in right fringe" :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators 'right)))) + :button (:radio . (eq indicate-buffer-boundaries 'right)))) (defun menu-bar-showhide-fringe-ind-left () - "Display fringe indicators in the left fringe." + "Display buffer boundaries and arrows in the left fringe." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators 'left)) + (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 indicators in left fringe" + '(menu-item "In Left Fringe" menu-bar-showhide-fringe-ind-left + :help "Show buffer boundaries and arrows in left fringe" :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators 'left)))) + :button (:radio . (eq indicate-buffer-boundaries 'left)))) (defun menu-bar-showhide-fringe-ind-none () - "Do not display any fringe indicators." + "Do not display any buffer boundary indicators." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators nil)) + (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 fringe indicators" + '(menu-item "No Indicators" menu-bar-showhide-fringe-ind-none + :help "Hide all buffer boundary indicators and arrows" :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators nil)))) - + :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")) -(defvar menu-bar-showhide-fringe-menu (make-sparse-keymap "Fringe")) +(define-key menu-bar-showhide-fringe-menu [indicate-empty-lines] + (menu-bar-make-toggle toggle-indicate-empty-lines indicate-empty-lines + "Empty Line Indicators" + "Indicating of empty lines %s" + "Indicate trailing empty lines in fringe, globally")) (defun menu-bar-showhide-fringe-menu-customize () "Show customization buffer for `fringe-mode'." @@ -805,7 +824,7 @@ by \"Save Options\" in Custom buffers.") (customize-variable 'fringe-mode)) (define-key menu-bar-showhide-fringe-menu [customize] - '(menu-item "Customize" menu-bar-showhide-fringe-menu-customize + '(menu-item "Customize Fringe" menu-bar-showhide-fringe-menu-customize :help "Detailed customization of fringe" :visible (display-graphic-p))) @@ -814,33 +833,12 @@ by \"Save Options\" in Custom buffers.") (interactive) (customize-set-variable 'fringe-mode nil)) -(define-key menu-bar-showhide-fringe-menu [showhide-fringe-ind] - (list 'menu-item "Indicators" menu-bar-showhide-fringe-ind-menu - :visible `(display-graphic-p) - :help "Select fringe mode")) - -;; The real definition is in fringe.el. -;; This is to prevent errors in the :radio conditions below. -(setq 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" :visible (display-graphic-p) :button (:radio . (eq fringe-mode nil)))) -(defun menu-bar-showhide-fringe-menu-customize-left () - "Display fringes only on the left of each window." - (interactive) - (require 'fringe) - (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" - :visible (display-graphic-p) - :button (:radio . (equal fringe-mode '(nil . 0))))) - (defun menu-bar-showhide-fringe-menu-customize-right () "Display fringes only on the right of each window." (interactive) @@ -853,6 +851,18 @@ by \"Save Options\" in Custom buffers.") :visible (display-graphic-p) :button (:radio . (equal fringe-mode '(0 . nil))))) +(defun menu-bar-showhide-fringe-menu-customize-left () + "Display fringes only on the left of each window." + (interactive) + (require 'fringe) + (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" + :visible (display-graphic-p) + :button (:radio . (equal fringe-mode '(nil . 0))))) + (defun menu-bar-showhide-fringe-menu-customize-disable () "Do not display window fringes." (interactive) @@ -867,8 +877,7 @@ by \"Save Options\" in Custom buffers.") (define-key menu-bar-showhide-menu [showhide-fringe] (list 'menu-item "Fringe" menu-bar-showhide-fringe-menu - :visible `(display-graphic-p) - :help "Select fringe mode")) + :visible `(display-graphic-p))) (defvar menu-bar-showhide-scroll-bar-menu (make-sparse-keymap "Scroll-bar")) @@ -912,12 +921,17 @@ by \"Save Options\" in Custom buffers.") (define-key menu-bar-showhide-menu [showhide-scroll-bar] (list 'menu-item "Scroll-bar" menu-bar-showhide-scroll-bar-menu - :visible `(display-graphic-p) - :help "Select scroll-bar mode")) + :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))) (define-key menu-bar-showhide-menu [menu-bar-mode] '(menu-item "Menu-bar" menu-bar-mode - :help "Toggle menu-bar on/off" + :help "Turn menu-bar on/off" :button (:toggle . menu-bar-mode))) (define-key menu-bar-showhide-menu [showhide-tool-bar] @@ -927,8 +941,7 @@ by \"Save Options\" in Custom buffers.") :button `(:toggle . tool-bar-mode))) (define-key menu-bar-options-menu [showhide] - (list 'menu-item "Show/Hide" menu-bar-showhide-menu - :help "Toggle on/off various display features")) + (list 'menu-item "Show/Hide" menu-bar-showhide-menu)) (define-key menu-bar-options-menu [showhide-separator] '("--")) @@ -941,7 +954,7 @@ by \"Save Options\" in Custom buffers.") ;; Most of the MULE menu actually does make sense in unibyte mode, ;; e.g. language selection. ;;; ':visible 'default-enable-multibyte-characters - ':help "Default language, encodings, input method")) + )) ;(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 @@ -968,13 +981,6 @@ by \"Save Options\" in Custom buffers.") (define-key menu-bar-options-menu [cursor-separator] '("--")) -(define-key menu-bar-options-menu [toggle-auto-compression] - '(menu-item "Automatic File De/compression" - auto-compression-mode - :help "Transparently decompress compressed files" - :button (:toggle . (rassq 'jka-compr-handler - file-name-handler-alist)))) - (define-key menu-bar-options-menu [save-place] (menu-bar-make-toggle toggle-save-place-globally save-place "Save Place in Files between Sessions" @@ -1000,14 +1006,23 @@ by \"Save Options\" in Custom buffers.") '("--")) (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)" - "Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste")) + "C-x/C-c/C-v Cut and Paste (CUA)" + "Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste" + (:visible (or (not (boundp 'cua-enable-cua-keys)) + cua-enable-cua-keys)))) + +(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." + (:visible (and (boundp 'cua-enable-cua-keys) + (not cua-enable-cua-keys))))) (define-key menu-bar-options-menu [case-fold-search] (menu-bar-make-toggle toggle-case-fold-search case-fold-search - "Case-Insensitive Search" - "Case-Insensitive Search %s" - "Ignore letter-case in search")) + "Case-Insensitive Search" + "Case-Insensitive Search %s" + "Globally ignore letter-case in search")) (defun menu-bar-text-mode-auto-fill () (interactive) @@ -1028,7 +1043,8 @@ by \"Save Options\" in Custom buffers.") '(menu-item "Truncate Long Lines in this Buffer" toggle-truncate-lines :help "Truncate long lines on the screen" - :button (:toggle . truncate-lines))) + :button (:toggle . truncate-lines) + :enable (menu-bar-menu-frame-live-and-visible-p))) (define-key menu-bar-options-menu [highlight-separator] '("--")) @@ -1041,10 +1057,6 @@ by \"Save Options\" in Custom buffers.") "Active Region Highlighting" "Make text in active region stand out in color (Transient Mark mode)" (:enable (not cua-mode)))) -(define-key menu-bar-options-menu [toggle-global-lazy-font-lock-mode] - (menu-bar-make-mm-toggle global-font-lock-mode - "Syntax Highlighting" - "Colorize text based on language syntax (Global Font Lock mode)")) ;; The "Tools" menu items @@ -1080,9 +1092,6 @@ by \"Save Options\" in Custom buffers.") (define-key menu-bar-games-menu [zone] '(menu-item "Zone Out" zone :help "Play tricks with Emacs display when Emacs is idle")) -(define-key menu-bar-games-menu [yow] - '(menu-item "Random Quotation" yow - :help "Display a random Zippy quotation")) (define-key menu-bar-games-menu [tetris] '(menu-item "Tetris" tetris)) (define-key menu-bar-games-menu [solitaire] @@ -1092,7 +1101,7 @@ by \"Save Options\" in Custom buffers.") :help "Move snake around avoiding collisions")) (define-key menu-bar-games-menu [mult] '(menu-item "Multiplication Puzzle" mpuz - :help "Excercise brain with multiplication")) + :help "Exercise brain with multiplication")) (define-key menu-bar-games-menu [life] '(menu-item "Life" life :help "Watch how John Conway's cellular automaton evolves")) @@ -1119,14 +1128,14 @@ by \"Save Options\" in Custom buffers.") '(menu-item "Programmable Calculator" calc :help "Invoke the Emacs built-in full scientific calculator")) (define-key menu-bar-tools-menu [calendar] - '(menu-item "Display Calendar" calendar)) + '(menu-item "Calendar" calendar + :help "Invoke the Emacs built-in calendar")) (define-key menu-bar-tools-menu [separator-net] '("--")) (define-key menu-bar-tools-menu [directory-search] - '(menu-item "Directory Search" eudc-tools-menu - :help "Query directory servers via LDAP, CCSO PH/QI or BBDB")) + '(menu-item "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)) @@ -1152,29 +1161,21 @@ by \"Save Options\" in Custom buffers.") (define-key menu-bar-tools-menu [separator-vc] '("--")) -(defvar vc-menu-map (make-sparse-keymap "Version Control")) (define-key menu-bar-tools-menu [pcl-cvs] - '(menu-item "PCL-CVS" cvs-global-menu - :help "Module-level interface to CVS")) -(define-key menu-bar-tools-menu [vc] - (list 'menu-item "Version Control" vc-menu-map - :help "Interface to RCS, CVS, SCCS")) + '(menu-item "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] '("--")) (define-key menu-bar-tools-menu [ediff-misc] - '(menu-item "Ediff Miscellanea" menu-bar-ediff-misc-menu - :help "Ediff manual, customization, sessions, etc.")) + '(menu-item "Ediff Miscellanea" menu-bar-ediff-misc-menu)) (define-key menu-bar-tools-menu [epatch] '(menu-item "Apply Patch" menu-bar-epatch-menu)) (define-key menu-bar-tools-menu [ediff-merge] - '(menu-item "Merge" menu-bar-ediff-merge-menu - :help "Merge different revisions of files/directories")) + '(menu-item "Merge" menu-bar-ediff-merge-menu)) (define-key menu-bar-tools-menu [compare] - '(menu-item "Compare (Ediff)" menu-bar-ediff-menu - :help "Display differences between files/directories")) - + '(menu-item "Compare (Ediff)" menu-bar-ediff-menu)) (define-key menu-bar-tools-menu [separator-spell] '("--")) @@ -1199,8 +1200,8 @@ by \"Save Options\" in Custom buffers.") '(menu-item "Compile..." compile :help "Invoke compiler or Make, view compilation errors")) (define-key menu-bar-tools-menu [grep] - '(menu-item "Search Files (with grep)..." grep - :help "Search files for strings or regexps (with grep)")) + '(menu-item "Search Files (Grep)..." grep + :help "Search files for strings or regexps (with Grep)")) ;; The "Help" menu items @@ -1224,15 +1225,14 @@ by \"Save Options\" in Custom buffers.") :help "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 - :help "Show multilingual settings for a specific language")) + describe-language-environment-map)) (define-key menu-bar-describe-menu [separator-desc-mule] '("--")) (define-key menu-bar-describe-menu [list-keybindings] '(menu-item "List Key Bindings" describe-bindings - :help "Display a list of all current keybindings")) + :help "Display all current keybindings (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")) @@ -1246,20 +1246,16 @@ by \"Save Options\" in Custom buffers.") '(menu-item "Describe Function..." describe-function :help "Display documentation of function/command")) (define-key menu-bar-describe-menu [describe-key-1] - '(menu-item "Describe Key..." describe-key - ;; Users typically don't identify keys and menu items... - :help "Display documentation of command bound to a \ -key (or menu-item)")) -(define-key menu-bar-describe-menu [describe-key] - '(menu-item "What's This? " describe-key + '(menu-item "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 (or menu-item)")) +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")) -(defvar menu-bar-apropos-menu (make-sparse-keymap "Apropos")) +(defvar menu-bar-search-documentation-menu + (make-sparse-keymap "Search Documentation")) (defun menu-bar-read-lispref () "Display the Emacs Lisp Reference manual in Info mode." (interactive) @@ -1287,31 +1283,37 @@ key (or menu-item)")) (info "elisp") (Info-index topic)) -(define-key menu-bar-apropos-menu [apropos-documentation] +(define-key menu-bar-search-documentation-menu [search-documentation-strings] '(menu-item "Search Documentation Strings..." apropos-documentation :help "Find functions and variables whose doc strings match a regexp")) -(define-key menu-bar-apropos-menu [apropos] +(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")) -(define-key menu-bar-apropos-menu [apropos-value] +(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")) -(define-key menu-bar-apropos-menu [apropos-variables] +(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")) -(define-key menu-bar-apropos-menu [apropos-commands] +(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")) -(define-key menu-bar-apropos-menu [sep1] +(define-key menu-bar-search-documentation-menu [sep1] '("--")) -(define-key menu-bar-apropos-menu [elisp-index-search] +(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")) +(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")) +(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")) -(define-key menu-bar-apropos-menu [emacs-index-search] +(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")) -(define-key menu-bar-apropos-menu [emacs-glossary] +(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")) @@ -1325,26 +1327,21 @@ key (or menu-item)")) (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")) -(define-key menu-bar-manuals-menu [info] +(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")) +(define-key menu-bar-manuals-menu [other-manuals] '(menu-item "All Other Manuals (Info)" Info-directory :help "Read any of the installed manuals")) -(define-key menu-bar-manuals-menu [info-elisp] +(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 [info-elintro] +(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")) -(define-key menu-bar-manuals-menu [sep3] - '("--")) -(define-key menu-bar-manuals-menu [command] - '(menu-item "Find Command in Manual" Info-goto-emacs-command-node - :help "Display manual section that describes a command")) -(define-key menu-bar-manuals-menu [key] - '(menu-item "Find Key in Manual" Info-goto-emacs-key-command-node - :help "Display manual section that describes a key")) -(define-key menu-bar-help-menu [eliza] - '(menu-item "Emacs Psychiatrist" doctor +(define-key menu-bar-help-menu [emacs-psychotherapist] + '(menu-item "Emacs Psychotherapist" doctor :help "Our doctor will help you feel better")) (define-key menu-bar-help-menu [sep4] '("--")) @@ -1354,13 +1351,15 @@ key (or menu-item)")) (define-key menu-bar-help-menu [describe-copying] '(menu-item "Copying Conditions" describe-copying :help "Show the Emacs license (GPL)")) -(define-key menu-bar-help-menu [describe-distribution] +(define-key menu-bar-help-menu [about-gnu-project] + '(menu-item "About GNU" describe-project + :help "About the GNU System, GNU Project, and GNU/Linux")) +(define-key menu-bar-help-menu [getting-new-versions] '(menu-item "Getting New Versions" describe-distribution :help "How to get latest versions of Emacs")) -(define-key menu-bar-help-menu [more] - '(menu-item "Find Extra Packages" - menu-bar-help-extra-packages - :help "Where to find some extra packages and possible updates")) +(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")) (defun menu-bar-help-extra-packages () "Display help about some additional packages available for Emacs." (interactive) @@ -1368,38 +1367,37 @@ key (or menu-item)")) (view-file (expand-file-name "MORE.STUFF" data-directory)) (goto-address))) -(define-key menu-bar-help-menu [about] +(define-key menu-bar-help-menu [about-emacs] '(menu-item "About Emacs" display-splash-screen :help "Display version number, copyright info, and basic help")) (define-key menu-bar-help-menu [sep2] '("--")) -(define-key menu-bar-help-menu [finder-by-keyword] - '(menu-item "Find Emacs Packages..." finder-by-keyword +(define-key menu-bar-help-menu [find-emacs-packages] + '(menu-item "Find Emacs Packages" finder-by-keyword :help "Find packages and features by keyword")) -(define-key menu-bar-help-menu [manuals] - (list 'menu-item "More Manuals" menu-bar-manuals-menu - :help "Search and browse on-line manuals")) +(define-key menu-bar-help-menu [more-manuals] + (list 'menu-item "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")) (define-key menu-bar-help-menu [describe] - (list 'menu-item "Describe" menu-bar-describe-menu - :help "Describe commands, variables, keys")) -(define-key menu-bar-help-menu [apropos] - (list 'menu-item "Search Documentation" menu-bar-apropos-menu - :help "Look up terms, find commands, options, etc. (Apropos)")) + (list 'menu-item "Describe" menu-bar-describe-menu)) +(define-key menu-bar-help-menu [search-documentation] + (list 'menu-item "Search Documentation" menu-bar-search-documentation-menu)) (define-key menu-bar-help-menu [sep1] '("--")) -(define-key menu-bar-help-menu [report-emacs-bug] +(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")) -(define-key menu-bar-help-menu [emacs-problems] - '(menu-item "Emacs Known Problems" view-emacs-problems)) +(define-key menu-bar-help-menu [emacs-known-problems] + '(menu-item "Emacs Known Problems" view-emacs-problems + :help "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")) (define-key menu-bar-help-menu [emacs-faq] - '(menu-item "Emacs FAQ" view-emacs-FAQ)) + '(menu-item "Emacs FAQ" view-emacs-FAQ + :help "Frequently asked (and answered) questions about Emacs")) (defun help-with-tutorial-spec-language () "Use the Emacs tutorial, specifying which language you want." @@ -1414,7 +1412,22 @@ key (or menu-item)")) '(menu-item "Emacs Tutorial" help-with-tutorial :help "Learn how to use Emacs")) -(defun kill-this-buffer () ; for the menubar +(defun menu-bar-menu-frame-live-and-visible-p () + "Return non-nil if the menu frame is alive and visible. +The menu frame is the frame for which we are updating the menu." + (let ((menu-frame (or menu-updating-frame (selected-frame)))) + (and (frame-live-p menu-frame) + (frame-visible-p menu-frame)))) + +(defun menu-bar-non-minibuffer-window-p () + "Return non-nil if selected window of the menu frame is not a minibuf window. + +See the documentation of `menu-bar-menu-frame-live-and-visible-p' +for the definition of the menu frame." + (let ((menu-frame (or menu-updating-frame (selected-frame)))) + (not (window-minibuffer-p (frame-selected-window menu-frame))))) + +(defun kill-this-buffer () ; for the menu bar "Kill the current buffer." (interactive) (kill-buffer (current-buffer))) @@ -1426,11 +1439,10 @@ key (or menu-item)")) (or (string-match "^ " (buffer-name (car buffers))) (setq count (1+ count))) (setq buffers (cdr buffers))) - (and (not (window-minibuffer-p (frame-selected-window menu-updating-frame))) + (and (menu-bar-non-minibuffer-window-p) (> count 1)))) -(put 'dired 'menu-enable - '(not (window-minibuffer-p (frame-selected-window menu-updating-frame)))) +(put 'dired 'menu-enable '(menu-bar-non-minibuffer-window-p)) ;; Permit deleting frame if it would leave a visible or iconified frame. (defun delete-frame-enabled-p () @@ -1476,6 +1488,8 @@ key (or menu-item)")) (put 'menu-bar-select-yank 'apropos-inhibit t) (defun menu-bar-select-yank () + "Insert the stretch of previously-killed text selected from menu. +The menu shows all the killed text sequences stored in `kill-ring'." (interactive "*") (push-mark (point)) (insert last-command-event)) @@ -1563,7 +1577,7 @@ Buffers menu is regenerated." (or force (frame-or-buffer-changed-p)) (let ((buffers (buffer-list)) (frames (frame-list)) - buffers-menu frames-menu) + buffers-menu) ;; If requested, list only the N most recently selected buffers. (if (and (integerp buffers-menu-max-size) (> buffers-menu-max-size 1)) @@ -1589,14 +1603,14 @@ Buffers menu is regenerated." name)))) ;; Compute the maximum length of any name. (dolist (buf buffer-list) - (unless (eq ?\ (aref (cdr buf) 0)) + (unless (eq ?\s (aref (cdr buf) 0)) (setq menu-bar-update-buffers-maxbuf (max menu-bar-update-buffers-maxbuf (length (cdr buf)))))) ;; Set ALIST to an alist of the form ;; ITEM-STRING . BUFFER (dolist (buf buffer-list) - (unless (eq ?\ (aref (cdr buf) 0)) + (unless (eq ?\s (aref (cdr buf) 0)) (push (menu-bar-update-buffers-1 buf) alist))) ;; Now make the actual list of items, and add ;; some miscellaneous buffer commands to the end. @@ -1645,10 +1659,10 @@ Buffers menu is regenerated." "Next Buffer" 'next-buffer :help "Switch to the \"next\" buffer in a cyclic order") - (list 'prev-buffer + (list 'previous-buffer 'menu-item "Previous Buffer" - 'prev-buffer + 'previous-buffer :help "Switch to the \"previous\" buffer in a cyclic order") (list 'select-named-buffer 'menu-item @@ -1659,15 +1673,15 @@ Buffers menu is regenerated." 'menu-item "List All Buffers" 'list-buffers - :help "Pop up a window listing all emacs buffers" + :help "Pop up a window listing all Emacs buffers" )))) (setq buffers-menu (nconc buffers-menu menu-bar-buffers-menu-command-entries)) - (setq buffers-menu (cons 'keymap (cons "Select Buffer" buffers-menu))) - (define-key (current-global-map) [menu-bar buffer] - ;; Call copy-sequence so the string is not pure. - (cons (copy-sequence "Buffers") buffers-menu))))) + ;; We used to "(define-key (current-global-map) [menu-bar buffer]" + ;; but that did not do the right thing when the [menu-bar buffer] + ;; entry above had been moved (e.g. to a parent keymap). + (setcdr global-buffers-menu-map (cons "Select Buffer" buffers-menu))))) (add-hook 'menu-bar-update-hook 'menu-bar-update-buffers) @@ -1719,7 +1733,7 @@ Buffers menu is regenerated." :help "Terminate input and exit minibuffer"))) ;;;###autoload -;; This comment is taken from toolbar/tool-bar.el near +;; 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 @@ -1760,5 +1774,5 @@ turn on menu bars; otherwise, turn off menu bars." (provide 'menu-bar) -;;; arch-tag: 6e6a3c22-4ec4-4d3d-8190-583f8ef94ced +;; arch-tag: 6e6a3c22-4ec4-4d3d-8190-583f8ef94ced ;;; menu-bar.el ends here