diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/cus-theme.el | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e106a763332..db3ec56041b 100644 --- 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 dbe4fa42d8e..4482e94ad82 100644 --- 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) |