X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9ee365d565205366d61d9b50dd2a15ef903be983..0a203b611556f144e71adb5aaffc5a5adabeae71:/lisp/net/goto-addr.el diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el index 775041903f..182758aaff 100644 --- a/lisp/net/goto-addr.el +++ b/lisp/net/goto-addr.el @@ -1,7 +1,7 @@ ;;; goto-addr.el --- click to browse URL or to send to e-mail address ;; Copyright (C) 1995, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric Ding ;; Maintainer: FSF @@ -10,10 +10,10 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,9 +21,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -78,7 +76,7 @@ (defgroup goto-address nil "Click to browse URL or to send to e-mail address." :group 'mouse - :group 'hypermedia) + :group 'comm) ;; I don't expect users to want fontify'ing without highlighting. @@ -131,7 +129,7 @@ A value of t means there is no limit--fontify regardless of the size." m) "Keymap to hold goto-addr's mouse key defs under highlighted URLs.") -(defcustom goto-address-url-face 'bold +(defcustom goto-address-url-face 'link "Face to use for URLs." :type 'face :group 'goto-address) @@ -151,51 +149,75 @@ A value of t means there is no limit--fontify regardless of the size." :type 'face :group 'goto-address) +(defun goto-address-unfontify (start end) + "Remove `goto-address' fontification from the given region." + (dolist (overlay (overlays-in start end)) + (if (overlay-get overlay 'goto-address) + (delete-overlay overlay)))) + +(defvar goto-address-prog-mode) + (defun goto-address-fontify () "Fontify the URLs and e-mail addresses in the current buffer. This function implements `goto-address-highlight-p' and `goto-address-fontify-p'." ;; Clean up from any previous go. - (dolist (overlay (overlays-in (point-min) (point-max))) - (if (overlay-get overlay 'goto-address) - (delete-overlay overlay))) + (goto-address-unfontify (point-min) (point-max)) (save-excursion (let ((inhibit-point-motion-hooks t)) (goto-char (point-min)) - (if (or (eq t goto-address-fontify-maximum-size) - (< (- (point-max) (point)) goto-address-fontify-maximum-size)) - (progn - (while (re-search-forward goto-address-url-regexp nil t) - (let* ((s (match-beginning 0)) - (e (match-end 0)) - (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 'follow-link t) - (overlay-put this-overlay - 'help-echo "mouse-2, C-c RET: follow URL") - (overlay-put this-overlay - 'keymap goto-address-highlight-keymap) - (overlay-put this-overlay 'goto-address t))) - (goto-char (point-min)) - (while (re-search-forward goto-address-mail-regexp nil t) - (let* ((s (match-beginning 0)) - (e (match-end 0)) - (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 'follow-link t) - (overlay-put this-overlay - 'help-echo "mouse-2, C-c RET: mail this address") - (overlay-put this-overlay - 'keymap goto-address-highlight-keymap) - (overlay-put this-overlay 'goto-address t)))))))) + (when (or (eq t goto-address-fontify-maximum-size) + (< (- (point-max) (point)) goto-address-fontify-maximum-size)) + (while (re-search-forward goto-address-url-regexp nil t) + (let* ((s (match-beginning 0)) + (e (match-end 0)) + this-overlay) + (when (or (not goto-address-prog-mode) + ;; This tests for both comment and string + ;; syntax. + (nth 8 (syntax-ppss))) + (setq 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 'follow-link t) + (overlay-put this-overlay + 'help-echo "mouse-2, C-c RET: follow URL") + (overlay-put this-overlay + 'keymap goto-address-highlight-keymap) + (overlay-put this-overlay 'goto-address t)))) + (goto-char (point-min)) + (while (re-search-forward goto-address-mail-regexp nil t) + (let* ((s (match-beginning 0)) + (e (match-end 0)) + this-overlay) + (when (or (not goto-address-prog-mode) + ;; This tests for both comment and string + ;; syntax. + (nth 8 (syntax-ppss))) + (setq 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 'follow-link t) + (overlay-put this-overlay + 'help-echo "mouse-2, C-c RET: mail this address") + (overlay-put this-overlay + 'keymap goto-address-highlight-keymap) + (overlay-put this-overlay 'goto-address t)))))))) + +(defun goto-address-fontify-region (start end) + "Fontify URLs and e-mail addresses in the given region." + (save-excursion + (save-restriction + (let ((beg-line (progn (goto-char start) (line-beginning-position))) + (end-line (progn (goto-char end) (line-end-position)))) + (narrow-to-region beg-line end-line) + (goto-address-fontify))))) ;; code to find and goto addresses; much of this has been blatantly ;; snarfed from browse-url.el @@ -252,6 +274,32 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and (goto-address-fontify))) ;;;###autoload(put 'goto-address 'safe-local-eval-function t) +;;;###autoload +(define-minor-mode goto-address-mode + "Minor mode to buttonize URLs and e-mail addresses in the current buffer." + nil + "" + nil + (if goto-address-mode + (jit-lock-register #'goto-address-fontify-region) + (jit-lock-unregister #'goto-address-fontify-region) + (save-restriction + (widen) + (goto-address-unfontify (point-min) (point-max))))) + +;;;###autoload +(define-minor-mode goto-address-prog-mode + "Turn on `goto-address-mode', but only in comments and strings." + nil + "" + nil + (if goto-address-prog-mode + (jit-lock-register #'goto-address-fontify-region) + (jit-lock-unregister #'goto-address-fontify-region) + (save-restriction + (widen) + (goto-address-unfontify (point-min) (point-max))))) + (provide 'goto-addr) ;; arch-tag: ca47c505-5661-425d-a471-62bc6e75cf0a