Mercurial > emacs
diff lisp/net/tramp-smb.el @ 90068:eac554634bfa
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-79
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-735
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-747
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 25 Dec 2004 02:00:25 +0000 |
parents | ff0e824afa37 1fbbe0bcfaac |
children | 6d92d69fae33 |
line wrap: on
line diff
--- a/lisp/net/tramp-smb.el Tue Dec 14 09:27:49 2004 +0000 +++ b/lisp/net/tramp-smb.el Sat Dec 25 02:00:25 2004 +0000 @@ -1105,9 +1105,11 @@ ;; Do `PC-do-completion' without substitution (let* (save) (fset 'save (symbol-function 'substitute-in-file-name)) - (fset 'substitute-in-file-name (symbol-function 'identity)) - ad-do-it - (fset 'substitute-in-file-name (symbol-function 'save))) + (unwind-protect + (progn + (fset 'substitute-in-file-name (symbol-function 'identity)) + ad-do-it) + (fset 'substitute-in-file-name (symbol-function 'save)))) ;; Expand "$" (let* ((beg (or (and (functionp 'minibuffer-prompt-end) ; Emacs 21