[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 134e86b: Handle multibyte chars spanning chunks in
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] master 134e86b: Handle multibyte chars spanning chunks in term.el |
Date: |
Tue, 3 Jan 2017 14:03:47 +0000 (UTC) |
branch: master
commit 134e86b360cab0d0a5cb634b71a4b06ec26c5f1f
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Handle multibyte chars spanning chunks in term.el
* lisp/term.el (term-terminal-undecoded-bytes): New variable.
(term-mode): Make it buffer local. Don't make `term-terminal-parameter'
buffer-local twice.
(term-emulate-terminal): Check for bytes of incompletely decoded
characters, and save them until the next call when they can be fully
decoded (Bug#25288).
---
lisp/term.el | 39 +++++++++++++++++++++++++++++++--------
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/lisp/term.el b/lisp/term.el
index e624f7d..a3933ae 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -341,6 +341,7 @@
(defconst term-protocol-version "0.96")
(eval-when-compile (require 'ange-ftp))
+(eval-when-compile (require 'cl-lib))
(require 'ring)
(require 'ehelp)
@@ -404,6 +405,7 @@ state 4: term-terminal-parameter contains pending output.")
(defvar term-kill-echo-list nil
"A queue of strings whose echo we want suppressed.")
(defvar term-terminal-parameter)
+(defvar term-terminal-undecoded-bytes nil)
(defvar term-terminal-previous-parameter)
(defvar term-current-face 'term)
(defvar term-scroll-start 0 "Top-most line (inclusive) of scrolling region.")
@@ -1015,7 +1017,6 @@ Entry to this mode runs the hooks on `term-mode-hook'."
;; These local variables are set to their local values:
(make-local-variable 'term-saved-home-marker)
- (make-local-variable 'term-terminal-parameter)
(make-local-variable 'term-saved-cursor)
(make-local-variable 'term-prompt-regexp)
(make-local-variable 'term-input-ring-size)
@@ -1052,6 +1053,7 @@ Entry to this mode runs the hooks on `term-mode-hook'."
(make-local-variable 'term-ansi-current-invisible)
(make-local-variable 'term-terminal-parameter)
+ (make-local-variable 'term-terminal-undecoded-bytes)
(make-local-variable 'term-terminal-previous-parameter)
(make-local-variable 'term-terminal-previous-parameter-2)
(make-local-variable 'term-terminal-previous-parameter-3)
@@ -2748,6 +2750,10 @@ See `term-prompt-regexp'."
(when term-log-buffer
(princ str term-log-buffer))
+ (when term-terminal-undecoded-bytes
+ (setq str (concat term-terminal-undecoded-bytes str))
+ (setq str-length (length str))
+ (setq term-terminal-undecoded-bytes nil))
(cond ((eq term-terminal-state 4) ;; Have saved pending output.
(setq str (concat term-terminal-parameter str))
(setq term-terminal-parameter nil)
@@ -2763,13 +2769,6 @@ See `term-prompt-regexp'."
str i))
(when (not funny) (setq funny str-length))
(cond ((> funny i)
- ;; Decode the string before counting
- ;; characters, to avoid garbling of certain
- ;; multibyte characters (bug#1006).
- (setq decoded-substring
- (decode-coding-string
- (substring str i funny)
- locale-coding-system))
(cond ((eq term-terminal-state 1)
;; We are in state 1, we need to wrap
;; around. Go to the beginning of
@@ -2778,7 +2777,31 @@ See `term-prompt-regexp'."
(term-down 1 t)
(term-move-columns (- (term-current-column)))
(setq term-terminal-state 0)))
+ ;; Decode the string before counting
+ ;; characters, to avoid garbling of certain
+ ;; multibyte characters (bug#1006).
+ (setq decoded-substring
+ (decode-coding-string
+ (substring str i funny)
+ locale-coding-system))
(setq count (length decoded-substring))
+ ;; Check for multibyte characters that ends
+ ;; before end of string, and save it for
+ ;; next time.
+ (when (= funny str-length)
+ (let ((partial 0))
+ (while (eq (char-charset (aref decoded-substring
+ (- count 1
partial)))
+ 'eight-bit)
+ (cl-incf partial))
+ (when (> partial 0)
+ (setq term-terminal-undecoded-bytes
+ (substring decoded-substring (-
partial)))
+ (setq decoded-substring
+ (substring decoded-substring 0 (-
partial)))
+ (cl-decf str-length partial)
+ (cl-decf count partial)
+ (cl-decf funny partial))))
(setq temp (- (+ (term-horizontal-column) count)
term-width))
(cond ((or term-suppress-hard-newline (<= temp 0)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 134e86b: Handle multibyte chars spanning chunks in term.el,
Noam Postavsky <=