Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 01:34:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug#20233, do not merge with master

Browse source 
* lisp/net/tramp.el (tramp-handle-unhandled-file-name-directory):
Return nil when required by the spec.  (Bug#20233)
This commit is contained in:
Michael Albinus 2015-04-01 09:31:20 +02:00
parent 4d2e7e1754
commit 1b70aa634c
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-01 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-handle-unhandled-file-name-directory):
Return nil when required by the spec. (Bug#20233)
2015-04-01 Nicolas Petton <nicolas@petton.fr>
* Version 24.5 released.

9
lisp/net/tramp.el
View file

@ -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."