[Emacs-diffs] emacs/lisp ChangeLog double.el electric.el repl...

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/01/09 05:01:03

Modified files:
        lisp           : ChangeLog double.el electric.el replace.el 
                         term.el terminal.el 
        lisp/calc      : calc.el 
        lisp/emulation : viper-cmd.el 
        lisp/international: mule-cmds.el 
        lisp/obsolete  : iso-acc.el 
        lisp/progmodes : vhdl-mode.el 

Log message:
        Replace last-input-char with last-input-event.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15072&r2=1.15073
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/double.el?cvsroot=emacs&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/electric.el?cvsroot=emacs&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/replace.el?cvsroot=emacs&r1=1.281&r2=1.282
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term.el?cvsroot=emacs&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/terminal.el?cvsroot=emacs&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc.el?cvsroot=emacs&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper-cmd.el?cvsroot=emacs&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/mule-cmds.el?cvsroot=emacs&r1=1.352&r2=1.353
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/obsolete/iso-acc.el?cvsroot=emacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/vhdl-mode.el?cvsroot=emacs&r1=1.78&r2=1.79

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15072
retrieving revision 1.15073
diff -u -b -r1.15072 -r1.15073
--- ChangeLog   9 Jan 2009 04:44:15 -0000       1.15072
+++ ChangeLog   9 Jan 2009 05:00:56 -0000       1.15073
@@ -28,6 +28,13 @@
        * textmodes/sgml-mode.el, textmodes/table.el, textmodes/two-column.el:
        Replace last-command-char with last-command-event.
 
+       * double.el, electric.el, replace.el, term.el, terminal.el:
+       * calc/calc.el:
+       * emulation/viper-cmd.el:
+       * international/mule-cmds.el:
+       * obsolete/iso-acc.el:
+       * progmodes/vhdl-mode.el: Replace last-input-char with last-input-event.
+
 2009-01-09  Dave Love  <address@hidden>
 
        * calendar/time-date.el: Require cl for `declare'.

Index: double.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/double.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- double.el   5 Jan 2009 03:18:57 -0000       1.31
+++ double.el   9 Jan 2009 05:00:59 -0000       1.32
@@ -103,7 +103,7 @@
 
 (defun double-translate-key (prompt)
   ;; Translate input events using double map.
-  (let ((key last-input-char))
+  (let ((key last-input-event))
     (cond (unread-command-events
           ;; Artificial event, ignore it.
           (vector key))

Index: electric.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/electric.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- electric.el 9 Jan 2009 04:44:20 -0000       1.36
+++ electric.el 9 Jan 2009 05:00:59 -0000       1.37
@@ -71,7 +71,7 @@
       ;; This makes universal-argument-other-key work.
       (setq universal-argument-num-events 0)
       (if (or (prog1 quit-flag (setq quit-flag nil))
-             (eq last-input-char ?\C-g))
+             (eq last-input-event ?\C-g))
          (progn (setq unread-command-events nil
                       prefix-arg nil)
                 ;; If it wasn't cancelling a prefix character, then quit.
@@ -87,7 +87,7 @@
              (progn (command-execute cmd)
                     (setq last-command this-command)
                     (if (or (prog1 quit-flag (setq quit-flag nil))
-                            (eq last-input-char ?\C-g))
+                            (eq last-input-event ?\C-g))
                         (progn (setq unread-command-events nil)
                                (if (not inhibit-quit)
                                    (progn (ding)

Index: replace.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/replace.el,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -b -r1.281 -r1.282
--- replace.el  5 Jan 2009 03:19:42 -0000       1.281
+++ replace.el  9 Jan 2009 05:01:00 -0000       1.282
@@ -1,7 +1,8 @@
 ;;; replace.el --- replace commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 
Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -1571,7 +1572,7 @@
 
     ;; If last typed key in previous call of multi-buffer perform-replace
     ;; was `automatic-all', don't ask more questions in next files
-    (when (eq (lookup-key map (vector last-input-char)) 'automatic-all)
+    (when (eq (lookup-key map (vector last-input-event)) 'automatic-all)
       (setq query-flag nil multi-buffer t))
 
     ;; REPLACEMENTS is either a string, a list of strings, or a cons cell

Index: term.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term.el,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- term.el     5 Jan 2009 03:19:48 -0000       1.109
+++ term.el     9 Jan 2009 05:01:00 -0000       1.110
@@ -1182,15 +1182,15 @@
 without any interpretation."
   (interactive)
  ;; Convert `return' to C-m, etc.
-  (when (and (symbolp last-input-char)
-            (get last-input-char 'ascii-character))
-    (setq last-input-char (get last-input-char 'ascii-character)))
-  (term-send-raw-string (make-string 1 last-input-char)))
+  (when (and (symbolp last-input-event)
+            (get last-input-event 'ascii-character))
+    (setq last-input-event (get last-input-event 'ascii-character)))
+  (term-send-raw-string (make-string 1 last-input-event)))
 
 (defun term-send-raw-meta ()
   (interactive)
-  (let ((char last-input-char))
-    (when (symbolp last-input-char)
+  (let ((char last-input-event))
+    (when (symbolp last-input-event)
       ;; Convert `return' to C-m, etc.
       (let ((tmp (get char 'event-symbol-elements)))
        (when tmp

Index: terminal.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/terminal.el,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- terminal.el 9 Jan 2009 04:44:21 -0000       1.68
+++ terminal.el 9 Jan 2009 05:01:00 -0000       1.69
@@ -396,10 +396,10 @@
 (put 'te-more-break-unread 'suppress-keymap t)
 (defun te-more-break-unread ()
   (interactive)
-  (if (eq last-input-char terminal-escape-char)
+  (if (eq last-input-event terminal-escape-char)
       (call-interactively 'te-escape)
     (message "Continuing from more break (\"%s\" typed, %d chars output 
pending...)"
-            (single-key-description last-input-char)
+            (single-key-description last-input-event)
             (te-pending-output-length))
     (setq te-more-count 259259)
     (te-more-break-unwind)
@@ -469,29 +469,29 @@
 the terminal escape character (normally C-^)
 lets you type a terminal emulator command."
   (interactive)
-  (cond ((eq last-input-char terminal-escape-char)
+  (cond ((eq last-input-event terminal-escape-char)
         (call-interactively 'te-escape))
        (t
         ;; Convert `return' to C-m, etc.
-        (if (and (symbolp last-input-char)
-                 (get last-input-char 'ascii-character))
-            (setq last-input-char (get last-input-char 'ascii-character)))
+        (if (and (symbolp last-input-event)
+                 (get last-input-event 'ascii-character))
+            (setq last-input-event (get last-input-event 'ascii-character)))
         ;; Convert meta characters to 8-bit form for transmission.
-        (if (and (integerp last-input-char)
-                 (not (zerop (logand last-input-char ?\M-\^@))))
-            (setq last-input-char (+ 128 (logand last-input-char 127))))
+        (if (and (integerp last-input-event)
+                 (not (zerop (logand last-input-event ?\M-\^@))))
+            (setq last-input-event (+ 128 (logand last-input-event 127))))
         ;; Now ignore all but actual characters.
         ;; (It ought to be possible to send through function
         ;; keys as character sequences if we add a description
         ;; to our termcap entry of what they should look like.)
-        (if (integerp last-input-char)
+        (if (integerp last-input-event)
             (progn
               (and terminal-more-processing (null (cdr te-pending-output))
                    (te-set-more-count nil))
-              (process-send-string te-process (make-string 1 last-input-char))
+              (process-send-string te-process (make-string 1 last-input-event))
               (te-process-output t))
           (message "Function key `%s' ignored"
-                   (single-key-description last-input-char))))))
+                   (single-key-description last-input-event))))))
 
 
 (defun te-set-window-start ()

Index: calc/calc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc.el,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- calc/calc.el        9 Jan 2009 03:57:16 -0000       1.122
+++ calc/calc.el        9 Jan 2009 05:01:01 -0000       1.123
@@ -2199,8 +2199,8 @@
     (or (memq last-command-event '(32 13))
        (progn (setq prefix-arg current-prefix-arg)
               (calc-unread-command (if (and (eq last-command-event 27)
-                                            (>= last-input-char 128))
-                                       last-input-char
+                                            (>= last-input-event 128))
+                                       last-input-event
                                      nil))))
     (exit-minibuffer)))
 

Index: emulation/viper-cmd.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-cmd.el,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- emulation/viper-cmd.el      9 Jan 2009 04:36:04 -0000       1.82
+++ emulation/viper-cmd.el      9 Jan 2009 05:01:01 -0000       1.83
@@ -2546,7 +2546,7 @@
   (let (com)
     (if (eq this-command 'viper-intercept-ESC-key)
        (setq com 'viper-exit-insert-state)
-      (viper-set-unread-command-events last-input-char)
+      (viper-set-unread-command-events last-input-event)
       (setq com (key-binding (viper-read-key-sequence nil))))
 
     (condition-case conds
@@ -2567,7 +2567,7 @@
   (if (or (< (point) (viper-replace-start))
          (> (point) (viper-replace-end)))
       (let (viper-replace-minor-mode com)
-       (viper-set-unread-command-events last-input-char)
+       (viper-set-unread-command-events last-input-event)
        (setq com (key-binding (read-key-sequence nil)))
        (condition-case conds
            (command-execute com)

Index: international/mule-cmds.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/international/mule-cmds.el,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -b -r1.352 -r1.353
--- international/mule-cmds.el  9 Jan 2009 04:29:20 -0000       1.352
+++ international/mule-cmds.el  9 Jan 2009 05:01:02 -0000       1.353
@@ -288,7 +288,7 @@
         prefix)
     ;; read-key-sequence ignores quit, so make an explicit check.
     ;; Like many places, this assumes quit == C-g, but it need not be.
-    (if (equal last-input-char ?\C-g)
+    (if (equal last-input-event ?\C-g)
        (keyboard-quit))
     (when (memq cmd '(universal-argument digit-argument))
       (call-interactively cmd)

Index: obsolete/iso-acc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/obsolete/iso-acc.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- obsolete/iso-acc.el 5 Jan 2009 03:22:56 -0000       1.10
+++ obsolete/iso-acc.el 9 Jan 2009 05:01:02 -0000       1.11
@@ -287,9 +287,9 @@
   "Modify the following character by adding an accent to it."
   ;; Pick up the accent character.
   (if (and iso-accents-mode
-          (memq last-input-char iso-accents-enable))
+          (memq last-input-event iso-accents-enable))
       (iso-accents-compose prompt)
-    (vector last-input-char)))
+    (vector last-input-event)))
 
 
 ;; The iso-accents-compose function is called deep inside Emacs' read
@@ -302,7 +302,7 @@
 ;; window's display matrix.
 
 (defun iso-accents-compose (prompt)
-  (let* ((first-char last-input-char)
+  (let* ((first-char last-input-event)
         (list (assq first-char iso-accents-list))
         ;; Wait for the second key and look up the combination.
         (second-char (if (or prompt

Index: progmodes/vhdl-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/vhdl-mode.el,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- progmodes/vhdl-mode.el      9 Jan 2009 04:16:04 -0000       1.78
+++ progmodes/vhdl-mode.el      9 Jan 2009 05:01:02 -0000       1.79
@@ -8158,7 +8158,7 @@
 (defun vhdl-electric-quote (count) "'' --> \""
   (interactive "p")
   (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal)))
-      (if (= (preceding-char) last-input-char)
+      (if (= (preceding-char) last-input-event)
          (progn (delete-backward-char 1) (insert-char ?\" 1))
        (insert-char ?\' 1))
     (self-insert-command count)))
@@ -8166,7 +8166,7 @@
 (defun vhdl-electric-semicolon (count) "';;' --> ' : ', ': ;' --> ' := '"
   (interactive "p")
   (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal)))
-      (cond ((= (preceding-char) last-input-char)
+      (cond ((= (preceding-char) last-input-event)
             (progn (delete-char -1)
                    (unless (eq (preceding-char) ? ) (insert " "))
                    (insert ": ")
@@ -8180,7 +8180,7 @@
 (defun vhdl-electric-comma (count) "',,' --> ' <= '"
   (interactive "p")
   (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal)))
-      (cond ((= (preceding-char) last-input-char)
+      (cond ((= (preceding-char) last-input-event)
             (progn (delete-char -1)
                    (unless (eq (preceding-char) ? ) (insert " "))
                    (insert "<= ")))
@@ -8190,7 +8190,7 @@
 (defun vhdl-electric-period (count) "'..' --> ' => '"
   (interactive "p")
   (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal)))
-      (cond ((= (preceding-char) last-input-char)
+      (cond ((= (preceding-char) last-input-event)
             (progn (delete-char -1)
                    (unless (eq (preceding-char) ? ) (insert " "))
                    (insert "=> ")))
@@ -8200,7 +8200,7 @@
 (defun vhdl-electric-equal (count) "'==' --> ' == '"
   (interactive "p")
   (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal)))
-      (cond ((= (preceding-char) last-input-char)
+      (cond ((= (preceding-char) last-input-event)
             (progn (delete-char -1)
                    (unless (eq (preceding-char) ? ) (insert " "))
                    (insert "== ")))