Commit 1e4bd40d authored by Glenn Morris's avatar Glenn Morris

Replace last-input-char with last-input-event.

parent cfa29281
......@@ -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 <fx@gnu.org>
* calendar/time-date.el: Require cl for `declare'.
......
......@@ -2199,8 +2199,8 @@ See calc-keypad for details."
(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)))
......
......@@ -103,7 +103,7 @@ but not `C-u X' or `ESC X' since the X is not the prefix key."
(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))
......
......@@ -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)
......
......@@ -2546,7 +2546,7 @@ These keys are ESC, RET, and LineFeed"
(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 @@ These keys are ESC, RET, and LineFeed"
(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)
......
......@@ -288,7 +288,7 @@ wrong, use this command again to toggle back to the right mode."
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)
......
......@@ -287,9 +287,9 @@ the language you choose)."
"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 @@ the language you choose)."
;; 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
......
......@@ -8158,7 +8158,7 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
(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 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
(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 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
(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 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
(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 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
(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 "== ")))
......
;;; 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 @@ make, or the user didn't cancel the call."
;; 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
......
......@@ -1182,15 +1182,15 @@ Entry to this mode runs the hooks on `term-mode-hook'."
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
......
......@@ -396,10 +396,10 @@ set it smaller for more frequent updates (but overall slower performance."
(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 @@ One characters is treated specially:
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 ()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment