Commit 36cac320 authored by Michael Albinus's avatar Michael Albinus
Browse files

* net/tramp-cache.el (tramp-flush-file-function): Simplify check.

Suppress debug messages.

* net/tramp.el (tramp-file-name-handler):
* net/tramp-gvfs.el (tramp-gvfs-url-file-name): Apply `cons' where
appropriate.
parent 3f7ae02b
2014-09-14 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-cache.el (tramp-flush-file-function): Simplify check.
Suppress debug messages.
* net/tramp.el (tramp-file-name-handler):
* net/tramp-gvfs.el (tramp-gvfs-url-file-name): Apply `cons' where
appropriate.
2014-09-13 Christopher Schmidt <ch@ristopher.com> 2014-09-13 Christopher Schmidt <ch@ristopher.com>
   
* calendar/calendar.el (calendar-update-mode-line): * calendar/calendar.el (calendar-update-mode-line):
......
...@@ -207,15 +207,12 @@ Remove also properties of all files in subdirectories." ...@@ -207,15 +207,12 @@ Remove also properties of all files in subdirectories."
"Flush all Tramp cache properties from `buffer-file-name'. "Flush all Tramp cache properties from `buffer-file-name'.
This is suppressed for temporary buffers." This is suppressed for temporary buffers."
(save-match-data (save-match-data
(unless (unless (or (null (buffer-name))
(string-match (string-match "^\\( \\|\\*\\)" (buffer-name)))
(concat
"^" (regexp-opt '("*tramp/" "*debug tramp/" " *temp*") 'paren))
(or (buffer-name) ""))
(let ((bfn (if (stringp (buffer-file-name)) (let ((bfn (if (stringp (buffer-file-name))
(buffer-file-name) (buffer-file-name)
default-directory))) default-directory))
(tramp-verbose 0))
(when (tramp-tramp-file-p bfn) (when (tramp-tramp-file-p bfn)
(with-parsed-tramp-file-name bfn nil (with-parsed-tramp-file-name bfn nil
(tramp-flush-file-property v localname))))))) (tramp-flush-file-property v localname)))))))
......
...@@ -1108,7 +1108,7 @@ is no information where to trace the message.") ...@@ -1108,7 +1108,7 @@ is no information where to trace the message.")
(defun tramp-gvfs-url-file-name (filename) (defun tramp-gvfs-url-file-name (filename)
"Return FILENAME in URL syntax." "Return FILENAME in URL syntax."
;; "/" must NOT be hexlified. ;; "/" must NOT be hexlified.
(let ((url-unreserved-chars (append '(?/) url-unreserved-chars)) (let ((url-unreserved-chars (cons ?/ url-unreserved-chars))
result) result)
(setq (setq
result result
......
...@@ -2148,13 +2148,13 @@ Falls back to normal file name handler if no Tramp file name handler exists." ...@@ -2148,13 +2148,13 @@ Falls back to normal file name handler if no Tramp file name handler exists."
((eq result 'non-essential) ((eq result 'non-essential)
(tramp-message (tramp-message
v 5 "Non-essential received in operation %s" v 5 "Non-essential received in operation %s"
(append (list operation) args)) (cons operation args))
(tramp-run-real-handler operation args)) (tramp-run-real-handler operation args))
((eq result 'suppress) ((eq result 'suppress)
(let (tramp-message-show-message) (let (tramp-message-show-message)
(tramp-message (tramp-message
v 1 "Suppress received in operation %s" v 1 "Suppress received in operation %s"
(append (list operation) args)) (cons operation args))
(tramp-cleanup-connection v t) (tramp-cleanup-connection v t)
(tramp-run-real-handler operation args))) (tramp-run-real-handler operation args)))
(t result))) (t result)))
...@@ -2164,7 +2164,7 @@ Falls back to normal file name handler if no Tramp file name handler exists." ...@@ -2164,7 +2164,7 @@ Falls back to normal file name handler if no Tramp file name handler exists."
(let (tramp-message-show-message) (let (tramp-message-show-message)
(tramp-message (tramp-message
v 1 "Interrupt received in operation %s" v 1 "Interrupt received in operation %s"
(append (list operation) args))) (cons operation args)))
;; Propagate the quit signal. ;; Propagate the quit signal.
(signal (car err) (cdr err))) (signal (car err) (cdr err)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment