Mercurial > emacs
changeset 112198:0c7ac8e7d5ee
* cus-theme.el (customize-themes): Use switch-to-buffer.
* menu-bar.el (menu-bar-custom-menu): Tweak Mule and Customize
menus. Add menu item for customize-themes.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 12 Jan 2011 14:10:00 -0500 |
| parents | b6c07b465755 |
| children | 6c6130ccdefd |
| files | lisp/ChangeLog lisp/cus-theme.el lisp/menu-bar.el |
| diffstat | 3 files changed, 15 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jan 12 13:57:23 2011 -0500 +++ b/lisp/ChangeLog Wed Jan 12 14:10:00 2011 -0500 @@ -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.
--- a/lisp/cus-theme.el Wed Jan 12 13:57:23 2011 -0500 +++ b/lisp/cus-theme.el Wed Jan 12 14:10:00 2011 -0500 @@ -541,7 +541,7 @@ 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)
--- a/lisp/menu-bar.el Wed Jan 12 13:57:23 2011 -0500 +++ b/lisp/menu-bar.el Wed Jan 12 14:10:00 2011 -0500 @@ -584,18 +584,15 @@ (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 @@ (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 @@ ;; 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)