diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/cus-theme.el | 2 | ||||
| -rw-r--r-- | lisp/menu-bar.el | 20 |
3 files changed, 15 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e492282d239..ec6e293eec2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2011-01-12 Chong Yidong <cyd@stupidchicken.com> + * menu-bar.el (menu-bar-custom-menu): Tweak Mule and Customize + menus. Add menu item for customize-themes. + + * cus-theme.el (customize-themes): * emacs-lisp/package.el (package--list-packages): Use switch-to-buffer. diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el index e6e286f00fa..6e94b326e53 100644 --- a/lisp/cus-theme.el +++ b/lisp/cus-theme.el @@ -541,7 +541,7 @@ Do not call this mode function yourself. It is meant for internal use." When called from Lisp, BUFFER should be the buffer to use; if omitted, a buffer named *Custom Themes* is used." (interactive) - (pop-to-buffer (get-buffer-create (or buffer "*Custom Themes*"))) + (switch-to-buffer (get-buffer-create (or buffer "*Custom Themes*"))) (let ((inhibit-read-only t)) (erase-buffer)) (custom-theme-choose-mode) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 7babd41b69d..2fe5f94ac7f 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -584,18 +584,15 @@ Do the same for the keys of the same name." (defvar menu-bar-custom-menu (make-sparse-keymap "Customize")) -(define-key menu-bar-custom-menu [customize-apropos-groups] - `(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 ,(purecopy "Faces Matching Regexp...") customize-apropos-faces - :help ,(purecopy "Browse faces whose names match regexp"))) + `(menu-item ,(purecopy "Faces Matching...") customize-apropos-faces + :help ,(purecopy "Browse faces matching a regexp or word list"))) (define-key menu-bar-custom-menu [customize-apropos-options] - `(menu-item ,(purecopy "Options Matching Regexp...") customize-apropos-options - :help ,(purecopy "Browse options whose names match regexp"))) + `(menu-item ,(purecopy "Options Matching...") customize-apropos-options + :help ,(purecopy "Browse options matching a regexp or word list"))) (define-key menu-bar-custom-menu [customize-apropos] - `(menu-item ,(purecopy "Settings Matching Regexp...") customize-apropos - :help ,(purecopy "Browse customizable settings whose names match regexp"))) + `(menu-item ,(purecopy "All Settings Matching...") customize-apropos + :help ,(purecopy "Browse customizable settings matching a regexp or word list"))) (define-key menu-bar-custom-menu [separator-1] menu-bar-separator) (define-key menu-bar-custom-menu [customize-group] @@ -623,6 +620,9 @@ Do the same for the keys of the same name." (define-key menu-bar-custom-menu [customize] `(menu-item ,(purecopy "Top-level Customization Group") customize :help ,(purecopy "The master group called `Emacs'"))) +(define-key menu-bar-custom-menu [customize-themes] + `(menu-item ,(purecopy "Custom Themes") customize-themes + :help ,(purecopy "Choose a pre-defined customization theme"))) ;(defvar menu-bar-preferences-menu (make-sparse-keymap "Preferences")) @@ -1144,7 +1144,7 @@ mail status in mode line")) ;; 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. - `(menu-item ,(purecopy "Mule (Multilingual Environment)") ,mule-menu-keymap + `(menu-item ,(purecopy "Multilingual Environment") ,mule-menu-keymap ;; Most of the MULE menu actually does make sense in unibyte mode, ;; e.g. language selection. ;;; :visible '(default-value 'enable-multibyte-characters) |