(ffap-prompter): Don't use the region.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dfbdb8269fe32b8cfb39a6748e4892bde208850f..7bc14c264ea29d4cf3d4eb1b286fc8e2f2e5c622 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * ffap.el (ffap-prompter): Don't use the region.
+
 2008-06-05  Sam Steingold  <sds@gnu.org>
 
        * vc-cvs.el (vc-cvs-registered): Consider a directory with a CVS

diff --git a/lisp/ffap.el b/lisp/ffap.el
index 4a63b769b97313f4b2821515561a0e45101abe9c..8c2bf71afde5e3ed9f8ebbb8638f00c509666da4 100644 (file)
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1398,7 +1398,11 @@ Uses the face `ffap' if it is defined, or else `highlight'."
        (ffap-read-file-or-url
         (if ffap-url-regexp "Find file or URL: " "Find file: ")
         (prog1
-            (setq guess (or guess (ffap-guesser))) ; using ffap-alist here
+             (let ((mark-active nil))
+               ;; Don't use the region here, since it can be something
+               ;; completely unwieldy.  If the user wants that, she could
+               ;; use M-w before and then C-y.  --Stef
+               (setq guess (or guess (ffap-guesser)))) ; using ffap-alist here
           (and guess (ffap-highlight))
           )))
     (ffap-highlight t)))