comparison lisp/net/tramp.el @ 107858:57532220127a

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'.
author Michael Albinus <albinus@detlef>
date Thu, 15 Apr 2010 00:05:14 +0200
parents 02b5fe4a01fe
children 973ae1d72536
comparison
equal deleted inserted replaced
107857:d1934720d87a 107858:57532220127a
5525 ;; situations where the user doesn't actually want to use Tramp. 5525 ;; situations where the user doesn't actually want to use Tramp.
5526 ;; So to avoid autoloading Tramp after typing just "/s", we 5526 ;; So to avoid autoloading Tramp after typing just "/s", we
5527 ;; disable this part of the completion, unless the user implicitly 5527 ;; disable this part of the completion, unless the user implicitly
5528 ;; indicated his interest in using a fancier completion system. 5528 ;; indicated his interest in using a fancier completion system.
5529 (or (eq tramp-syntax 'sep) 5529 (or (eq tramp-syntax 'sep)
5530 (featurep 'tramp) ; If it's loaded, we may as well use it. 5530 (featurep 'tramp) ;; If it's loaded, we may as well use
5531 ;; it. `partial-completion-mode' does not exist in
5532 ;; XEmacs. It is obsoleted with Emacs 24.1.
5531 (and (boundp 'partial-completion-mode) partial-completion-mode) 5533 (and (boundp 'partial-completion-mode) partial-completion-mode)
5532 ;; FIXME: These may have been loaded even if the user never 5534 ;; FIXME: These may have been loaded even if the user never
5533 ;; intended to use them. 5535 ;; intended to use them.
5534 (featurep 'ido) 5536 (featurep 'ido)
5535 (featurep 'icicles))) 5537 (featurep 'icicles)))
5601 ;; overwriting this check in such cases. Or we change Tramp file name 5603 ;; overwriting this check in such cases. Or we change Tramp file name
5602 ;; syntax in order to avoid ambiguities, like in XEmacs ... 5604 ;; syntax in order to avoid ambiguities, like in XEmacs ...
5603 (defun tramp-completion-mode-p () 5605 (defun tramp-completion-mode-p ()
5604 "Checks whether method / user name / host name completion is active." 5606 "Checks whether method / user name / host name completion is active."
5605 (or 5607 (or
5606 ;; Signal from outside. 5608 ;; Signal from outside. `non-essential' has been introduced in Emacs 24.
5609 (and (boundp 'non-essential) (symbol-value 'non-essential))
5607 tramp-completion-mode 5610 tramp-completion-mode
5608 ;; Emacs. 5611 ;; Emacs.
5609 (equal last-input-event 'tab) 5612 (equal last-input-event 'tab)
5610 (and (natnump last-input-event) 5613 (and (natnump last-input-event)
5611 (or 5614 (or
8649 ;; * Try telnet+curl as new method. It might be useful for busybox, 8652 ;; * Try telnet+curl as new method. It might be useful for busybox,
8650 ;; without built-in uuencode/uudecode. 8653 ;; without built-in uuencode/uudecode.
8651 ;; * Let `shell-dynamic-complete-*' and `comint-dynamic-complete' work 8654 ;; * Let `shell-dynamic-complete-*' and `comint-dynamic-complete' work
8652 ;; on remote hosts. 8655 ;; on remote hosts.
8653 ;; * Use secrets.el for password handling. 8656 ;; * Use secrets.el for password handling.
8657 ;; * Load ~/.emacs_SHELLNAME on the remote host for `shell'.
8654 8658
8655 ;; Functions for file-name-handler-alist: 8659 ;; Functions for file-name-handler-alist:
8656 ;; diff-latest-backup-file -- in diff.el 8660 ;; diff-latest-backup-file -- in diff.el
8657 8661
8658 ;; arch-tag: 3a21a994-182b-48fa-b0cd-c1d9fede424a 8662 ;; arch-tag: 3a21a994-182b-48fa-b0cd-c1d9fede424a