* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a4cf2e902780465cff326e9502d7dd910803f5e..35df2c5bf1754c10b46cd0dacd74b3c3c608977e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):

diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index bdcbba859603ab93dc6dbe7d66ce53d69905ff2f..056b1bdaf914f43ef0ee33fc80cae3078e9f0228 100644 (file)
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -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)))))))

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 5d6447609fadd0a48af31f8a829f09531cd4cbdc..569fb684144a19755ca5f54891c7df3e5176c5f6 100644 (file)
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -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

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5968a331b68d048d7998ff80de6c88c87f3c16c1..e3fb177b0c5029a6ac487ad840892d4ee7c43ded 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -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)))