diff options
| author | Joakim Verona | 2012-01-23 15:10:06 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-01-23 15:10:06 +0100 |
| commit | 0322b140eead7c94de7f0f6d19a90bd15690b4eb (patch) | |
| tree | 950c011783cc896d0450084cb5155e54548bfe5b /lisp/help-macro.el | |
| parent | d5114bfea3ea4c37c57e2af0f3b095be9fcd8bac (diff) | |
| parent | cb5850f27c1b4d26957d58e2da2314dd12498671 (diff) | |
| download | emacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.tar.gz emacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.zip | |
upstream
Diffstat (limited to 'lisp/help-macro.el')
| -rw-r--r-- | lisp/help-macro.el | 9 |
1 files changed, 6 insertions, 3 deletions
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)) |