diff options
| author | Martin Rudalics | 2012-01-20 09:12:35 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2012-01-20 09:12:35 +0100 |
| commit | dd6e3cdd5aa93d7c5125bad0b22cce71df5f04d0 (patch) | |
| tree | 42268699115917ec133b1c805bdb32f7a362235f /lisp | |
| parent | 0d0deb382bfc139f4c30f1f17ef1ab410ff94836 (diff) | |
| download | emacs-dd6e3cdd5aa93d7c5125bad0b22cce71df5f04d0.tar.gz emacs-dd6e3cdd5aa93d7c5125bad0b22cce71df5f04d0.zip | |
In make-help-screen make original minor-mode-map-alist temporarily visible.
* help-macro.el (make-help-screen): Temporarily restore original binding
for minor-mode-map-alist (Bug#10454).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/help-macro.el | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab813e21922..71211ca9af9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-01-20 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * help-macro.el (make-help-screen): Temporarily restore original | ||
| 4 | binding for minor-mode-map-alist (Bug#10454). | ||
| 5 | |||
| 1 | 2012-01-19 Julien Danjou <julien@danjou.info> | 6 | 2012-01-19 Julien Danjou <julien@danjou.info> |
| 2 | 7 | ||
| 3 | * color.el (color-name-to-rgb): Use the white color to find the max | 8 | * color.el (color-name-to-rgb): Use the white color to find the max |
diff --git a/lisp/help-macro.el b/lisp/help-macro.el index 0bd6f3c4798..112c72778bc 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el | |||
| @@ -184,9 +184,12 @@ and then returns." | |||
| 184 | (when config | 184 | (when config |
| 185 | (set-window-configuration config) | 185 | (set-window-configuration config) |
| 186 | (setq config nil)) | 186 | (setq config nil)) |
| 187 | ;; `defn' must make sure that its frame is | 187 | ;; Temporarily rebind `minor-mode-map-alist' |
| 188 | ;; selected, so we won't iconify it below. | 188 | ;; to `new-minor-mode-map-alist' (Bug#10454). |
| 189 | (call-interactively defn) | 189 | (let ((minor-mode-map-alist new-minor-mode-map-alist)) |
| 190 | ;; `defn' must make sure that its frame is | ||
| 191 | ;; selected, so we won't iconify it below. | ||
| 192 | (call-interactively defn)) | ||
| 190 | (when new-frame | 193 | (when new-frame |
| 191 | ;; Do not iconify the selected frame. | 194 | ;; Do not iconify the selected frame. |
| 192 | (unless (eq new-frame (selected-frame)) | 195 | (unless (eq new-frame (selected-frame)) |