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

[Kim F . Storm]

Index: emacs/lisp/mouse.el
diff -c emacs/lisp/mouse.el:1.262 emacs/lisp/mouse.el:1.263
*** emacs/lisp/mouse.el:1.262   Tue Jan 11 15:36:57 2005
--- emacs/lisp/mouse.el Wed Jan 12 10:17:02 2005
***************
*** 771,791 ****
  
  A clickable link is identified by one of the following methods:
  
! 1) If the character at POS has a non-nil `follow-link' text or
! overlay property, the value of that property is returned.
  
! 2) If there is a local key-binding or a keybinding at position
! POS for the `follow-link' event, the binding of that event
! determines whether POS is inside a link:
  
! - If the binding is `mouse-face', POS is inside a link if there
  is a non-nil `mouse-face' property at POS.  Return t in this case.
  
! - If the binding is a function, FUNC, POS is inside a link if
  the call \(FUNC POS) returns non-nil.  Return the return value
  from that call.
  
! - Otherwise, return the binding of the `follow-link' binding.
  
  The return value is interpreted as follows:
  
--- 771,792 ----
  
  A clickable link is identified by one of the following methods:
  
! If the character at POS has a non-nil `follow-link' text or
! overlay property, use the value of that property as action code,
! or if there is a local key-binding or a keybinding at position
! POS for the `follow-link' event, use the binding of that event as
! action code.
  
! The action code is used to determine whether POS is inside a link:
  
! - If the action code is `mouse-face', POS is inside a link if there
  is a non-nil `mouse-face' property at POS.  Return t in this case.
  
! - If the action code is a function, FUNC, POS is inside a link if
  the call \(FUNC POS) returns non-nil.  Return the return value
  from that call.
  
! - Otherwise, return the action code itself.
  
  The return value is interpreted as follows:
  
***************
*** 799,814 ****
  
  - Otherwise, the mouse-1 event is translated into a mouse-2 event
  at the same position."
!   (or (get-char-property pos 'follow-link)
!       (save-excursion
!       (goto-char pos)
!       (let ((b (key-binding [follow-link] nil t)))
!         (cond
!          ((eq b 'mouse-face)
!           (and (get-char-property pos 'mouse-face) t))
!          ((functionp b)
!           (funcall b pos))
!          (t b))))))
  
  (defun mouse-drag-region-1 (start-event)
    (mouse-minibuffer-check start-event)
--- 800,816 ----
  
  - Otherwise, the mouse-1 event is translated into a mouse-2 event
  at the same position."
!   (let ((action
!        (or (get-char-property pos 'follow-link)
!            (save-excursion
!              (goto-char pos)
!              (key-binding [follow-link] nil t)))))
!     (cond
!      ((eq action 'mouse-face)
!       (and (get-char-property pos 'mouse-face) t))
!      ((functionp action)
!       (funcall action pos))
!      (t action))))
  
  (defun mouse-drag-region-1 (start-event)
    (mouse-minibuffer-check start-event)