emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r117880: * net/tramp-cache.el (tramp-flush-file-func


From: Michael Albinus
Subject: [Emacs-diffs] trunk r117880: * net/tramp-cache.el (tramp-flush-file-function): Simplify check.
Date: Sun, 14 Sep 2014 09:00:23 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117880
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2014-09-14 11:00:11 +0200
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-cache.el        
trampcache.el-20091113204419-o5vbwnq5f7feedwu-5065
  lisp/net/tramp-gvfs.el         
trampgvfs.el-20091113204419-o5vbwnq5f7feedwu-10898
  lisp/net/tramp.el              tramp.el-20091113204419-o5vbwnq5f7feedwu-2427
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-13 17:44:32 +0000
+++ b/lisp/ChangeLog    2014-09-14 09:00:11 +0000
@@ -1,3 +1,12 @@
+2014-09-14  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * calendar/calendar.el (calendar-update-mode-line):

=== modified file 'lisp/net/tramp-cache.el'
--- a/lisp/net/tramp-cache.el   2014-08-05 08:24:47 +0000
+++ b/lisp/net/tramp-cache.el   2014-09-14 09:00:11 +0000
@@ -207,15 +207,12 @@
   "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)))))))

=== modified file 'lisp/net/tramp-gvfs.el'
--- a/lisp/net/tramp-gvfs.el    2014-06-15 15:47:35 +0000
+++ b/lisp/net/tramp-gvfs.el    2014-09-14 09:00:11 +0000
@@ -1108,7 +1108,7 @@
 (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

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2014-08-28 19:31:11 +0000
+++ b/lisp/net/tramp.el 2014-09-14 09:00:11 +0000
@@ -2148,13 +2148,13 @@
                       ((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 @@
                   (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)))
 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]