aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorGlenn Morris2009-01-09 04:23:38 +0000
committerGlenn Morris2009-01-09 04:23:38 +0000
commit1ba983e8d9da561ccbdf15fb1544895fad40cce8 (patch)
tree88210d37a85f0ef4a8d3341074b185c9d0187dad /lisp/textmodes
parente93c003eb15f85f744a39c28a8fb43b8c6da9904 (diff)
downloademacs-1ba983e8d9da561ccbdf15fb1544895fad40cce8.tar.gz
emacs-1ba983e8d9da561ccbdf15fb1544895fad40cce8.zip
Replace last-command-char with last-command-event.
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/sgml-mode.el8
-rw-r--r--lisp/textmodes/table.el4
-rw-r--r--lisp/textmodes/two-column.el6
3 files changed, 9 insertions, 9 deletions
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 9322f4fe61e..68a33e06896 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -595,16 +595,16 @@ Uses `sgml-char-names'."
595(defun sgml-name-self () 595(defun sgml-name-self ()
596 "Insert a symbolic character name according to `sgml-char-names'." 596 "Insert a symbolic character name according to `sgml-char-names'."
597 (interactive "*") 597 (interactive "*")
598 (sgml-name-char last-command-char)) 598 (sgml-name-char last-command-event))
599 599
600(defun sgml-maybe-name-self () 600(defun sgml-maybe-name-self ()
601 "Insert a symbolic character name according to `sgml-char-names'." 601 "Insert a symbolic character name according to `sgml-char-names'."
602 (interactive "*") 602 (interactive "*")
603 (if sgml-name-8bit-mode 603 (if sgml-name-8bit-mode
604 (let ((mc last-command-char)) 604 (let ((mc last-command-event))
605 (if (< mc 256) 605 (if (< mc 256)
606 (setq mc (unibyte-char-to-multibyte mc))) 606 (setq mc (unibyte-char-to-multibyte mc)))
607 (or mc (setq mc last-command-char)) 607 (or mc (setq mc last-command-event))
608 (sgml-name-char mc)) 608 (sgml-name-char mc))
609 (self-insert-command 1))) 609 (self-insert-command 1)))
610 610
@@ -714,7 +714,7 @@ With prefix argument, only self insert."
714 (eq (aref tag 0) ?/)) 714 (eq (aref tag 0) ?/))
715 (self-insert-command (prefix-numeric-value arg)) 715 (self-insert-command (prefix-numeric-value arg))
716 (sgml-attributes tag) 716 (sgml-attributes tag)
717 (setq last-command-char ?\s) 717 (setq last-command-event ?\s)
718 (or (> (point) point) 718 (or (> (point) point)
719 (self-insert-command 1))))) 719 (self-insert-command 1)))))
720 720
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 45c8cb2999d..fbfdf573640 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -6,7 +6,7 @@
6;; Keywords: wp, convenience 6;; Keywords: wp, convenience
7;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com> 7;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
8;; Created: Sat Jul 08 2000 13:28:45 (PST) 8;; Created: Sat Jul 08 2000 13:28:45 (PST)
9;; Revised: Wed Jan 03 2007 13:23:46 (PST) 9;; Revised: Thu Jan 08 2009 20:17:04 (PST)
10 10
11;; This file is part of GNU Emacs. 11;; This file is part of GNU Emacs.
12 12
@@ -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-char))) 3946 (let ((char (table--unibyte-char-to-multibyte 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)
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 0e95284b27d..8cbe801fc40 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -580,10 +580,10 @@ on, this also realigns the two buffers."
580 ;; catch a mouse scroll on non-selected scrollbar 580 ;; catch a mouse scroll on non-selected scrollbar
581 (select-window 581 (select-window
582 (prog1 (selected-window) 582 (prog1 (selected-window)
583 (and (consp last-command-char) 583 (and (consp last-command-event)
584 (not (eq (selected-window) 584 (not (eq (selected-window)
585 (car (car (cdr last-command-char))))) 585 (car (car (cdr last-command-event)))))
586 (select-window (car (car (cdr last-command-char))))) 586 (select-window (car (car (cdr last-command-event)))))
587 ;; In some cases scrolling causes an error, but post-command-hook 587 ;; In some cases scrolling causes an error, but post-command-hook
588 ;; shouldn't, and should always stay in the original window 588 ;; shouldn't, and should always stay in the original window
589 (condition-case () 589 (condition-case ()