;;; menu-bar.el --- define a default menu bar
;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: RMS
;; Maintainer: FSF
;;; Code:
-;;; User options:
-
-(defcustom buffers-menu-max-size 10
- "*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."
- :type '(choice integer
- (const :tag "All" nil))
- :group 'mouse)
-
;; Don't clobber an existing menu-bar keymap, to preserve any menu-bar key
;; definitions made in loaddefs.el.
(or (lookup-key global-map [menu-bar])
(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))
'(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 "--"))
'(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 "--"))
;; These are alternative definitions for the cut, paste and copy
;; menu items. Use them if your system expects these to use the clipboard.
-(put 'clipboard-kill-region 'menu-enable 'mark-active)
+(put 'clipboard-kill-region 'menu-enable
+ '(and mark-active (not buffer-read-only)))
(put 'clipboard-kill-ring-save 'menu-enable 'mark-active)
(put 'clipboard-yank 'menu-enable
- '(or (and (fboundp 'x-selection-exists-p) (x-selection-exists-p))
- (x-selection-exists-p 'CLIPBOARD)))
+ '(and (or (and (fboundp 'x-selection-exists-p)
+ (x-selection-exists-p))
+ (x-selection-exists-p 'CLIPBOARD))
+ (not buffer-read-only)))
(defun clipboard-yank ()
"Insert the clipboard contents, or the last stretch of killed text."
'(menu-item "Other (Customize)"
menu-bar-showhide-fringe-ind-customize
:help "Additional choices available through Custom buffer"
- :visible (display-graphic-p)))
+ :visible (display-graphic-p)
+ :button (:radio . (not (member indicate-buffer-boundaries
+ '(nil left right
+ ((top . left) (bottom . right))
+ ((t . right) (top . left))))))))
(defun menu-bar-showhide-fringe-ind-mixed ()
"Display top and bottom indicators in opposite fringes, arrows in right."
:help
"Show top/bottom indicators in opposite fringes, arrows in right"
:visible (display-graphic-p)
- :button (:radio . (eq indicate-buffer-boundaries
- '((t . right) (top . left))))))
+ :button (:radio . (equal indicate-buffer-boundaries
+ '((t . right) (top . left))))))
(defun menu-bar-showhide-fringe-ind-box ()
"Display top and bottom indicators in opposite fringes."
'(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 indicate-buffer-boundaries
- '((top . left) (bottom . right))))))
+ :button (:radio . (equal indicate-buffer-boundaries
+ '((top . left) (bottom . right))))))
(defun menu-bar-showhide-fringe-ind-right ()
"Display buffer boundaries and arrows in the right fringe."
'(menu-item "Truncate Long Lines in this Buffer"
toggle-truncate-lines
:help "Truncate long lines on the screen"
- :button (:toggle . truncate-lines)
- :enable (menu-bar-menu-frame-live-and-visible-p)))
+ :button (:toggle . (if (or (window-full-width-p)
+ (not truncate-partial-width-windows))
+ truncate-lines
+ truncate-partial-width-windows))
+ :enable (and (menu-bar-menu-frame-live-and-visible-p)
+ (or (window-full-width-p)
+ (not truncate-partial-width-windows)))))
(define-key menu-bar-options-menu [highlight-separator]
'("--"))
'(menu-item "Zone Out" zone
:help "Play tricks with Emacs display when Emacs is idle"))
(define-key menu-bar-games-menu [tetris]
- '(menu-item "Tetris" tetris))
+ '(menu-item "Tetris" tetris
+ :help "Falling blocks game"))
(define-key menu-bar-games-menu [solitaire]
- '(menu-item "Solitaire" solitaire))
+ '(menu-item "Solitaire" solitaire
+ :help "Get rid of all the stones"))
(define-key menu-bar-games-menu [snake]
'(menu-item "Snake" snake
:help "Move snake around avoiding collisions"))
+(define-key menu-bar-games-menu [pong]
+ '(menu-item "Pong" pong
+ :help "Bounce the ball to your opponent"))
(define-key menu-bar-games-menu [mult]
'(menu-item "Multiplication Puzzle" mpuz
:help "Exercise brain with multiplication"))
(define-key menu-bar-games-menu [gomoku]
'(menu-item "Gomoku" gomoku
:help "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"))
(define-key menu-bar-games-menu [black-box]
'(menu-item "Blackbox" blackbox
:help "Find balls in a black box by shooting rays"))
'(menu-item "5x5" 5x5
:help "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))
+
+(define-key menu-bar-tools-menu [separator-encryption-decryption]
+ '("--"))
+
+(define-key menu-bar-encryption-decryption-menu [insert-keys]
+ '(menu-item "Insert Keys" epa-insert-keys
+ :help "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"))
+
+(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"))
+
+(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"))
+
+(define-key menu-bar-encryption-decryption-menu [list-keys]
+ '(menu-item "List Keys" epa-list-keys
+ :help "Browse your public keyring"))
+
+(define-key menu-bar-encryption-decryption-menu [separator-keys]
+ '("--"))
+
+(define-key menu-bar-encryption-decryption-menu [sign-region]
+ '(menu-item "Sign Region" epa-sign-region
+ :help "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"))
+
+(define-key menu-bar-encryption-decryption-menu [encrypt-region]
+ '(menu-item "Encrypt Region" epa-encrypt-region
+ :help "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"))
+
+(define-key menu-bar-encryption-decryption-menu [separator-file]
+ '("--"))
+
+(define-key menu-bar-encryption-decryption-menu [sign-file]
+ '(menu-item "Sign File..." epa-sign-file
+ :help "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"))
+
+(define-key menu-bar-encryption-decryption-menu [encrypt-file]
+ '(menu-item "Encrypt File..." epa-encrypt-file
+ :help "Encrypt a file"))
+
+(define-key menu-bar-encryption-decryption-menu [decrypt-file]
+ '(menu-item "Decrypt File..." epa-decrypt-file
+ :help "Decrypt a file"))
+
(define-key menu-bar-tools-menu [simple-calculator]
'(menu-item "Simple Calculator" calculator
:help "Invoke the Emacs built-in quick calculator"))
:visible default-enable-multibyte-characters
:help "Display multilingual environment settings"))
(define-key menu-bar-describe-menu [describe-coding-system-briefly]
- '(menu-item "Describe Coding System (Briefly)..."
+ '(menu-item "Describe Coding System (Briefly)"
describe-current-coding-system-briefly
:visible default-enable-multibyte-characters))
(define-key menu-bar-describe-menu [describe-coding-system]
'(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)
(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 [emacs-command-node]
+(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-apropos-menu [emacs-key-command-node]
+(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-apropos-menu [elisp-index-search]
+(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"))
(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-apropos]
+(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 [info]
+(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-help-menu [eliza]
- '(menu-item "Emacs Psychotherapist" doctor
- :help "Our doctor will help you feel better"))
+(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"))
+(define-key menu-bar-help-menu [about-emacs]
+ '(menu-item "About Emacs" about-emacs
+ :help "Display version number, copyright info, and basic help"))
(define-key menu-bar-help-menu [sep4]
'("--"))
(define-key menu-bar-help-menu [describe-no-warranty]
(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-project]
- '(menu-item "About GNU" describe-project
- :help "About the GNU System, GNU Project, and GNU/Linux"))
-(define-key menu-bar-help-menu [describe-distribution]
+(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 "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)
(view-file (expand-file-name "MORE.STUFF"
data-directory))
(goto-address)))
-(define-key menu-bar-help-menu [about]
- '(menu-item "About Emacs" about-emacs
- :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]
+(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"))
+(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]
+(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))
-(define-key menu-bar-help-menu [apropos]
- (list 'menu-item "Search Documentation" menu-bar-apropos-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 [emacs-psychotherapist]
+ '(menu-item "Emacs Psychotherapist" doctor
+ :help "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"))
-(define-key menu-bar-help-menu [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]
(not (window-minibuffer-p (frame-selected-window menu-frame)))))
(defun kill-this-buffer () ; for the menu bar
- "Kill the current buffer."
+ "Kill the current buffer.
+When called in the minibuffer, get out of the minibuffer
+using `abort-recursive-edit'."
(interactive)
- (kill-buffer (current-buffer)))
+ (if (menu-bar-non-minibuffer-window-p)
+ (kill-buffer (current-buffer))
+ (abort-recursive-edit)))
(defun kill-this-buffer-enabled-p ()
(let ((count 0)
(or (string-match "^ " (buffer-name (car buffers)))
(setq count (1+ count)))
(setq buffers (cdr buffers)))
- (and (menu-bar-non-minibuffer-window-p)
- (> count 1))))
+ (or (not (menu-bar-non-minibuffer-window-p))
+ (> count 1))))
(put 'dired 'menu-enable '(menu-bar-non-minibuffer-window-p))
(defcustom yank-menu-length 20
"*Maximum length to display in the yank-menu."
:type 'integer
- :group 'mouse)
+ :group 'menu)
(defun menu-bar-update-yank-menu (string old)
(let ((front (car (cdr yank-menu)))
(insert last-command-event))
\f
+;;; Buffers Menu
+
+(defcustom buffers-menu-max-size 10
+ "*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."
+ :type '(choice integer
+ (const :tag "All" nil))
+ :group 'menu)
+
+(defcustom buffers-menu-buffer-name-length 30
+ "*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 '(choice integer
+ (const :tag "Full length" nil))
+ :group 'menu)
+
(defcustom buffers-menu-show-directories 'unless-uniquify
"If non-nil, show directories in the Buffers menu for buffers that have them.
The special value `unless-uniquify' means that directories will be shown
(defvar list-buffers-directory nil)
-(defvar menu-bar-update-buffers-maxbuf)
-
-(defun menu-bar-select-buffer ()
- (interactive)
- (switch-to-buffer last-command-event))
-
-(defun menu-bar-select-frame ()
- (interactive)
- (let (frame)
- (dolist (f (frame-list))
- (when (equal last-command-event (frame-parameter f 'name))
- (setq frame f)))
- ;; FRAME can be nil when user specifies the selected frame.
- (setq frame (or frame (selected-frame)))
- (make-frame-visible frame)
- (raise-frame frame)
- (select-frame frame)))
+(defun menu-bar-select-frame (frame)
+ (make-frame-visible frame)
+ (raise-frame frame)
+ (select-frame frame))
(defun menu-bar-update-buffers-1 (elt)
(let* ((buf (car elt))
(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))
;; Make the menu of buffers proper.
(setq buffers-menu
- (let* ((buffer-list
- (mapcar 'list buffers))
- (menu-bar-update-buffers-maxbuf 0)
- alist)
+ (let (alist)
;; Put into each element of buffer-list
;; the name for actual display,
;; perhaps truncated in the middle.
- (dolist (buf buffer-list)
- (let ((name (buffer-name (car buf))))
- (setcdr buf
- (if (> (length name) 27)
- (concat (substring name 0 12)
+ (dolist (buf buffers)
+ (let ((name (buffer-name buf)))
+ (unless (eq ?\s (aref name 0))
+ (push (menu-bar-update-buffers-1
+ (cons buf
+ (if (and (integerp buffers-menu-buffer-name-length)
+ (> (length name) buffers-menu-buffer-name-length))
+ (concat
+ (substring
+ name 0 (/ buffers-menu-buffer-name-length 2))
"..."
- (substring name -12))
- name))))
- ;; Compute the maximum length of any name.
- (dolist (buf buffer-list)
- (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 ?\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.
- (mapcar (lambda (pair)
- ;; This is somewhat risque, to use
- ;; the buffer name itself as the event
- ;; type to define, but it works.
- ;; It would not work to use the buffer
- ;; since a buffer as an event has its
- ;; own meaning.
- (nconc (list (buffer-name (cdr pair))
- (car pair)
+ (substring
+ name (- (/ buffers-menu-buffer-name-length 2))))
+ name)
+ ))
+ alist))))
+ ;; Now make the actual list of items.
+ (let ((buffers-vec (make-vector (length alist) nil))
+ (i (length alist)))
+ (dolist (pair alist)
+ (setq i (1- i))
+ (aset buffers-vec i
+ (nconc (list (car pair)
(cons nil nil))
- 'menu-bar-select-buffer))
- (nreverse alist))))
+ `(lambda ()
+ (interactive)
+ (switch-to-buffer ,(cdr pair))))))
+ (list buffers-vec))))
;; Make a Frames menu if we have more than one frame.
(when (cdr frames)
- (let ((frames-menu
- (cons 'keymap
- (cons "Select Frame"
- (mapcar
- (lambda (frame)
- (nconc
- (list (frame-parameter frame 'name)
- (frame-parameter frame 'name)
- (cons nil nil))
- 'menu-bar-select-frame))
- frames)))))
+ (let* ((frames-vec (make-vector (length frames) nil))
+ (frames-menu
+ (cons 'keymap
+ (list "Select Frame" frames-vec)))
+ (i 0))
+ (dolist (frame frames)
+ (aset frames-vec i
+ (nconc
+ (list
+ (frame-parameter frame 'name)
+ (cons nil nil))
+ `(lambda ()
+ (interactive) (menu-bar-select-frame ,frame))))
+ (setq i (1+ i)))
;; Put it after the normal buffers
(setq buffers-menu
(nconc buffers-menu
(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)
(let ((map minibuffer-local-map))
(define-key map [menu-bar minibuf quit]
- (list 'menu-item "Quit" 'keyboard-escape-quit
+ (list 'menu-item "Quit" 'abort-recursive-edit
:help "Abort input and exit minibuffer"))
(define-key map [menu-bar minibuf return]
(list 'menu-item "Enter" 'exit-minibuffer
- :help "Terminate input and exit minibuffer")))
+ :key-sequence "\r"
+ :help "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"))
+ (define-key map [menu-bar minibuf isearch-backward]
+ (list 'menu-item "Isearch History Backward" 'isearch-backward
+ :help "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"))
+ (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")))
\f
;;;###autoload
;; This comment is taken from tool-bar.el near
;; that would overwrite disabling the tool bar from X resources.
(put 'menu-bar-mode 'standard-value '(t))
-;;;###autoload
(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
(menu-bar-mode (if (> (frame-parameter nil 'menu-bar-lines) 0) 0 1))
(menu-bar-mode arg)))
+(declare-function x-menu-bar-open "term/x-win" (&optional frame))
+
(defun menu-bar-open (&optional frame)
"Start key navigation of the menu bar in FRAME.
(provide 'menu-bar)
-;;; arch-tag: 6e6a3c22-4ec4-4d3d-8190-583f8ef94ced
+;; arch-tag: 6e6a3c22-4ec4-4d3d-8190-583f8ef94ced
;;; menu-bar.el ends here
HCoop / bpt / emacs.git / blobdiff