From 5f2b693f1849f30e6ab616df8bb73f1e395fa33d Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 15 Apr 2010 00:05:14 +0200 Subject: [PATCH] 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'. --- lisp/ChangeLog | 7 +++++++ lisp/ido.el | 2 +- lisp/minibuffer.el | 3 ++- lisp/net/tramp.el | 8 ++++++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f2330b0763c..8b743adb1b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-04-14 Michael Albinus + + 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 * simple.el (non-essential): New var. diff --git a/lisp/ido.el b/lisp/ido.el index a88ef2df496..ebfcbd4da88 100644 --- 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 154cc37e9a1..05cc13bd2e4 100644 --- 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 c1caeb7d15b..5354d898341 100644 --- 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 -- 2.11.4.GIT