aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2013-08-26 08:59:53 +0200
committerMichael Albinus2013-08-26 08:59:53 +0200
commitdf54bcbde0e7f8762b97a0e9ea2021e1902851e6 (patch)
treecda7bf78c14c1a018cb59670d9bfc6b794ecf212
parentde3967312fb2f6c5cb217c3497ad7b4f56e46458 (diff)
downloademacs-df54bcbde0e7f8762b97a0e9ea2021e1902851e6.tar.gz
emacs-df54bcbde0e7f8762b97a0e9ea2021e1902851e6.zip
* net/tramp-sh.el (tramp-sh-handle-verify-visited-file-modtime):
BUF can be optional. (Bug#15186)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-sh.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09bd7d19c2a..636e09cbe73 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-08-26 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-sh.el (tramp-sh-handle-verify-visited-file-modtime):
4 BUF can be optional. (Bug#15186)
5
12013-08-25 Xue Fuqiao <xfq.free@gmail.com> 62013-08-25 Xue Fuqiao <xfq.free@gmail.com>
2 7
3 * progmodes/flymake.el (flymake-get-real-file-name-function): 8 * progmodes/flymake.el (flymake-get-real-file-name-function):
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e41ed36f597..b76ac2fa11f 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1234,14 +1234,14 @@ target of the symlink differ."
1234 1234
1235;; This function makes the same assumption as 1235;; This function makes the same assumption as
1236;; `tramp-sh-handle-set-visited-file-modtime'. 1236;; `tramp-sh-handle-set-visited-file-modtime'.
1237(defun tramp-sh-handle-verify-visited-file-modtime (buf) 1237(defun tramp-sh-handle-verify-visited-file-modtime (&optional buf)
1238 "Like `verify-visited-file-modtime' for Tramp files. 1238 "Like `verify-visited-file-modtime' for Tramp files.
1239At the time `verify-visited-file-modtime' calls this function, we 1239At the time `verify-visited-file-modtime' calls this function, we
1240already know that the buffer is visiting a file and that 1240already know that the buffer is visiting a file and that
1241`visited-file-modtime' does not return 0. Do not call this 1241`visited-file-modtime' does not return 0. Do not call this
1242function directly, unless those two cases are already taken care 1242function directly, unless those two cases are already taken care
1243of." 1243of."
1244 (with-current-buffer buf 1244 (with-current-buffer (or buf (current-buffer))
1245 (let ((f (buffer-file-name))) 1245 (let ((f (buffer-file-name)))
1246 ;; There is no file visiting the buffer, or the buffer has no 1246 ;; There is no file visiting the buffer, or the buffer has no
1247 ;; recorded last modification time, or there is no established 1247 ;; recorded last modification time, or there is no established