Fix Bug#5840.

* ido.el (ido-file-name-all-completions-1):
* minibuffer.el (minibuffer-completion-help):
* net/tramp.el (tramp-completion-mode-p): Use `non-essential'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2330b0763ccadbc6e67e2b7f0e11dd04afb43e1..8b743adb1b0bc1b06744c50b3614af9f117ee8f5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-14  Michael Albinus  <michael.albinus@gmx.de>
+
+       Fix Bug#5840.
+       * ido.el (ido-file-name-all-completions-1):
+       * minibuffer.el (minibuffer-completion-help):
+       * net/tramp.el (tramp-completion-mode-p): Use `non-essential'.
+
 2010-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * simple.el (non-essential): New var.

diff --git a/lisp/ido.el b/lisp/ido.el
index a88ef2df4963300b5cdd7429ee1109662e7a5da4..ebfcbd4da8864fded4215725d2a1d55162c7dc9c 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3458,7 +3458,7 @@ This is to make them appear as if they were \"virtual buffers\"."
     ;; Strip method:user@host: part of tramp completions.
     ;; Tramp completions do not include leading slash.
     (let* ((len (1- (length dir)))
-          (tramp-completion-mode t)
+          (non-essential t)
           (compl
            (or (file-name-all-completions "" dir)
                ;; work around bug in ange-ftp.

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 154cc37e9a1965995f9f69f61d49cf32fa2d95e3..05cc13bd2e49bc6f6b7e51dc355e141c25cdc6c7 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1028,7 +1028,8 @@ variables.")
   "Display a list of possible completions of the current minibuffer contents."
   (interactive)
   (message "Making completion list...")
-  (let* ((start (field-beginning))
+  (let* ((non-essential t)
+        (start (field-beginning))
          (string (field-string))
          (completions (completion-all-completions
                        string

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c1caeb7d15b8a9171e514935b40a6bcc4dc71a39..5354d8983416d39c325e0d128262e2e5a7cc94b5 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -5527,7 +5527,9 @@ Falls back to normal file name handler if no Tramp file name handler exists."
          ;; disable this part of the completion, unless the user implicitly
          ;; indicated his interest in using a fancier completion system.
          (or (eq tramp-syntax 'sep)
-             (featurep 'tramp) ; If it's loaded, we may as well use it.
+             (featurep 'tramp) ;; If it's loaded, we may as well use
+            ;; it.  `partial-completion-mode' does not exist in
+            ;; XEmacs.  It is obsoleted with Emacs 24.1.
              (and (boundp 'partial-completion-mode) partial-completion-mode)
              ;; FIXME: These may have been loaded even if the user never
              ;; intended to use them.
@@ -5603,7 +5605,8 @@ should never be set globally, the intention is to let-bind it.")
 (defun tramp-completion-mode-p ()
   "Checks whether method / user name / host name completion is active."
   (or
-   ;; Signal from outside.
+   ;; Signal from outside.  `non-essential' has been introduced in Emacs 24.
+   (and (boundp 'non-essential) (symbol-value 'non-essential))
    tramp-completion-mode
    ;; Emacs.
    (equal last-input-event 'tab)
@@ -8651,6 +8654,7 @@ Only works for Bourne-like shells."
 ;; * Let `shell-dynamic-complete-*' and `comint-dynamic-complete' work
 ;;   on remote hosts.
 ;; * Use secrets.el for password handling.
+;; * Load ~/.emacs_SHELLNAME on the remote host for `shell'.
 
 ;; Functions for file-name-handler-alist:
 ;; diff-latest-backup-file -- in diff.el