summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Robert <Adrian.B.Robert@gmail.com>2008-08-18 15:04:37 +0000
committerAdrian Robert <Adrian.B.Robert@gmail.com>2008-08-18 15:04:37 +0000
commit6742a9d2affa08efcbf644c373c8879efa42c9d3 (patch)
treefe36e828212f2e8c71926e0a1d78657d78eb09ee
parent039d3b16fd31e5a5dab27fb09845f3cb785bec89 (diff)
downloademacs-6742a9d2affa08efcbf644c373c8879efa42c9d3.tar.gz
Uncomment 'put backspace ascii-character...' and friends, they are needed for tramp.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term/ns-win.el24
2 files changed, 18 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8285640541..953ea87a988 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-18 Adrian Robert <Adrian.B.Robert@gmail.com>
+
+ * term/ns-win.el (global): Uncomment "put backspace
+ ascii-character..." and friends, they are needed for tramp.
+
2008-08-18 Kenichi Handa <handa@m17n.org>
* international/mule-diag.el (font-show-log): Add optional arg N
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 1b798de1f49..e5cacf8df3c 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -179,18 +179,20 @@ The properties returned may include `top', `left', `height', and `width'."
;;;; Keyboard mapping.
-;;TODO: all terms have these, but they don't seem necessary.
+;; These tell read-char how to convert these special chars to ASCII.
+;;TODO: all terms have these, and at least the return mapping is necessary
+;; for tramp to recognize the enter key.
+;; Perhaps they should be moved into common code somewhere
+;; (when a window system is active).
;; Remove if no problems for some time after 2008-08-06.
-;; These tell read-char how to convert
-;; these special chars to ASCII.
-;;(put 'backspace 'ascii-character 127)
-;;(put 'delete 'ascii-character 127)
-;;(put 'tab 'ascii-character ?\t)
-;;(put 'S-tab 'ascii-character (logior 16 ?\t))
-;;(put 'linefeed 'ascii-character ?\n)
-;;(put 'clear 'ascii-character 12)
-;;(put 'return 'ascii-character 13)
-;;(put 'escape 'ascii-character ?\e)
+(put 'backspace 'ascii-character 127)
+(put 'delete 'ascii-character 127)
+(put 'tab 'ascii-character ?\t)
+(put 'S-tab 'ascii-character (logior 16 ?\t))
+(put 'linefeed 'ascii-character ?\n)
+(put 'clear 'ascii-character 12)
+(put 'return 'ascii-character 13)
+(put 'escape 'ascii-character ?\e)
(defvar ns-alternatives-map