diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2006-04-17 12:56:56 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2006-04-17 12:56:56 +0000 |
| commit | 8580639069942441f4b1f21e85bd8a945c5b291f (patch) | |
| tree | c6700ba75c27e4deb3c05d7a4baf7f30ec305b5c /lisp/net | |
| parent | 587043f8b7201a09b5839a1a9c77984890e52d51 (diff) | |
| download | emacs-8580639069942441f4b1f21e85bd8a945c5b291f.tar.gz emacs-8580639069942441f4b1f21e85bd8a945c5b291f.tar.bz2 emacs-8580639069942441f4b1f21e85bd8a945c5b291f.zip | |
Sync with Tramp 2.0.53.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp-smb.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 37 | ||||
| -rw-r--r-- | lisp/net/trampver.el | 2 |
3 files changed, 23 insertions, 18 deletions
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 04fbd3636f8..34bb388f855 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -979,7 +979,7 @@ Returns nil if an error message has appeared." ;; Algorithm: get waiting output. See if last line contains ;; tramp-smb-prompt sentinel or tramp-smb-errors strings. ;; If not, wait a bit and again get waiting output. - (while (and (not found) (not err)) + (while (not found) ;; Accept pending output. (tramp-accept-process-output proc) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5abd3dd36e4..9ea8514153e 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4344,6 +4344,7 @@ Falls back to normal file name handler if no tramp file name handler exists." ;;;###autoload (add-to-list 'file-name-handler-alist (cons tramp-file-name-regexp 'tramp-file-name-handler)) +;;;###autoload (add-to-list 'file-name-handler-alist (cons tramp-completion-file-name-regexp 'tramp-completion-file-name-handler)) @@ -4458,24 +4459,28 @@ necessary anymore." file) (member (match-string 1 file) (mapcar 'car tramp-methods))) ((or (equal last-input-event 'tab) - ;; Emacs - (and (integerp last-input-event) - (not (event-modifiers last-input-event)) - (or (char-equal last-input-event ?\?) - (char-equal last-input-event ?\t) ; handled by 'tab already? - (char-equal last-input-event ?\ ))) + ;; Emacs + (and (integerp last-input-event) + (or + ;; ?\t has event-modifier 'control + (char-equal last-input-event ?\t) + (and (not (event-modifiers last-input-event)) + (or (char-equal last-input-event ?\?) + (char-equal last-input-event ?\ ))))) ;; XEmacs (and (featurep 'xemacs) - (not (event-modifiers last-input-event)) - (or (char-equal - (funcall (symbol-function 'event-to-character) - last-input-event) ?\?) - (char-equal - (funcall (symbol-function 'event-to-character) - last-input-event) ?\t) - (char-equal - (funcall (symbol-function 'event-to-character) - last-input-event) ?\ )))) + (or + ;; ?\t has event-modifier 'control + (char-equal + (funcall (symbol-function 'event-to-character) + last-input-event) ?\t) + (and (not (event-modifiers last-input-event)) + (or (char-equal + (funcall (symbol-function 'event-to-character) + last-input-event) ?\?) + (char-equal + (funcall (symbol-function 'event-to-character) + last-input-event) ?\ )))))) t))) (defun tramp-completion-handle-file-exists-p (filename) diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index a71667291da..c7edf9a4cdc 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -30,7 +30,7 @@ ;; are auto-frobbed from configure.ac, so you should edit that file and run ;; "autoconf && ./configure" to change them. -(defconst tramp-version "2.0.52" +(defconst tramp-version "2.0.53" "This version of Tramp.") (defconst tramp-bug-report-address "tramp-devel@gnu.org" |