aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorStefan Monnier2008-03-17 20:19:00 +0000
committerStefan Monnier2008-03-17 20:19:00 +0000
commit800a97b891f3b5c344fba2a6a76649fb51f488fa (patch)
tree6755be167cfb127562dffaae66f39895e4182403 /lisp/net
parent7ee8e7eb0fbe17073ce4ebd94113241eb49669e4 (diff)
downloademacs-800a97b891f3b5c344fba2a6a76649fb51f488fa.tar.gz
emacs-800a97b891f3b5c344fba2a6a76649fb51f488fa.zip
(tramp-completion-mode-p): Don't use char-equal for
elements which may be something else than characters.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e0bb3244e1b..90b9a1bbaee 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6,7 +6,7 @@
6 6
7;; (copyright statements below in code to be updated with the above notice) 7;; (copyright statements below in code to be updated with the above notice)
8 8
9;; Author: Kai Großjohann <kai.grossjohann@gmx.net> 9;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
10;; Michael Albinus <michael.albinus@gmx.de> 10;; Michael Albinus <michael.albinus@gmx.de>
11;; Keywords: comm, processes 11;; Keywords: comm, processes
12 12
@@ -4614,10 +4614,10 @@ should never be set globally, the intention is to let-bind it.")
4614 (and (natnump last-input-event) 4614 (and (natnump last-input-event)
4615 (or 4615 (or
4616 ;; ?\t has event-modifier 'control. 4616 ;; ?\t has event-modifier 'control.
4617 (char-equal last-input-event ?\t) 4617 (equal last-input-event ?\t)
4618 (and (not (event-modifiers last-input-event)) 4618 (and (not (event-modifiers last-input-event))
4619 (or (char-equal last-input-event ?\?) 4619 (or (equal last-input-event ?\?)
4620 (char-equal last-input-event ?\ ))))) 4620 (equal last-input-event ?\ )))))
4621 ;; XEmacs. 4621 ;; XEmacs.
4622 (and (featurep 'xemacs) 4622 (and (featurep 'xemacs)
4623 ;; `last-input-event' might be nil. 4623 ;; `last-input-event' might be nil.
@@ -4626,14 +4626,14 @@ should never be set globally, the intention is to let-bind it.")
4626 (funcall (symbol-function 'event-to-character) last-input-event) 4626 (funcall (symbol-function 'event-to-character) last-input-event)
4627 (or 4627 (or
4628 ;; ?\t has event-modifier 'control. 4628 ;; ?\t has event-modifier 'control.
4629 (char-equal 4629 (equal
4630 (funcall (symbol-function 'event-to-character) 4630 (funcall (symbol-function 'event-to-character)
4631 last-input-event) ?\t) 4631 last-input-event) ?\t)
4632 (and (not (event-modifiers last-input-event)) 4632 (and (not (event-modifiers last-input-event))
4633 (or (char-equal 4633 (or (equal
4634 (funcall (symbol-function 'event-to-character) 4634 (funcall (symbol-function 'event-to-character)
4635 last-input-event) ?\?) 4635 last-input-event) ?\?)
4636 (char-equal 4636 (equal
4637 (funcall (symbol-function 'event-to-character) 4637 (funcall (symbol-function 'event-to-character)
4638 last-input-event) ?\ ))))))) 4638 last-input-event) ?\ )))))))
4639 4639
@@ -7383,7 +7383,7 @@ Only works for Bourne-like shells."
7383;; transfer method to use. (Greg Stark) 7383;; transfer method to use. (Greg Stark)
7384;; * Remove unneeded parameters from methods. 7384;; * Remove unneeded parameters from methods.
7385;; * Invoke rsync once for copying a whole directory hierarchy. 7385;; * Invoke rsync once for copying a whole directory hierarchy.
7386;; (Francesco Potortì) 7386;; (Francesco Potortì)
7387;; * Make it work for different encodings, and for different file name 7387;; * Make it work for different encodings, and for different file name
7388;; encodings, too. (Daniel Pittman) 7388;; encodings, too. (Daniel Pittman)
7389;; * Progress reports while copying files. (Michael Kifer) 7389;; * Progress reports while copying files. (Michael Kifer)