diff options
| author | Stephen Berman | 2016-07-08 17:22:14 +0200 |
|---|---|---|
| committer | Stephen Berman | 2016-07-08 17:22:14 +0200 |
| commit | 381c6bbfb3eaa69ece0fce8dd92ccd3a1ef2729f (patch) | |
| tree | e4e57a09e944f03c284df82faa4794993738e5d9 | |
| parent | 56c8551219ecace0157ce813733adf8eecb38c32 (diff) | |
| download | emacs-381c6bbfb3eaa69ece0fce8dd92ccd3a1ef2729f.tar.gz emacs-381c6bbfb3eaa69ece0fce8dd92ccd3a1ef2729f.zip | |
Fix menu bar breakage
* lisp/menu-bar.el (menu-bar-showhide-scroll-bar-menu): Use backquoting
to prevent void variable errors, and fix typo (bug#23918).
| -rw-r--r-- | lisp/menu-bar.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index c4f094a1793..9f3156d62b2 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el | |||
| @@ -993,39 +993,39 @@ The selected font will be the default on both the existing and future frames." | |||
| 993 | (vsb (frame-parameter nil 'vertical-scroll-bars)) | 993 | (vsb (frame-parameter nil 'vertical-scroll-bars)) |
| 994 | (hsb (frame-parameter nil 'horizontal-scroll-bars))) | 994 | (hsb (frame-parameter nil 'horizontal-scroll-bars))) |
| 995 | (bindings--define-key menu [horizontal] | 995 | (bindings--define-key menu [horizontal] |
| 996 | '(menu-item "Horizontal" | 996 | `(menu-item "Horizontal" |
| 997 | menu-bar-horizontal-scroll-bar | 997 | menu-bar-horizontal-scroll-bar |
| 998 | :help "Horizontal scroll bar" | 998 | :help "Horizontal scroll bar" |
| 999 | :visible (horizontal-scroll-bars-available-p) | 999 | :visible (horizontal-scroll-bars-available-p) |
| 1000 | :button (:radio . hsb))) | 1000 | :button (:radio . ,hsb))) |
| 1001 | 1001 | ||
| 1002 | (bindings--define-key menu [none-horizontal] | 1002 | (bindings--define-key menu [none-horizontal] |
| 1003 | '(menu-item "None-horizontal" | 1003 | `(menu-item "None-horizontal" |
| 1004 | menu-bar-no-horizontal-scroll-bar | 1004 | menu-bar-no-horizontal-scroll-bar |
| 1005 | :help "Turn off horizontal scroll bars" | 1005 | :help "Turn off horizontal scroll bars" |
| 1006 | :visible (horizontal-scroll-bars-available-p) | 1006 | :visible (horizontal-scroll-bars-available-p) |
| 1007 | :button (:radio . (not hsb)))) | 1007 | :button (:radio . (not ,hsb)))) |
| 1008 | 1008 | ||
| 1009 | (bindings--define-key menu [right] | 1009 | (bindings--define-key menu [right] |
| 1010 | '(menu-item "On the Right" | 1010 | `(menu-item "On the Right" |
| 1011 | menu-bar-right-scroll-bar | 1011 | menu-bar-right-scroll-bar |
| 1012 | :help "Scroll-bar on the right side" | 1012 | :help "Scroll-bar on the right side" |
| 1013 | :visible (display-graphic-p) | 1013 | :visible (display-graphic-p) |
| 1014 | :button (:radio . (eq vsb 'right)))) | 1014 | :button (:radio . (eq ,vsb 'right)))) |
| 1015 | 1015 | ||
| 1016 | (bindings--define-key menu [left] | 1016 | (bindings--define-key menu [left] |
| 1017 | '(menu-item "On the Left" | 1017 | `(menu-item "On the Left" |
| 1018 | menu-bar-left-scroll-bar | 1018 | menu-bar-left-scroll-bar |
| 1019 | :help "Scroll-bar on the left side" | 1019 | :help "Scroll-bar on the left side" |
| 1020 | :visible (display-graphic-p) | 1020 | :visible (display-graphic-p) |
| 1021 | :button (:radio . (eq vsb 'left)))) | 1021 | :button (:radio . (eq ,vsb 'left)))) |
| 1022 | 1022 | ||
| 1023 | (bindings--define-key menu [none] | 1023 | (bindings--define-key menu [none] |
| 1024 | '(menu-item "None" | 1024 | `(menu-item "None" |
| 1025 | menu-bar-no-scroll-bar | 1025 | menu-bar-no-scroll-bar |
| 1026 | :help "Turn off scroll-bar" | 1026 | :help "Turn off scroll-bar" |
| 1027 | :visible (display-graphic-p) | 1027 | :visible (display-graphic-p) |
| 1028 | :button (:radio . (nilp vsb)))) | 1028 | :button (:radio . (not ,vsb)))) |
| 1029 | menu)) | 1029 | menu)) |
| 1030 | 1030 | ||
| 1031 | (defun menu-bar-frame-for-menubar () | 1031 | (defun menu-bar-frame-for-menubar () |