[Emacs-diffs] emacs/lisp/net tramp.el

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/11/17 10:35:37

Modified files:
        lisp/net       : tramp.el 

Log message:
        * net/tramp.el (tramp-advice-file-expand-wildcards): Simplify.
        Don't set `ad-return-value' if `ad-do-it' doesn't.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&r1=1.267&r2=1.268

Patches:
Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -b -r1.267 -r1.268
--- tramp.el    11 Nov 2009 14:40:18 -0000      1.267
+++ tramp.el    17 Nov 2009 10:35:36 -0000      1.268
@@ -8364,21 +8364,16 @@
   (defadvice file-expand-wildcards
     (around tramp-advice-file-expand-wildcards activate)
     (let ((name (ad-get-arg 0)))
-      (if (tramp-tramp-file-p name)
-         ;; If it's a Tramp file, dissect it and look if wildcards
-         ;; need to be expanded at all.
-         (if (string-match
+      ;; If it's a Tramp file, dissect it and look if wildcards need
+      ;; to be expanded at all.
+      (if (and
+          (tramp-tramp-file-p name)
+          (not (string-match
               "[[*?]"
-              (tramp-file-name-localname (tramp-dissect-file-name name)))
-             (progn
-               ad-do-it
-               (unless ad-return-value
-                 (setq ad-return-value (list name))))
-           (setq ad-return-value (list name)))
-       ;; If it is not a Tramp file, just run the original function.
-       ad-do-it
-       (unless ad-return-value
-         (setq ad-return-value (list name))))))
+                (tramp-file-name-localname (tramp-dissect-file-name name)))))
+         (setq ad-return-value (list name))
+       ;; Otherwise, just run the original function.
+       ad-do-it)))
   (add-hook
    'tramp-unload-hook
    (lambda ()