diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 4 |
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 @@ +2009-01-09 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el: Revert previous patch. `last-command-char' is + used in code intended only for XEmacs, where it is different from + `last-command-event'. + 2009-01-09 Glenn Morris <rgm@gnu.org> * 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." ;; We don't need to handle `last-input-event', because ;; due to the key map we know it must be ?/ or ?~. (let ((s (concat (buffer-substring (point-min) (point)) - (string last-command-event)))) + (string last-command-char)))) (delete-region (point-min) (point)) (insert (substitute-in-file-name s)) - (setq ad-return-value last-command-event)) + (setq ad-return-value last-command-char)) ad-do-it)))) '(minibuffer-electric-separator |