diff options
author | Paul Eggert <[email protected]> | 2011-09-03 16:03:38 -0700 |
---|---|---|
committer | Paul Eggert <[email protected]> | 2011-09-03 16:03:38 -0700 |
commit | b49e353d9d01adbe60bc5d0b1658b4ef978b0b06 (patch) | |
tree | 9f2ffa6f7a6562abf661a4951012b488ad8b1ae7 /lisp/cus-theme.el | |
parent | 74b880cbc18bd0194c7b1fc44c4a983ee05adae2 (diff) | |
parent | bc3200871917d5c54c8c4299a06bf8f8ba2ea02d (diff) |
Merge from trunk.
Diffstat (limited to 'lisp/cus-theme.el')
-rw-r--r-- | lisp/cus-theme.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el index 04a9e728b2..1f33c3e825 100644 --- a/lisp/cus-theme.el +++ b/lisp/cus-theme.el @@ -521,7 +521,8 @@ It includes all faces in list FACES." (defvar custom-theme-choose-mode-map (let ((map (make-keymap))) - (set-keymap-parent map widget-keymap) + (set-keymap-parent map (make-composed-keymap widget-keymap + special-mode-map)) (suppress-keymap map) (define-key map "\C-x\C-s" 'custom-theme-save) (define-key map "n" 'widget-forward) @@ -530,7 +531,7 @@ It includes all faces in list FACES." map) "Keymap for `custom-theme-choose-mode'.") -(define-derived-mode custom-theme-choose-mode nil "Themes" +(define-derived-mode custom-theme-choose-mode special-mode "Themes" "Major mode for selecting Custom themes. Do not call this mode function yourself. It is meant for internal use." (use-local-map custom-theme-choose-mode-map) |