aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2009-01-09 08:15:27 +0000
committerMichael Albinus2009-01-09 08:15:27 +0000
commitc28f19e5ac0b55c620116cc403b1c25d97ca2132 (patch)
tree202c3e577383deb2bc292a814a67a8e0e9fe2f36
parenteba7400d38bca18b05ff5acf81e2ab428fa43db1 (diff)
downloademacs-c28f19e5ac0b55c620116cc403b1c25d97ca2132.tar.gz
emacs-c28f19e5ac0b55c620116cc403b1c25d97ca2132.zip
* net/tramp.el: Revert previous patch. `last-command-char' is
used in code used only for XEmacs, where it is different from `last-command-event'.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/net/tramp.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f79a344e8d1..e9aaac24c35 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12009-01-09 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp.el: Revert previous patch. `last-command-char' is
4 used in code intended only for XEmacs, where it is different from
5 `last-command-event'.
6
12009-01-09 Glenn Morris <rgm@gnu.org> 72009-01-09 Glenn Morris <rgm@gnu.org>
2 8
3 * subr.el (last-input-char, last-command-char): 9 * subr.el (last-input-char, last-command-char):
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index dbd34b76359..b226f22ad98 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3738,10 +3738,10 @@ beginning of local filename are not substituted."
3738 ;; We don't need to handle `last-input-event', because 3738 ;; We don't need to handle `last-input-event', because
3739 ;; due to the key map we know it must be ?/ or ?~. 3739 ;; due to the key map we know it must be ?/ or ?~.
3740 (let ((s (concat (buffer-substring (point-min) (point)) 3740 (let ((s (concat (buffer-substring (point-min) (point))
3741 (string last-command-event)))) 3741 (string last-command-char))))
3742 (delete-region (point-min) (point)) 3742 (delete-region (point-min) (point))
3743 (insert (substitute-in-file-name s)) 3743 (insert (substitute-in-file-name s))
3744 (setq ad-return-value last-command-event)) 3744 (setq ad-return-value last-command-char))
3745 ad-do-it)))) 3745 ad-do-it))))
3746 3746
3747 '(minibuffer-electric-separator 3747 '(minibuffer-electric-separator