diff options
| author | Glenn Morris | 2013-07-24 08:56:24 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-07-24 08:56:24 -0700 |
| commit | 86c4097015a8ed8d0a9d7c44f6c8a86fe31ea209 (patch) | |
| tree | a0d48968140148f2842052f1a6a0986b597defcf | |
| parent | 198fa217564af28aa5075e80f2fc089a221e69d7 (diff) | |
| download | emacs-86c4097015a8ed8d0a9d7c44f6c8a86fe31ea209.tar.gz emacs-86c4097015a8ed8d0a9d7c44f6c8a86fe31ea209.zip | |
* lisp/ffap.el (ffap-machine-p): Handle "not known" response.
Fixes: debbugs:14929
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ffap.el | 3 |
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 @@ | |||
| 1 | 2013-07-24 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * ffap.el (ffap-machine-p): Handle "not known" response. (Bug#14929) | ||
| 4 | |||
| 1 | 2013-07-24 Michael Albinus <michael.albinus@gmx.de> | 5 | 2013-07-24 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 6 | ||
| 3 | * filenotify.el (file-notify-supported-p): | 7 | * 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: | |||
| 459 | (let ((mesg (car (cdr error)))) | 459 | (let ((mesg (car (cdr error)))) |
| 460 | (cond | 460 | (cond |
| 461 | ;; v18: | 461 | ;; v18: |
| 462 | ((string-match "^Unknown host" mesg) nil) | 462 | ((string-match "\\(^Unknown host\\|Name or service not known$\\)" |
| 463 | mesg) nil) | ||
| 463 | ((string-match "not responding$" mesg) mesg) | 464 | ((string-match "not responding$" mesg) mesg) |
| 464 | ;; v19: | 465 | ;; v19: |
| 465 | ;; (file-error "connection failed" "permission denied" | 466 | ;; (file-error "connection failed" "permission denied" |