Mercurial > emacs

changeset 104314:b9b60c07064d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* net/tramp.el (tramp-register-completion-file-name-handler): Check also for (member 'partial-completion completion-styles).
author Michael Albinus <michael.albinus@gmx.de>
date Mon, 17 Aug 2009 19:11:33 +0000
parents 73f76307d49b
children 9ff366a7ccc0
files lisp/net/tramp.el
diffstat 1 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/net/tramp.el	Mon Aug 17 01:25:54 2009 +0000
+++ b/lisp/net/tramp.el	Mon Aug 17 19:11:33 2009 +0000
@@ -4925,13 +4925,17 @@
   (let ((a1 (rassq
 	     'tramp-completion-file-name-handler file-name-handler-alist)))
     (setq file-name-handler-alist (delete a1 file-name-handler-alist)))
-  ;; `partial-completion-mode' is unknown in XEmacs.  So we should
-  ;; load it unconditionally there.  In the GNU Emacs case, method/
-  ;; user/host name completion shall be bound to `partial-completion-mode'.
-  ;; `ido-mode' and `icy-mode' are other packages which extend file
-  ;; name completion.
-  (when (or (not (boundp 'partial-completion-mode))
-	    (symbol-value 'partial-completion-mode)
+  ;; In XEmacs, there is another Tramp syntax, so we can enable this
+  ;; unconditionally.  In GNU Emacs <= 22, method/user/host name
+  ;; completion shall be bound to `partial-completion-mode'.  Starting
+  ;; with GNU Emacs 23, this is replaced by `completion-styles',
+  ;; containing symbol `partial-completion'.  `ido-mode' and
+  ;; `icy-mode' are other packages which extend file name completion.
+  (when (or (and (boundp 'partial-completion-mode)
+		 (symbol-value 'partial-completion-mode))
+	    (and (boundp 'completion-styles)
+		 (member 'partial-completion (symbol-value 'completion-styles)))
+	    (featurep 'xemacs)
 	    (featurep 'ido)
 	    (featurep 'icicles))
     (add-to-list 'file-name-handler-alist