[Emacs-diffs] Changes to emacs/lisp/help-macro.el,v

[Martin Rudalics]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Martin Rudalics <m061211>       08/09/18 08:36:43

Index: help-macro.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-macro.el,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- help-macro.el       6 May 2008 07:57:37 -0000       1.43
+++ help-macro.el       18 Sep 2008 08:36:42 -0000      1.44
@@ -103,7 +103,7 @@
                    ;; sections, *excluding* where we switch buffers
                    ;; and where we execute the chosen help command.
                    (local-map (make-sparse-keymap))
-                   (minor-mode-map-alist nil)
+                   (new-minor-mode-map-alist minor-mode-map-alist)
                    (prev-frame (selected-frame))
                    config new-frame key char)
               (if (string-match "%THIS-KEY%" help-screen)
@@ -111,7 +111,7 @@
                         (replace-match (key-description (substring 
(this-command-keys) 0 -1))
                                        t t help-screen)))
               (unwind-protect
-                  (progn
+                  (let ((minor-mode-map-alist nil))
                     (setcdr local-map ,helped-map)
                     (define-key local-map [t] 'undefined)
                     ;; Make the scroll bar keep working normally.
@@ -140,7 +140,9 @@
                           (let ((inhibit-read-only t))
                             (erase-buffer)
                             (insert help-screen))
+                          (let ((minor-mode-map-alist 
new-minor-mode-map-alist))
                           (help-mode)
+                            (setq new-minor-mode-map-alist 
minor-mode-map-alist))
                           (goto-char (point-min))
                           (while (or (memq char (append help-event-list
                                                         (cons help-char '(?? 
?\C-v ?\s ?\177 delete backspace vertical-scroll-bar ?\M-v))))
@@ -191,8 +193,8 @@
                           (ding)))))
                 (if new-frame (iconify-frame new-frame))
                 (if config
-                    (set-window-configuration config))))))
-     )))
+                    (set-window-configuration config))
+                (setq minor-mode-map-alist new-minor-mode-map-alist))))))))
 
 (provide 'help-macro)