diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-05-19 22:02:06 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-05-19 22:02:06 +0900 |
| commit | e48372f8e5722643e37185b004469acd174663f7 (patch) | |
| tree | b77ec71bb51856f98d34182eca56322750533017 /lisp/menu-bar.el | |
| parent | d0fa569b7303c2d893b54d0a7af7a521308a5ed4 (diff) | |
| parent | 61291e06cc804de2075305c220d31ef6072f28c8 (diff) | |
| download | emacs-e48372f8e5722643e37185b004469acd174663f7.tar.gz emacs-e48372f8e5722643e37185b004469acd174663f7.tar.bz2 emacs-e48372f8e5722643e37185b004469acd174663f7.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/menu-bar.el')
| -rw-r--r-- | lisp/menu-bar.el | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index bd981ea0b01..f8122677a54 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -79,9 +79,6 @@ :help "Print current buffer with page headings")) menu)) -;; Only declared obsolete (and only made a proper alias) in 23.3. -(define-obsolete-variable-alias - 'menu-bar-files-menu 'menu-bar-file-menu "22.1") (defvar menu-bar-file-menu (let ((menu (make-sparse-keymap "File"))) @@ -459,9 +456,6 @@ (defvar menu-bar-edit-menu (let ((menu (make-sparse-keymap "Edit"))) - (bindings--define-key menu [props] - '(menu-item "Text Properties" facemenu-menu)) - ;; ns-win.el said: Add spell for platform consistency. (if (featurep 'ns) (bindings--define-key menu [spell] @@ -495,7 +489,7 @@ '(menu-item "Select All" mark-whole-buffer :help "Mark the whole buffer for a subsequent cut/copy")) (bindings--define-key menu [clear] - '(menu-item "Clear" delete-region + '(menu-item "Clear" delete-active-region :enable (and mark-active (not buffer-read-only)) :help @@ -2294,9 +2288,10 @@ It must accept a buffer as its only required argument.") (setq i (1- i)) (aset buffers-vec i (cons (car pair) - `(lambda () - (interactive) - (funcall menu-bar-select-buffer-function ,(cdr pair)))))) + (let ((buf (cdr pair))) + (lambda () + (interactive) + (funcall menu-bar-select-buffer-function buf)))))) buffers-vec)) (defun menu-bar-update-buffers (&optional force) @@ -2351,8 +2346,8 @@ It must accept a buffer as its only required argument.") (aset frames-vec i (cons (frame-parameter frame 'name) - `(lambda () - (interactive) (menu-bar-select-frame ,frame)))) + (lambda () + (interactive) (menu-bar-select-frame frame)))) (setq i (1+ i))) ;; Put it after the normal buffers (setq buffers-menu |