summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/ffap.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd7c43983fe..a85c8c19546 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-24 Glenn Morris <rgm@gnu.org>
+
+ * ffap.el (ffap-machine-p): Handle "not known" response. (Bug#14929)
+
2013-07-24 Michael Albinus <michael.albinus@gmx.de>
* filenotify.el (file-notify-supported-p):
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 0769469cbf2..70096248e19 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -459,7 +459,8 @@ Returned values:
(let ((mesg (car (cdr error))))
(cond
;; v18:
- ((string-match "^Unknown host" mesg) nil)
+ ((string-match "\\(^Unknown host\\|Name or service not known$\\)"
+ mesg) nil)
((string-match "not responding$" mesg) mesg)
;; v19:
;; (file-error "connection failed" "permission denied"