* cus-theme.el (custom-new-theme-mode-map): Add bindings.

Fixes: debbugs:15674

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e106a763332ccfeac33b87929219ecab4c9737f6..db3ec56041b92edb4bab486cac78518b09ed5260 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-12-18  Chong Yidong  <cyd@gnu.org>
 
+       * cus-theme.el (custom-new-theme-mode-map): Add bindings
+       (Bug#15674).
+
        * replace.el (occur-engine): Avoid infloop (Bug#7593).
 
 2013-12-18  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)

diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index dbe4fa42d8ef8793f8b6a10b31be250a2e8a91a3..4482e94ad82bf4ee2ea8b4bafccdcac0bb7643df 100644 (file)
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -32,9 +32,11 @@
 
 (defvar custom-new-theme-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-write)
+    (define-key map "q" 'Custom-buffer-done)
     (define-key map "n" 'widget-forward)
     (define-key map "p" 'widget-backward)
     map)