mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

* net/tramp.el (tramp-advice-file-expand-wildcards): Simplify.

Browse Source 
Don't set `ad-return-value' if `ad-do-it' doesn't.
This commit is contained in:
Michael Albinus 2009-11-17 10:38:44 +00:00
parent a6eb20d8fe
commit e268e987dc
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2009-11-17 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-advice-file-expand-wildcards): Simplify.
Don't set `ad-return-value' if `ad-do-it' doesn't.
2009-11-17 Jan Djärv <jan.h.d@swipnet.se>
* menu-bar.el: Put "Use system font" in Option-menu.

25
lisp/net/tramp.el
View File

@ -8364,21 +8364,16 @@ Only works for Bourne-like shells."
(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
"[[*?]"
(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))))))
;; 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)))))
(setq ad-return-value (list name))
;; Otherwise, just run the original function.
ad-do-it)))
(add-hook
'tramp-unload-hook
(lambda ()