aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-06-17 10:44:45 +0000
committerEli Zaretskii2001-06-17 10:44:45 +0000
commite75e894bcc3da44c61a1d7588afb3f2b149afe4f (patch)
tree7b1afcb3caa91078cb96c1fb70ba99ed3baee922
parentf621ed9db78750dc0d11e8d3e7628690c0480ba9 (diff)
downloademacs-e75e894bcc3da44c61a1d7588afb3f2b149afe4f.tar.gz
emacs-e75e894bcc3da44c61a1d7588afb3f2b149afe4f.zip
(ffap-machine-p): Always return nil if
open-network-stream is not fboundp.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ffap.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d38a8fbea4..faede76c8ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12001-06-17 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * ffap.el (ffap-machine-p): Always return nil if
4 open-network-stream is not fboundp.
5
12001-06-17 Stefan Monnier <monnier@cs.yale.edu> 62001-06-17 Stefan Monnier <monnier@cs.yale.edu>
2 7
3 * textmodes/sgml-mode.el: Move `provide' to the end. Update copyright. 8 * 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:
396 (cond 396 (cond
397 ((eq strategy 'accept) 'accept) 397 ((eq strategy 'accept) 'accept)
398 ((eq strategy 'reject) nil) 398 ((eq strategy 'reject) nil)
399 ((not (fboundp 'open-network-stream)) nil)
399 ;; assume (eq strategy 'ping) 400 ;; assume (eq strategy 'ping)
400 (t 401 (t
401 (or quiet 402 (or quiet