[Emacs-diffs] Changes to emacs/lisp/wid-edit.el

[Richard M. Stallman]

Index: emacs/lisp/wid-edit.el
diff -c emacs/lisp/wid-edit.el:1.102 emacs/lisp/wid-edit.el:1.103
*** emacs/lisp/wid-edit.el:1.102        Tue Nov 27 00:04:13 2001
--- emacs/lisp/wid-edit.el      Sat Dec  1 23:49:43 2001
***************
*** 856,872 ****
  
  (defun widget-button-click (event)
    "Invoke the button that the mouse is pointing at."
!   (interactive "@e")
    (if (widget-event-point event)
        (let* ((pos (widget-event-point event))
!            (button (get-char-property pos 'button)))
        (if button
            ;; Mouse click on a widget button.  Do the following
            ;; in a save-excursion so that the click on the button
            ;; doesn't change point.
            (save-selected-window
              (save-excursion
!               (mouse-set-point event)
                (let* ((overlay (widget-get button :button-overlay))
                       (face (overlay-get overlay 'face))
                       (mouse-face (overlay-get overlay 'mouse-face)))
--- 856,876 ----
  
  (defun widget-button-click (event)
    "Invoke the button that the mouse is pointing at."
!   (interactive "e")
    (if (widget-event-point event)
        (let* ((pos (widget-event-point event))
!            (start (event-start event))
!            (button (get-char-property 
!                     pos 'button (and (windowp (posn-window start))
!                                      (window-buffer (posn-window start))))))
        (if button
            ;; Mouse click on a widget button.  Do the following
            ;; in a save-excursion so that the click on the button
            ;; doesn't change point.
            (save-selected-window
+             (select-window (posn-window (event-start event)))
              (save-excursion
!               (goto-char (posn-point (event-start event)))
                (let* ((overlay (widget-get button :button-overlay))
                       (face (overlay-get overlay 'face))
                       (mouse-face (overlay-get overlay 'mouse-face)))
***************
*** 907,916 ****
                    (overlay-put overlay 'face face)
                    (overlay-put overlay 'mouse-face mouse-face))))
  
!               (unless (pos-visible-in-window-p (widget-event-point event))
!                 (mouse-set-point event)
!                 (beginning-of-line)
!                 (recenter)))
  
            (let ((up t) command)
              ;; Mouse click not on a widget button.  Find the global
--- 911,921 ----
                    (overlay-put overlay 'face face)
                    (overlay-put overlay 'mouse-face mouse-face))))
  
!             (unless (pos-visible-in-window-p (widget-event-point event))
!               (mouse-set-point event)
!               (beginning-of-line)
!               (recenter))
!             )
  
            (let ((up t) command)
              ;; Mouse click not on a widget button.  Find the global