From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 17 Jun 2001 10:44:45 +0000 (+0000)
Subject: (ffap-machine-p): Always return nil if
X-Git-Tag: emacs-pretest-21.0.104~249
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e75e894bcc3da44c61a1d7588afb3f2b149afe4f;p=emacs.git

(ffap-machine-p): Always return nil if
open-network-stream is not fboundp.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d38a8fbea4..faede76c8ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-17  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* ffap.el (ffap-machine-p): Always return nil if
+	open-network-stream is not fboundp.
+
 2001-06-17  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* textmodes/sgml-mode.el: Move `provide' to the end.  Update copyright.
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 648688813d6..fcded84e402 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -396,6 +396,7 @@ Returned values:
       (cond
        ((eq strategy 'accept) 'accept)
        ((eq strategy 'reject) nil)
+       ((not (fboundp 'open-network-stream)) nil)
        ;; assume (eq strategy 'ping)
        (t
 	(or quiet