Mercurial > emacs

comparison lisp/net/tramp-smb.el @ 83219:e86fc76a45e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-611 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-612 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-613 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-614 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-615 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-46 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-48 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49 Add {arch}/=commit-merge-make-log * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50 {arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-259
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 14 Oct 2004 14:42:03 +0000
parents 40298ea4d83f
children 1fbbe0bcfaac ff0e824afa37
comparison
equal deleted inserted replaced
83218:47f53c5c9620 83219:e86fc76a45e4
1085 1085
1086 1086
1087 ;; `PC-do-completion' touches the returning "$$" by `substitute-in-file-name'. 1087 ;; `PC-do-completion' touches the returning "$$" by `substitute-in-file-name'.
1088 ;; Must be corrected. 1088 ;; Must be corrected.
1089 1089
1090 (defadvice PC-do-completion (around tramp-smb-advice-PC-do-completion activate) 1090 (defadvice PC-do-completion (around tramp-smb-advice-PC-do-completion)
1091 "Changes \"$\" back to \"$$\" in minibuffer." 1091 "Changes \"$\" back to \"$$\" in minibuffer."
1092 (if (funcall PC-completion-as-file-name-predicate) 1092 (if (funcall PC-completion-as-file-name-predicate)
1093 1093
1094 (progn 1094 (progn
1095 ;; Substitute file names 1095 ;; Substitute file names
1120 (replace-match "$$" nil nil str 1) 1120 (replace-match "$$" nil nil str 1)
1121 str)))) 1121 str))))
1122 1122
1123 ;; No file names. Behave unchanged. 1123 ;; No file names. Behave unchanged.
1124 ad-do-it)) 1124 ad-do-it))
1125
1126 ;; Activate advice. Recent Emacsen don't need that.
1127 (when (functionp 'PC-do-completion)
1128 (condition-case nil
1129 (substitute-in-file-name "C$/")
1130 (error
1131 (ad-activate 'PC-do-completion))))
1125 1132
1126 (provide 'tramp-smb) 1133 (provide 'tramp-smb)
1127 1134
1128 ;;; TODO: 1135 ;;; TODO:
1129 1136