From 1b70aa634c9ce117fed418894b54b1f2647bda1c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 1 Apr 2015 09:31:20 +0200 Subject: Fix bug#20233, do not merge with master * lisp/net/tramp.el (tramp-handle-unhandled-file-name-directory): Return nil when required by the spec. (Bug#20233) --- lisp/ChangeLog | 5 +++++ lisp/net/tramp.el | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eb84df71503..0b3d7c5f107 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-04-01 Michael Albinus + + * net/tramp.el (tramp-handle-unhandled-file-name-directory): + Return nil when required by the spec. (Bug#20233) + 2015-04-01 Nicolas Petton * Version 24.5 released. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index dddf501fecc..79242a46755 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3355,10 +3355,11 @@ User is always nil." (defun tramp-handle-unhandled-file-name-directory (_filename) "Like `unhandled-file-name-directory' for Tramp files." - ;; With Emacs 23, we could simply return `nil'. But we must keep it - ;; for backward compatibility. "~/" cannot be returned, because - ;; there might be machines without a HOME directory (like hydra). - "/") + ;; Starting with Emacs 23, we must simply return `nil'. But we must + ;; keep backward compatibility, also with XEmacs. "~/" cannot be + ;; returned, because there might be machines without a HOME + ;; directory (like hydra). + (and (< emacs-major-version 23) "/")) (defun tramp-handle-set-visited-file-modtime (&optional time-list) "Like `set-visited-file-modtime' for Tramp files." -- cgit v1.2.1