(widget-button-click): Wrap with save-excursion

to restore track-mouse in the correct buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74a33ce2a0e8dd6c1717a1967e600a4cc4361174..51f5a1344a32894f7e063ee8ad4ced2a3d486b74 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+1999-11-08  Markus Rost  <rost@ias.edu>
+
+       * wid-edit.el (widget-button-click): Wrap with save-excursion 
+       to restore track-mouse in the correct buffer.
+
+1999-11-08  Gerd Moellmann  <gerd@gnu.org>
+
+       * mail/mh-e.el: Changed maintainer to billcurtis@hotmail.com.
+
+1999-11-08  Peter Kleiweg  <kleiweg@let.rug.nl>
+
+       * progmodes/ps-mode.el (ps-mode-print-function): Changed default
+       lpr-command to "lp" for some system-types. (copied from lpr.el
+       Emacs version 20.2.1).
+       
 1999-11-04  Markus Rost  <rost@ias.edu>
 
        * simple.el (comment-region): Strip off white space at end of

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 4ac7da42efe654f695789075c3968f97f1daf28e..c8d46533d437ca472491abc03fb982f2404abe06 100644 (file)
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -928,29 +928,30 @@ This exists as a variable so it can be set locally in certain buffers.")
                      (mouse-face (overlay-get overlay 'mouse-face)))
                 (unwind-protect
                     (let ((track-mouse t))
-                      (overlay-put overlay
-                                   'face widget-button-pressed-face)
-                      (overlay-put overlay 
-                                   'mouse-face widget-button-pressed-face)
-                      (unless (widget-apply button :mouse-down-action event)
-                        (while (not (button-release-event-p event))
-                          (setq event (widget-read-event)
-                                pos (widget-event-point event))
-                          (if (and pos
-                                   (eq (get-char-property pos 'button)
-                                       button))
-                              (progn 
-                                (overlay-put overlay 
-                                             'face
-                                             widget-button-pressed-face)
-                                (overlay-put overlay 
-                                             'mouse-face 
-                                             widget-button-pressed-face))
-                            (overlay-put overlay 'face face)
-                            (overlay-put overlay 'mouse-face mouse-face))))
-                      (when (and pos 
-                                 (eq (get-char-property pos 'button) button))
-                        (widget-apply-action button event)))
+                      (save-excursion
+                        (overlay-put overlay
+                                     'face widget-button-pressed-face)
+                        (overlay-put overlay 
+                                     'mouse-face widget-button-pressed-face)
+                        (unless (widget-apply button :mouse-down-action event)
+                          (while (not (button-release-event-p event))
+                            (setq event (widget-read-event)
+                                  pos (widget-event-point event))
+                            (if (and pos
+                                     (eq (get-char-property pos 'button)
+                                         button))
+                                (progn 
+                                  (overlay-put overlay 
+                                               'face
+                                               widget-button-pressed-face)
+                                  (overlay-put overlay 
+                                               'mouse-face 
+                                               widget-button-pressed-face))
+                              (overlay-put overlay 'face face)
+                              (overlay-put overlay 'mouse-face mouse-face))))
+                        (when (and pos 
+                                   (eq (get-char-property pos 'button) button))
+                          (widget-apply-action button event))))
                   (overlay-put overlay 'face face)
                   (overlay-put overlay 'mouse-face mouse-face)))
             (let ((up t)