aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-05-26 03:32:02 +0000
committerChong Yidong2009-05-26 03:32:02 +0000
commit66bb84855f71d0fd97736929b39dfce282ec1fff (patch)
tree71bbdd107a6ac35fa6c732ce4ee8bbf1c5f44c53
parent0d77490724e1ad7c8f33798bf9952e5f64b141ec (diff)
downloademacs-66bb84855f71d0fd97736929b39dfce282ec1fff.tar.gz
emacs-66bb84855f71d0fd97736929b39dfce282ec1fff.zip
* textmodes/table.el (table--unibyte-char-to-multibyte): Function
deleted. (*table--cell-self-insert-command, *table--cell-quoted-insert): Don't call table--unibyte-char-to-multibyte (Bug#3372).
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/textmodes/table.el17
2 files changed, 9 insertions, 15 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b15c72614cd..56ed296fb69 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12009-05-26 Kenichi Handa <handa@m17n.org>
2
3 * textmodes/table.el (table--unibyte-char-to-multibyte): Function
4 deleted.
5 (*table--cell-self-insert-command, *table--cell-quoted-insert):
6 Don't call table--unibyte-char-to-multibyte (Bug#3372).
7
12009-05-26 Chong Yidong <cyd@stupidchicken.com> 82009-05-26 Chong Yidong <cyd@stupidchicken.com>
2 9
3 * newcomment.el (comment-region): Doc fix (Bug#3370). 10 * newcomment.el (comment-region): Doc fix (Bug#3370).
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index fbfdf573640..873a6121b86 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -3943,7 +3943,7 @@ converts a table into plain text without frames. It is a companion to
3943(defun *table--cell-self-insert-command () 3943(defun *table--cell-self-insert-command ()
3944 "Table cell version of `self-insert-command'." 3944 "Table cell version of `self-insert-command'."
3945 (interactive "*") 3945 (interactive "*")
3946 (let ((char (table--unibyte-char-to-multibyte last-command-event))) 3946 (let ((char last-command-event))
3947 (if (eq buffer-undo-list t) nil 3947 (if (eq buffer-undo-list t) nil
3948 (if (not (eq last-command this-command)) 3948 (if (not (eq last-command this-command))
3949 (setq table-cell-self-insert-command-count 0) 3949 (setq table-cell-self-insert-command-count 0)
@@ -4048,7 +4048,7 @@ converts a table into plain text without frames. It is a companion to
4048(defun *table--cell-quoted-insert (arg) 4048(defun *table--cell-quoted-insert (arg)
4049 "Table cell version of `quoted-insert'." 4049 "Table cell version of `quoted-insert'."
4050 (interactive "*p") 4050 (interactive "*p")
4051 (let ((char (table--unibyte-char-to-multibyte (read-quoted-char)))) 4051 (let ((char (read-quoted-char)))
4052 (while (> arg 0) 4052 (while (> arg 0)
4053 (table--cell-insert-char char nil) 4053 (table--cell-insert-char char nil)
4054 (setq arg (1- arg))))) 4054 (setq arg (1- arg)))))
@@ -4349,19 +4349,6 @@ cdr is the history symbol."
4349 (cdr (symbol-value (cdr prompt-history))))) 4349 (cdr (symbol-value (cdr prompt-history)))))
4350 (car (symbol-value (cdr prompt-history)))) 4350 (car (symbol-value (cdr prompt-history))))
4351 4351
4352(defun table--unibyte-char-to-multibyte (char)
4353 "Convert CHAR by `unibyte-char-to-multibyte' when possible and necessary."
4354 ;; This part is take from `quoted-insert'.
4355 ;; Assume character codes 0240 - 0377 stand for characters in some
4356 ;; single-byte character set, and convert them to Emacs
4357 ;; characters.
4358 (if (and enable-multibyte-characters
4359 (fboundp 'unibyte-char-to-multibyte)
4360 (>= char ?\240)
4361 (<= char ?\377))
4362 (unibyte-char-to-multibyte char)
4363 char))
4364
4365(defun table--buffer-substring-and-trim (beg end) 4352(defun table--buffer-substring-and-trim (beg end)
4366 "Extract buffer substring and remove blanks from front and the rear of it." 4353 "Extract buffer substring and remove blanks from front and the rear of it."
4367 (save-excursion 4354 (save-excursion