Sync with Tramp 2.0.44.

2 files changed, 36 insertions, 31 deletions

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 02b076483c..cda0d41fd8 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2055,7 +2055,7 @@ target of the symlink differ."
 
 (defun tramp-handle-file-truename (filename &optional counter prev-dirs)
   "Like `file-truename' for tramp files."
-  (with-parsed-tramp-file-name filename nil
+  (with-parsed-tramp-file-name (expand-file-name filename) nil
     (let* ((steps        (tramp-split-string localname "/"))
 	   (localnamedir (tramp-let-maybe directory-sep-char ?/	;for XEmacs
 			   (file-name-as-directory localname)))
@@ -2299,32 +2299,33 @@ If it doesn't exist, generate a new one."
   (unless (buffer-file-name)
     (error "Can't set-visited-file-modtime: buffer `%s' not visiting a file"
 	   (buffer-name)))
-  (when time-list
-    (tramp-run-real-handler 'set-visited-file-modtime (list time-list)))
-  (let ((f (buffer-file-name))
-	(coding-system-used nil))
-    (with-parsed-tramp-file-name f nil
-      (let* ((attr (file-attributes f))
-	     (modtime (nth 5 attr)))
-	;; We use '(0 0) as a don't-know value.  See also
-	;; `tramp-handle-file-attributes-with-ls'.
-	(when (boundp 'last-coding-system-used)
-	  (setq coding-system-used last-coding-system-used))
-	(if (not (equal modtime '(0 0)))
-	    (tramp-run-real-handler 'set-visited-file-modtime (list modtime))
-	  (save-excursion
-	    (tramp-send-command
-	     multi-method method user host
-	     (format "%s -ild %s"
-		     (tramp-get-ls-command multi-method method user host)
-		     (tramp-shell-quote-argument localname)))
-	    (tramp-wait-for-output)
-	    (setq attr (buffer-substring (point)
-					 (progn (end-of-line) (point)))))
-	  (setq tramp-buffer-file-attributes attr))
-	(when (boundp 'last-coding-system-used)
-	  (setq last-coding-system-used coding-system-used))
-	nil))))
+  (if time-list
+      (tramp-run-real-handler 'set-visited-file-modtime (list time-list))
+    (let ((f (buffer-file-name))
+	  (coding-system-used nil))
+      (with-parsed-tramp-file-name f nil
+	(let* ((attr (file-attributes f))
+	       ;; '(-1 65535) means file doesn't exists yet.
+	       (modtime (or (nth 5 attr) '(-1 65535))))
+	  ;; We use '(0 0) as a don't-know value.  See also
+	  ;; `tramp-handle-file-attributes-with-ls'.
+	  (when (boundp 'last-coding-system-used)
+	    (setq coding-system-used last-coding-system-used))
+	  (if (not (equal modtime '(0 0)))
+	      (tramp-run-real-handler 'set-visited-file-modtime (list modtime))
+	    (save-excursion
+	      (tramp-send-command
+	       multi-method method user host
+	       (format "%s -ild %s"
+		       (tramp-get-ls-command multi-method method user host)
+		       (tramp-shell-quote-argument localname)))
+	      (tramp-wait-for-output)
+	      (setq attr (buffer-substring (point)
+					   (progn (end-of-line) (point)))))
+	    (setq tramp-buffer-file-attributes attr))
+	  (when (boundp 'last-coding-system-used)
+	    (setq last-coding-system-used coding-system-used))
+	nil)))))
 
 ;; CCC continue here
 
@@ -3811,8 +3812,11 @@ This will break if COMMAND prints a newline, followed by the value of
       (unless (equal curbuf (current-buffer))
 	(error "Buffer has changed from `%s' to `%s'"
 	       curbuf (current-buffer)))
-      (when (eq visit t)
-	(set-visited-file-modtime))
+      (when (or (eq visit t) (stringp visit))
+	(set-visited-file-modtime
+	 ;; We must pass modtime explicitely, because filename can be different
+	 ;; from (buffer-file-name), f.e. if `file-precious-flag' is set.
+	 (nth 5 (file-attributes filename))))
       ;; Make `last-coding-system-used' have the right value.
       (when (boundp 'last-coding-system-used)
 	(setq last-coding-system-used coding-system-used))
@@ -5847,7 +5851,8 @@ locale to C and sets up the remote shell search path."
 	 multi-method method user host
 	 (concat "tramp_file_attributes () {\n"
 		 tramp-remote-perl
-		 " -e '" tramp-perl-file-attributes "' $1 $2 2>/dev/null\n"
+		 " -e '" tramp-perl-file-attributes "'"
+		 " \"$1\" \"$2\" 2>/dev/null\n"
 		 "}"))
 	(tramp-wait-for-output)
 	(unless (tramp-method-out-of-band-p multi-method method user host)
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index b3223d7a46..46b33b2d50 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -30,7 +30,7 @@
 ;; are auto-frobbed from configure.ac, so you should edit that file and run
 ;; "autoconf && ./configure" to change them.
 
-(defconst tramp-version "2.0.39"
+(defconst tramp-version "2.0.44"
   "This version of Tramp.")
 
 (defconst tramp-bug-report-address "[email protected]"