[Emacs-diffs] Changes to emacs/lisp/net/goto-addr.el

[Stefan Monnier]

Index: emacs/lisp/net/goto-addr.el
diff -c emacs/lisp/net/goto-addr.el:1.19 emacs/lisp/net/goto-addr.el:1.20
*** emacs/lisp/net/goto-addr.el:1.19    Mon Dec 27 16:10:48 2004
--- emacs/lisp/net/goto-addr.el Fri May  6 21:24:09 2005
***************
*** 1,6 ****
  ;;; goto-addr.el --- click to browse URL or to send to e-mail address
  
! ;; Copyright (C) 1995, 2000, 2001 Free Software Foundation, Inc.
  
  ;; Author: Eric Ding <address@hidden>
  ;; Maintainer: FSF
--- 1,6 ----
  ;;; goto-addr.el --- click to browse URL or to send to e-mail address
  
! ;; Copyright (C) 1995, 2000, 2001, 2005  Free Software Foundation, Inc.
  
  ;; Author: Eric Ding <address@hidden>
  ;; Maintainer: FSF
***************
*** 46,52 ****
  ;;
  ;; (setq goto-address-highlight-keymap
  ;;   (let ((m (make-sparse-keymap)))
! ;;     (define-key m [S-mouse-2] 'goto-address-at-mouse)
  ;;     m))
  ;;
  
--- 46,52 ----
  ;;
  ;; (setq goto-address-highlight-keymap
  ;;   (let ((m (make-sparse-keymap)))
! ;;     (define-key m [S-mouse-2] 'goto-address-at-point)
  ;;     m))
  ;;
  
***************
*** 118,126 ****
  
  (defvar goto-address-highlight-keymap
    (let ((m (make-sparse-keymap)))
!     (if (featurep 'xemacs)
!       (define-key m (kbd "<button2>") 'goto-address-at-mouse)
!       (define-key m (kbd "<mouse-2>") 'goto-address-at-mouse))
      (define-key m (kbd "C-c RET") 'goto-address-at-point)
      m)
    "keymap to hold goto-addr's mouse key defs under highlighted URLs.")
--- 118,125 ----
  
  (defvar goto-address-highlight-keymap
    (let ((m (make-sparse-keymap)))
!     (define-key m (if (featurep 'xemacs) (kbd "<button2>") (kbd "<mouse-2>"))
!       'goto-address-at-point))
      (define-key m (kbd "C-c RET") 'goto-address-at-point)
      m)
    "keymap to hold goto-addr's mouse key defs under highlighted URLs.")
***************
*** 165,170 ****
--- 164,170 ----
                       (this-overlay (make-overlay s e)))
                (and goto-address-fontify-p
                       (overlay-put this-overlay 'face goto-address-url-face))
+                 (overlay-put this-overlay 'evaporate t)
                (overlay-put this-overlay
                               'mouse-face goto-address-url-mouse-face)
                (overlay-put this-overlay
***************
*** 179,184 ****
--- 179,185 ----
                       (this-overlay (make-overlay s e)))
                (and goto-address-fontify-p
                       (overlay-put this-overlay 'face goto-address-mail-face))
+                 (overlay-put this-overlay 'evaporate t)
                  (overlay-put this-overlay 'mouse-face
                               goto-address-mail-mouse-face)
                (overlay-put this-overlay
***************
*** 191,214 ****
  ;; snarfed from browse-url.el
  
  ;;;###autoload
! (defun goto-address-at-mouse (event)
!   "Send to the e-mail address or load the URL clicked with the mouse.
! Send mail to address at position of mouse click.  See documentation for
! `goto-address-find-address-at-point'.  If no address is found
! there, then load the URL at or before the position of the mouse click."
!   (interactive "e")
!   (save-excursion
!     (mouse-set-point event)
!     (goto-address-at-point)))
  
  ;;;###autoload
! (defun goto-address-at-point ()
    "Send to the e-mail address or load the URL at point.
  Send mail to address at point.  See documentation for
  `goto-address-find-address-at-point'.  If no address is found
  there, then load the URL at or before point."
!   (interactive)
    (save-excursion
      (let ((address (save-excursion (goto-address-find-address-at-point))))
        (if (and address
               (save-excursion
--- 192,209 ----
  ;; snarfed from browse-url.el
  
  ;;;###autoload
! (define-obsolete-function-alias
!   'goto-address-at-mouse 'goto-address-at-point "22.1")
  
  ;;;###autoload
! (defun goto-address-at-point (&optional event)
    "Send to the e-mail address or load the URL at point.
  Send mail to address at point.  See documentation for
  `goto-address-find-address-at-point'.  If no address is found
  there, then load the URL at or before point."
!   (interactive (list last-input-event))
    (save-excursion
+     (if event (mouse-set-point event))
      (let ((address (save-excursion (goto-address-find-address-at-point))))
        (if (and address
               (save-excursion
***************
*** 248,252 ****
  
  (provide 'goto-addr)
  
! ;;; arch-tag: ca47c505-5661-425d-a471-62bc6e75cf0a
  ;;; goto-addr.el ends here
--- 243,247 ----
  
  (provide 'goto-addr)
  
! ;; arch-tag: ca47c505-5661-425d-a471-62bc6e75cf0a
  ;;; goto-addr.el ends here