Mercurial > emacs
changeset 68385:774d8922e2c3
(vc-user-login-name): Comment out defadvice, it is no longer
necessary.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Wed, 25 Jan 2006 18:58:45 +0000 |
| parents | 1d4de26bcb1f |
| children | b0411bb09a9a |
| files | lisp/net/tramp-vc.el |
| diffstat | 1 files changed, 20 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/net/tramp-vc.el Wed Jan 25 18:55:41 2006 +0000 +++ b/lisp/net/tramp-vc.el Wed Jan 25 18:58:45 2006 +0000 @@ -436,23 +436,26 @@ (t (error "tramp-handle-vc-user-login-name cannot cope!"))))))) -(defadvice vc-user-login-name - (around tramp-vc-user-login-name activate) - "Support for files on remote machines accessed by TRAMP." - ;; We rely on the fact that `file' is bound when this is called. - ;; This appears to be the case everywhere in vc.el and vc-hooks.el - ;; as of Emacs 20.5. - ;; - ;; CCC TODO there should be a real solution! Talk to Andre Spiegel - ;; about this. - (let ((file (when (boundp 'file) - (symbol-value 'file)))) ;pacify byte-compiler - (or (and (stringp file) - (tramp-tramp-file-p file) ; tramp file - (setq ad-return-value - (save-match-data - (tramp-handle-vc-user-login-name uid)))) ; get the owner name - ad-do-it))) ; else call the original +;; The following defadvice is no longer necessary after changes in VC +;; on 2006-01-25, Andre. + +;; (defadvice vc-user-login-name +;; (around tramp-vc-user-login-name activate) +;; "Support for files on remote machines accessed by TRAMP." +;; ;; We rely on the fact that `file' is bound when this is called. +;; ;; This appears to be the case everywhere in vc.el and vc-hooks.el +;; ;; as of Emacs 20.5. +;; ;; +;; ;; CCC TODO there should be a real solution! Talk to Andre Spiegel +;; ;; about this. +;; (let ((file (when (boundp 'file) +;; (symbol-value 'file)))) ;pacify byte-compiler +;; (or (and (stringp file) +;; (tramp-tramp-file-p file) ; tramp file +;; (setq ad-return-value +;; (save-match-data +;; (tramp-handle-vc-user-login-name uid)))) ; get the owner name +;; ad-do-it))) ; else call the original (add-hook 'tramp-unload-hook '(lambda () (ad-unadvise 'vc-user-login-name)))