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

[Kim F . Storm]

Index: emacs/lisp/mouse.el
diff -c emacs/lisp/mouse.el:1.268 emacs/lisp/mouse.el:1.269
*** emacs/lisp/mouse.el:1.268   Fri Feb 25 23:30:59 2005
--- emacs/lisp/mouse.el Thu Mar 31 10:10:25 2005
***************
*** 49,55 ****
    :version "22.1"
    :group 'mouse)
  
! (defcustom mouse-1-click-follows-link 350
    "Non-nil means that clicking Mouse-1 on a link follows the link.
  
  With the default setting, an ordinary Mouse-1 click on a link
--- 49,55 ----
    :version "22.1"
    :group 'mouse)
  
! (defcustom mouse-1-click-follows-link 450
    "Non-nil means that clicking Mouse-1 on a link follows the link.
  
  With the default setting, an ordinary Mouse-1 click on a link
***************
*** 837,842 ****
--- 837,865 ----
            (funcall action pos))
           (t action)))))))
  
+ (defun mouse-fixup-help-message (msg)
+   "Fix help message MSG for `mouse-1-click-follows-link'."
+   (let (mp pos)
+     (if (and mouse-1-click-follows-link
+            (stringp msg)
+            (save-match-data
+              (string-match "^mouse-2" msg))
+            (setq mp (mouse-pixel-position))
+            (consp (setq pos (cdr mp)))
+            (car pos) (>= (car pos) 0)
+            (cdr pos) (>= (cdr pos) 0)
+            (setq pos (posn-at-x-y (car pos) (cdr pos) (car mp)))
+            (windowp (posn-window pos)))
+       (with-current-buffer (window-buffer (posn-window pos))
+         (if (mouse-on-link-p pos)
+             (setq msg (concat
+                   (cond
+                    ((eq mouse-1-click-follows-link 'double) "double-")
+                    ((and (integerp mouse-1-click-follows-link)
+                          (< mouse-1-click-follows-link 0)) "Long ")
+                    (t ""))
+                   "mouse-1" (substring msg 7)))))))
+   msg)
  
  (defun mouse-drag-region-1 (start-event)
    (mouse-minibuffer-check start-event)
***************
*** 886,891 ****
--- 909,915 ----
        (track-mouse
        (while (progn
                 (setq event (read-event))
+                (setq mve (cons event (and (boundp 'mve) mve)))
                 (or (mouse-movement-p event)
                     (memq (car-safe event) '(switch-frame select-window))))
          (if (memq (car-safe event) '(switch-frame select-window))
***************
*** 997,1003 ****
                             (= (window-start start-window)
                                start-window-start)))
                (if (and on-link
!                        (not end-point)
                         (consp event)
                         (or remap-double-click
                             (and
--- 1021,1027 ----
                             (= (window-start start-window)
                                start-window-start)))
                (if (and on-link
!                        (or (not end-point) (= end-point start-point))
                         (consp event)
                         (or remap-double-click
                             (and