(ensure_echo_area_buffers): If a buffer was killed and a

[gnu-emacs] / lisp / ffap.el

diff --git a/lisp/ffap.el b/lisp/ffap.el
index 0bec1d7a1ff4ce8918cecb929c6f03e9832042e1..37ce66794575c492bc44321d7b169e26cbe286d9 100644 (file)
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1,6 +1,6 @@
 ;;; ffap.el --- find file (or url) at point
 ;;
-;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 96, 97, 2000  Free Software Foundation, Inc.
 ;;
 ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
 ;; Created: 29 Mar 1993
@@ -164,7 +164,7 @@ Note this name may be omitted if it equals the default
    "\\`\\("
    "news\\(post\\)?:\\|mailto:\\|file:" ; no host ok
    "\\|"
-   "\\(ftp\\|http\\|telnet\\|gopher\\|www\\|wais\\)://" ; needs host
+   "\\(ftp\\|https?\\|telnet\\|gopher\\|www\\|wais\\)://" ; needs host
    "\\)."                              ; require one more character
    )
    "Regexp matching URL's.  nil to disable URL features in ffap.")
@@ -1257,7 +1257,7 @@ which may actually result in an url rather than a filename."
 ;;
 ;; Based on overlay highlighting in Emacs 19.28 isearch.el.
 
-(defvar ffap-highlight (and window-system t)
+(defvar ffap-highlight t
   "If non-nil, ffap highlights the current buffer substring.")
 
 (defvar ffap-highlight-overlay nil
@@ -1284,8 +1284,7 @@ Uses the face `ffap' if it is defined, or else `highlight'."
     (setq ffap-highlight-overlay
          (apply 'make-overlay ffap-string-at-point-region))
     (overlay-put ffap-highlight-overlay 'face
-                     (if (internal-find-face 'ffap)
-                         'ffap 'highlight)))))
+                     (if (facep 'ffap) 'ffap 'highlight)))))
 
 \f
 ;;; Main Entrance (`find-file-at-point' == `ffap'):
@@ -1366,8 +1365,8 @@ For example, try \":/\" for URL (and some ftp) references.")
 
 (defvar ffap-menu-text-plist
   (cond
-   ((not window-system) nil)
-   (t '(face bold mouse-face highlight))) ; keymap <mousy-map>
+   ((display-mouse-p) '(face bold mouse-face highlight)) ; keymap <mousy-map>
+   (t nil))
   "Text properties applied to strings found by `ffap-menu-rescan'.
 These properties may be used to fontify the menu references.")