[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110572: international/mule.el (set-k
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110572: international/mule.el (set-keyboard-coding-system): Recover input meta mode when the new coding system does not use 8-bit. Supply TERMINAL arg to set-input-meta-mode. |
Date: |
Thu, 18 Oct 2012 09:01:20 +0900 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110572 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Thu 2012-10-18 09:01:20 +0900
message:
international/mule.el (set-keyboard-coding-system): Recover input meta mode
when the new coding system does not use 8-bit. Supply TERMINAL arg to
set-input-meta-mode.
modified:
lisp/ChangeLog
lisp/international/mule.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-10-17 11:24:34 +0000
+++ b/lisp/ChangeLog 2012-10-17 23:59:24 +0000
@@ -1,3 +1,9 @@
+2012-10-17 Kenichi Handa <address@hidden>
+
+ * international/mule.el (set-keyboard-coding-system): Recover
+ input meta mode when the new coding system doesn not use 8-bit.
+ Supply TERMINAL arg to set-input-meta-mode.
+
2012-10-17 Michael Heerdegen <address@hidden> (tiny change)
* wdired.el (wdired-old-marks): New variable.
=== modified file 'lisp/international/mule.el'
--- a/lisp/international/mule.el 2012-09-24 12:23:25 +0000
+++ b/lisp/international/mule.el 2012-10-17 23:59:24 +0000
@@ -1355,19 +1355,25 @@
(t
(error "Unsupported coding system for keyboard: %s"
coding-system)))
- (when accept-8-bit
- (or saved-meta-mode
- (set-terminal-parameter terminal
- 'keyboard-coding-saved-meta-mode
- (cons (nth 2 (current-input-mode))
- nil)))
- (set-input-meta-mode 8))
+ (if accept-8-bit
+ (progn
+ (or saved-meta-mode
+ (set-terminal-parameter terminal
+ 'keyboard-coding-saved-meta-mode
+ (cons (nth 2 (current-input-mode))
+ nil)))
+ (set-input-meta-mode 8 terminal))
+ (when saved-meta-mode
+ (set-input-meta-mode (car saved-meta-mode) terminal)
+ (set-terminal-parameter terminal
+ 'keyboard-coding-saved-meta-mode
+ nil)))
;; Avoid end-of-line conversion.
(setq coding-system
(coding-system-change-eol-conversion coding-system 'unix)))
(when saved-meta-mode
- (set-input-meta-mode (car saved-meta-mode))
+ (set-input-meta-mode (car saved-meta-mode) terminal)
(set-terminal-parameter terminal
'keyboard-coding-saved-meta-mode
nil))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110572: international/mule.el (set-keyboard-coding-system): Recover input meta mode when the new coding system does not use 8-bit. Supply TERMINAL arg to set-input-meta-mode.,
Kenichi Handa <=