[Emacs-diffs] emacs/lisp/net tramp.el

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/08/17 19:11:33

Modified files:
        lisp/net       : tramp.el 

Log message:
        * net/tramp.el (tramp-register-completion-file-name-handler):
        Check also for (member 'partial-completion completion-styles).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&r1=1.249&r2=1.250

Patches:
Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -b -r1.249 -r1.250
--- tramp.el    9 Aug 2009 14:27:45 -0000       1.249
+++ tramp.el    17 Aug 2009 19:11:33 -0000      1.250
@@ -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