Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-2

[gnu-emacs] / lisp / ffap.el

diff --git a/lisp/ffap.el b/lisp/ffap.el
index e30b859a58856fe370c726609f771f927a8d1672..ff35ae0deac95535d0ade4bf2961c5562f118ec6 100644 (file)
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1,6 +1,7 @@
 ;;; ffap.el --- find file (or url) at point
 
-;; Copyright (C) 1995, 96, 97, 2000, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
 ;; Maintainer: Rajesh Vaidheeswarran  <rv@gnu.org>
@@ -1379,9 +1380,7 @@ If `ffap-url-regexp' is not nil, the FILENAME may also be an URL.
 With a prefix, this command behaves exactly like `ffap-file-finder'.
 If `ffap-require-prefix' is set, the prefix meaning is reversed.
 See also the variables `ffap-dired-wildcards', `ffap-newfile-prompt',
-and the functions `ffap-file-at-point' and `ffap-url-at-point'.
-
-See <ftp://ftp.mathcs.emory.edu/pub/mic/emacs/> for latest version."
+and the functions `ffap-file-at-point' and `ffap-url-at-point'."
   (interactive)
   (if (and (interactive-p)
           (if ffap-require-prefix (not current-prefix-arg)
@@ -1520,7 +1519,9 @@ Applies `ffap-menu-text-plist' text properties at all matches."
   (let ((ffap-next-regexp (or ffap-menu-regexp ffap-next-regexp))
        (range (- (point-max) (point-min)))
        (mod (buffer-modified-p))       ; was buffer modified?
-       buffer-read-only                ; to set text-properties
+       ;; inhibit-read-only works on read-only text properties
+       ;; as well as read-only buffers.
+       (inhibit-read-only t)           ; to set text-properties
        item
        ;; Avoid repeated searches of the *mode-alist:
        (major-mode (if (assq major-mode ffap-string-at-point-mode-alist)
@@ -1711,6 +1712,9 @@ Only intended for interactive use."
   (local-set-key "\M-l" 'ffap-gnus-next)
   (local-set-key "\M-m" 'ffap-gnus-menu))
 
+(defvar gnus-summary-buffer)
+(defvar gnus-article-buffer)
+
 (defun ffap-gnus-wrapper (form)                ; used by both commands below
   (and (eq (current-buffer) (get-buffer gnus-summary-buffer))
        (gnus-summary-select-article))  ; get article of current line