# HG changeset patch
# User Michael Albinus <albinus@detlef>
# Date 1271282714 -7200
# Node ID 57532220127a8dab0ba34239785b1254b83c0f49
# Parent  d1934720d87a4dca2b971f7eba60dcd6a1f7b8c2
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 -r d1934720d87a -r 57532220127a lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Apr 14 08:36:25 2010 -0700
+++ b/lisp/ChangeLog	Thu Apr 15 00:05:14 2010 +0200
@@ -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 -r d1934720d87a -r 57532220127a lisp/ido.el
--- a/lisp/ido.el	Wed Apr 14 08:36:25 2010 -0700
+++ b/lisp/ido.el	Thu Apr 15 00:05:14 2010 +0200
@@ -3458,7 +3458,7 @@
     ;; 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 -r d1934720d87a -r 57532220127a lisp/minibuffer.el
--- a/lisp/minibuffer.el	Wed Apr 14 08:36:25 2010 -0700
+++ b/lisp/minibuffer.el	Thu Apr 15 00:05:14 2010 +0200
@@ -1028,7 +1028,8 @@
   "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 -r d1934720d87a -r 57532220127a lisp/net/tramp.el
--- a/lisp/net/tramp.el	Wed Apr 14 08:36:25 2010 -0700
+++ b/lisp/net/tramp.el	Thu Apr 15 00:05:14 2010 +0200
@@ -5527,7 +5527,9 @@
          ;; 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 @@
 (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 @@
 ;; * 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