mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-12 16:23:57 +00:00
* 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.
This commit is contained in:
parent
3f7ae02b89
commit
36cac32093
@ -1,3 +1,12 @@
|
||||
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>
|
||||
|
||||
* calendar/calendar.el (calendar-update-mode-line):
|
||||
|
@ -207,15 +207,12 @@ Remove also properties of all files in subdirectories."
|
||||
"Flush all Tramp cache properties from `buffer-file-name'.
|
||||
This is suppressed for temporary buffers."
|
||||
(save-match-data
|
||||
(unless
|
||||
(string-match
|
||||
(concat
|
||||
"^" (regexp-opt '("*tramp/" "*debug tramp/" " *temp*") 'paren))
|
||||
(or (buffer-name) ""))
|
||||
|
||||
(unless (or (null (buffer-name))
|
||||
(string-match "^\\( \\|\\*\\)" (buffer-name)))
|
||||
(let ((bfn (if (stringp (buffer-file-name))
|
||||
(buffer-file-name)
|
||||
default-directory)))
|
||||
default-directory))
|
||||
(tramp-verbose 0))
|
||||
(when (tramp-tramp-file-p bfn)
|
||||
(with-parsed-tramp-file-name bfn nil
|
||||
(tramp-flush-file-property v localname)))))))
|
||||
|
@ -1108,7 +1108,7 @@ is no information where to trace the message.")
|
||||
(defun tramp-gvfs-url-file-name (filename)
|
||||
"Return FILENAME in URL syntax."
|
||||
;; "/" must NOT be hexlified.
|
||||
(let ((url-unreserved-chars (append '(?/) url-unreserved-chars))
|
||||
(let ((url-unreserved-chars (cons ?/ url-unreserved-chars))
|
||||
result)
|
||||
(setq
|
||||
result
|
||||
|
@ -2148,13 +2148,13 @@ Falls back to normal file name handler if no Tramp file name handler exists."
|
||||
((eq result 'non-essential)
|
||||
(tramp-message
|
||||
v 5 "Non-essential received in operation %s"
|
||||
(append (list operation) args))
|
||||
(cons operation args))
|
||||
(tramp-run-real-handler operation args))
|
||||
((eq result 'suppress)
|
||||
(let (tramp-message-show-message)
|
||||
(tramp-message
|
||||
v 1 "Suppress received in operation %s"
|
||||
(append (list operation) args))
|
||||
(cons operation args))
|
||||
(tramp-cleanup-connection v t)
|
||||
(tramp-run-real-handler operation args)))
|
||||
(t result)))
|
||||
@ -2164,7 +2164,7 @@ Falls back to normal file name handler if no Tramp file name handler exists."
|
||||
(let (tramp-message-show-message)
|
||||
(tramp-message
|
||||
v 1 "Interrupt received in operation %s"
|
||||
(append (list operation) args)))
|
||||
(cons operation args)))
|
||||
;; Propagate the quit signal.
|
||||
(signal (car err) (cdr err)))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user