# HG changeset patch # User Glenn Morris # Date 1231474552 0 # Node ID 3b3c7e10cd9715072385db792a62426b72b34fbd # Parent 14b421290b2f31ff53af2f35683880656807e5b0 Replace last-command-char with last-command-event. diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/ChangeLog --- a/lisp/ChangeLog Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/ChangeLog Fri Jan 09 04:15:52 2009 +0000 @@ -7,6 +7,13 @@ * calc/calc-keypd.el, calc/calc-misc.el, calc/calc-prog.el: * calc/calc-sel.el, calc/calc-store.el, calc/calc-stuff.el: * calc/calc-units.el, calc/calc-yank.el, calc/calc.el: + * progmodes/ada-mode.el, progmodes/antlr-mode.el, progmodes/cc-align.el: + * progmodes/cc-cmds.el, progmodes/cperl-mode.el, progmodes/f90.el: + * progmodes/fortran.el, progmodes/icon.el, progmodes/idlwave.el: + * progmodes/octave-mod.el, progmodes/pascal.el, progmodes/perl-mode.el: + * progmodes/prolog.el, progmodes/sh-script.el, progmodes/simula.el: + * progmodes/tcl.el, progmodes/vera-mode.el, progmodes/verilog-mode.el: + * progmodes/vhdl-mode.el, progmodes/xscheme.el: Replace last-command-char with last-command-event. 2009-01-09 Dave Love diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/ada-mode.el --- a/lisp/progmodes/ada-mode.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/ada-mode.el Fri Jan 09 04:15:52 2009 +0000 @@ -1628,7 +1628,7 @@ (interactive "P") (if ada-auto-case - (let ((lastk last-command-char) + (let ((lastk last-command-event) (previous-syntax-table (syntax-table))) (unwind-protect @@ -1662,9 +1662,9 @@ ;; Else, no auto-casing (cond - ((eq last-command-char ?\n) + ((eq last-command-event ?\n) (funcall ada-lfd-binding)) - ((eq last-command-char ?\r) + ((eq last-command-event ?\r) (funcall ada-ret-binding)) (t (self-insert-command (prefix-numeric-value arg)))) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/antlr-mode.el --- a/lisp/progmodes/antlr-mode.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/antlr-mode.el Fri Jan 09 04:15:52 2009 +0000 @@ -2512,7 +2512,7 @@ (let ((context (antlr-syntactic-context))) (not (and (numberp context) (or (zerop context) - (memq last-command-char '(?\{ ?\})))))))) + (memq last-command-event '(?\{ ?\})))))))) (self-insert-command (prefix-numeric-value arg)) (self-insert-command (prefix-numeric-value arg)) (antlr-indent-line))) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/cc-align.el --- a/lisp/progmodes/cc-align.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/cc-align.el Fri Jan 09 04:15:52 2009 +0000 @@ -1245,7 +1245,7 @@ exactly the old newline insertion behavior." ;; newline only after semicolon, but only if that semicolon is not ;; inside a parenthesis list (e.g. a for loop statement) - (if (not (eq last-command-char ?\;)) + (if (not (eq last-command-event ?\;)) nil ; continue checking (if (condition-case nil (save-excursion @@ -1262,7 +1262,7 @@ inserted, and the following line is not blank, no newline is inserted. Otherwise, no determination is made." (save-excursion - (if (and (= last-command-char ?\;) + (if (and (= last-command-event ?\;) ;;(/= (point-max) ;; (save-excursion (skip-syntax-forward " ") (point)) (zerop (forward-line 1)) @@ -1282,7 +1282,7 @@ (if (c-safe (up-list -1) t) (c-point 'bol) -1)))) - (if (and (eq last-command-char ?\;) + (if (and (eq last-command-event ?\;) (eq (car (car syntax)) 'inclass) (eq (car (car (cdr syntax))) 'topmost-intro) (= (c-point 'bol) bol)) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/cc-cmds.el --- a/lisp/progmodes/cc-cmds.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/cc-cmds.el Fri Jan 09 04:15:52 2009 +0000 @@ -476,7 +476,7 @@ (bolp (bolp))) (beginning-of-line) (delete-horizontal-space) - (insert last-command-char) + (insert last-command-event) (and (not bolp) (goto-char (- (point-max) pos))) ))) @@ -735,7 +735,7 @@ ;; `}': clean up empty defun braces (when (c-save-buffer-state () (and (memq 'empty-defun-braces c-cleanup-list) - (eq last-command-char ?\}) + (eq last-command-event ?\}) (c-intersect-lists '(defun-close class-close inline-close) syntax) (progn @@ -751,14 +751,14 @@ ;; `}': compact to a one-liner defun? (save-match-data (when - (and (eq last-command-char ?\}) + (and (eq last-command-event ?\}) (memq 'one-liner-defun c-cleanup-list) (c-intersect-lists '(defun-close) syntax) (c-try-one-liner)) (setq here (- (point-max) pos)))) ;; `{': clean up brace-else-brace and brace-elseif-brace - (when (eq last-command-char ?\{) + (when (eq last-command-event ?\{) (cond ((and (memq 'brace-else-brace c-cleanup-list) (re-search-backward @@ -812,7 +812,7 @@ )))) ;; blink the paren - (and (eq last-command-char ?\}) + (and (eq last-command-event ?\}) (not executing-kbd-macro) old-blink-paren (save-excursion @@ -849,7 +849,7 @@ (when (and (not arg) (eq literal 'c) (memq 'comment-close-slash c-cleanup-list) - (eq last-command-char ?/) + (eq last-command-event ?/) (looking-at (concat "[ \t]*\\(" (regexp-quote comment-end) "\\)?$")) ; (eq c-block-comment-ender "*/") ; C-style comments ALWAYS end in */ @@ -865,7 +865,7 @@ (setq indentp (and (not arg) c-syntactic-indentation c-electric-flag - (eq last-command-char ?/) + (eq last-command-event ?/) (eq (char-before) (if literal ?* ?/)))) (self-insert-command (prefix-numeric-value arg)) (if indentp @@ -939,10 +939,10 @@ (let ((pos (- (point-max) (point)))) (if (c-save-buffer-state () (and (or (and - (eq last-command-char ?,) + (eq last-command-event ?,) (memq 'list-close-comma c-cleanup-list)) (and - (eq last-command-char ?\;) + (eq last-command-event ?\;) (memq 'defun-close-semi c-cleanup-list))) (progn (forward-char -1) @@ -1097,7 +1097,7 @@ <-pos) (when c-recognize-<>-arglists - (if (eq last-command-char ?<) + (if (eq last-command-event ?<) (when (and (progn (backward-char) (= (point) @@ -1220,7 +1220,7 @@ ;; clean up brace-elseif-brace (when (and (memq 'brace-elseif-brace c-cleanup-list) - (eq last-command-char ?\() + (eq last-command-event ?\() (re-search-backward (concat "}" "\\([ \t\n]\\|\\\\\n\\)*" @@ -1238,7 +1238,7 @@ ;; clean up brace-catch-brace (when (and (memq 'brace-catch-brace c-cleanup-list) - (eq last-command-char ?\() + (eq last-command-event ?\() (re-search-backward (concat "}" "\\([ \t\n]\\|\\\\\n\\)*" @@ -1259,7 +1259,7 @@ ;; space-before-funcall clean-up? ((and (memq 'space-before-funcall c-cleanup-list) - (eq last-command-char ?\() + (eq last-command-event ?\() (save-excursion (backward-char) (skip-chars-backward " \t") @@ -1277,7 +1277,7 @@ ;; compact-empty-funcall clean-up? ((c-save-buffer-state () (and (memq 'compact-empty-funcall c-cleanup-list) - (eq last-command-char ?\)) + (eq last-command-event ?\)) (save-excursion (c-safe (backward-char 2)) (when (looking-at "()") @@ -1306,7 +1306,7 @@ (when (c-save-buffer-state () (and c-electric-flag c-syntactic-indentation - (not (eq last-command-char ?_)) + (not (eq last-command-event ?_)) (= (save-excursion (skip-syntax-backward "w") (point)) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/cperl-mode.el --- a/lisp/progmodes/cperl-mode.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/cperl-mode.el Fri Jan 09 04:15:52 2009 +0000 @@ -2037,11 +2037,11 @@ (save-excursion (setq insertpos (point-marker)) (goto-char other-end) - (setq last-command-char ?\{) + (setq last-command-event ?\{) (cperl-electric-lbrace arg insertpos)) (forward-char 1)) ;; Check whether we close something "usual" with `}' - (if (and (eq last-command-char ?\}) + (if (and (eq last-command-event ?\}) (not (condition-case nil (save-excursion @@ -2059,7 +2059,7 @@ (save-excursion (skip-chars-backward " \t") (bolp))) - (and (eq last-command-char ?\{) ; Do not insert newline + (and (eq last-command-event ?\{) ; Do not insert newline ;; if after ")" and `cperl-extra-newline-before-brace' ;; is nil, do not insert extra newline. (not cperl-extra-newline-before-brace) @@ -2080,7 +2080,7 @@ (save-excursion (if insertpos (progn (goto-char insertpos) (search-forward (make-string - 1 last-command-char)) + 1 last-command-event)) (setq insertpos (1- (point))))) (delete-char -1)))) (if insertpos @@ -2119,12 +2119,12 @@ (setq cperl-auto-newline nil)) (cperl-electric-brace arg) (and (cperl-val 'cperl-electric-parens) - (eq last-command-char ?{) - (memq last-command-char + (eq last-command-event ?{) + (memq last-command-event (append cperl-electric-parens-string nil)) (or (if other-end (goto-char (marker-position other-end))) t) - (setq last-command-char ?} pos (point)) + (setq last-command-event ?} pos (point)) (progn (cperl-electric-brace arg t) (goto-char pos))))) @@ -2141,11 +2141,11 @@ (point-marker)) nil))) (if (and (cperl-val 'cperl-electric-parens) - (memq last-command-char + (memq last-command-event (append cperl-electric-parens-string nil)) (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point)) ;;(not (save-excursion (search-backward "#" beg t))) - (if (eq last-command-char ?<) + (if (eq last-command-event ?<) (progn (and abbrev-mode ; later it is too late, may be after `for' (expand-abbrev)) @@ -2156,7 +2156,7 @@ (if other-end (goto-char (marker-position other-end))) (insert (make-string (prefix-numeric-value arg) - (cdr (assoc last-command-char '((?{ .?}) + (cdr (assoc last-command-event '((?{ .?}) (?[ . ?]) (?( . ?)) (?< . ?>)))))) @@ -2171,7 +2171,7 @@ (let ((beg (save-excursion (beginning-of-line) (point))) (other-end (if (and cperl-electric-parens-mark (cperl-val 'cperl-electric-parens) - (memq last-command-char + (memq last-command-event (append cperl-electric-parens-string nil)) (cperl-mark-active) (< (mark) (point))) @@ -2180,7 +2180,7 @@ p) (if (and other-end (cperl-val 'cperl-electric-parens) - (memq last-command-char '( ?\) ?\] ?\} ?\> )) + (memq last-command-event '( ?\) ?\] ?\} ?\> )) (>= (save-excursion (cperl-to-comment-or-eol) (point)) (point)) ;;(not (save-excursion (search-backward "#" beg t))) ) @@ -2190,7 +2190,7 @@ (if other-end (goto-char other-end)) (insert (make-string (prefix-numeric-value arg) - (cdr (assoc last-command-char '((?\} . ?\{) + (cdr (assoc last-command-event '((?\} . ?\{) (?\] . ?\[) (?\) . ?\() (?\> . ?\<)))))) @@ -2202,9 +2202,9 @@ Help message may be switched off by setting `cperl-message-electric-keyword' to nil." (let ((beg (save-excursion (beginning-of-line) (point))) - (dollar (and (eq last-command-char ?$) + (dollar (and (eq last-command-event ?$) (eq this-command 'self-insert-command))) - (delete (and (memq last-command-char '(?\s ?\n ?\t ?\f)) + (delete (and (memq last-command-event '(?\s ?\n ?\t ?\f)) (memq this-command '(self-insert-command newline)))) my do) (and (save-excursion @@ -2258,7 +2258,7 @@ (forward-char 1) (delete-char 1))) (search-backward ")") - (if (eq last-command-char ?\() + (if (eq last-command-event ?\() (progn ; Avoid "if (())" (delete-backward-char 1) (delete-backward-char -1)))) @@ -2279,7 +2279,7 @@ (defun cperl-electric-pod () "Insert a POD chunk appropriate after a =POD directive." - (let ((delete (and (memq last-command-char '(?\s ?\n ?\t ?\f)) + (let ((delete (and (memq last-command-event '(?\s ?\n ?\t ?\f)) (memq this-command '(self-insert-command newline)))) head1 notlast name p really-delete over) (and (save-excursion @@ -2499,7 +2499,7 @@ (interactive "P") (let ((end (point)) (auto (and cperl-auto-newline - (or (not (eq last-command-char ?:)) + (or (not (eq last-command-event ?:)) cperl-auto-newline-after-colon))) insertpos) (if (and ;;(not arg) @@ -2513,7 +2513,7 @@ ;; Colon is special only after a label ;; So quickly rule out most other uses of colon ;; and do no indentation for them. - (and (eq last-command-char ?:) + (and (eq last-command-event ?:) (save-excursion (forward-word 1) (skip-chars-forward " \t") diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/f90.el --- a/lisp/progmodes/f90.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/f90.el Fri Jan 09 04:15:52 2009 +0000 @@ -2093,7 +2093,7 @@ "Typing `\\[help-command] or `? lists all the F90 abbrevs. Any other key combination is executed normally." (interactive "*") - (insert last-command-char) + (insert last-command-event) (let (char event) (if (fboundp 'next-command-event) ; XEmacs (setq event (next-command-event) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/fortran.el --- a/lisp/progmodes/fortran.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/fortran.el Fri Jan 09 04:15:52 2009 +0000 @@ -1006,7 +1006,7 @@ "Typing ;\\[help-command] or ;? lists all the Fortran abbrevs. Any other key combination is executed normally." (interactive "*") - (insert last-command-char) + (insert last-command-event) (let* ((event (if (fboundp 'next-command-event) ; XEmacs (next-command-event) (read-event))) @@ -1167,7 +1167,7 @@ (looking-at "[0-9]")) ; within a line number (self-insert-command (prefix-numeric-value arg)) (skip-chars-backward " \t") - (insert last-command-char) + (insert last-command-event) (fortran-indent-line)))) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/icon.el --- a/lisp/progmodes/icon.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/icon.el Fri Jan 09 04:15:52 2009 +0000 @@ -225,7 +225,7 @@ (progn (icon-indent-line) (newline) t) nil))) (progn - (insert last-command-char) + (insert last-command-event) (icon-indent-line) (if icon-auto-newline (progn diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/idlwave.el --- a/lisp/progmodes/idlwave.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/idlwave.el Fri Jan 09 04:15:52 2009 +0000 @@ -1,7 +1,7 @@ ;; idlwave.el --- IDL editing mode for GNU Emacs -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -;; Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009 Free Software Foundation, Inc. ;; Authors: J.D. Smith ;; Carsten Dominik @@ -2119,7 +2119,7 @@ "Insert quote and show matching quote if this is end of a string." (interactive) (let ((bq (idlwave-in-quote)) - (inq last-command-char)) + (inq last-command-event)) (if (and bq (not (idlwave-in-comment))) (let ((delim (char-after bq))) (insert inq) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/octave-mod.el --- a/lisp/progmodes/octave-mod.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/octave-mod.el Fri Jan 09 04:15:52 2009 +0000 @@ -1312,7 +1312,7 @@ Maybe expand abbrevs and blink matching block open keywords. Reindent the line of `octave-auto-indent' is non-nil." (interactive) - (setq last-command-char ? ) + (setq last-command-event ? ) (if (and octave-auto-indent (not (octave-not-in-string-or-comment-p))) (progn @@ -1338,7 +1338,7 @@ (if (not abbrev-mode) (self-insert-command 1) (let (c) - (insert last-command-char) + (insert last-command-event) (if (if (featurep 'xemacs) (or (eq (event-to-character (setq c (next-event))) ??) (eq (event-to-character c) help-char)) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/pascal.el --- a/lisp/progmodes/pascal.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/pascal.el Fri Jan 09 04:15:52 2009 +0000 @@ -1,7 +1,8 @@ ;;; pascal.el --- major mode for editing pascal source in Emacs ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -;; 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006, 2007, 2008, 2009 +;; Free Software Foundation, Inc. ;; Author: Espen Skoglund ;; Keywords: languages @@ -429,7 +430,7 @@ (defun electric-pascal-semi-or-dot () "Insert `;' or `.' character and reindent the line." (interactive) - (insert last-command-char) + (insert last-command-event) (save-excursion (beginning-of-line) (pascal-indent-line)) @@ -439,7 +440,7 @@ (defun electric-pascal-colon () "Insert `:' and do all indentions except line indent on this line." (interactive) - (insert last-command-char) + (insert last-command-event) ;; Do nothing if within string. (if (pascal-within-string) () @@ -452,7 +453,7 @@ (defun electric-pascal-equal () "Insert `=', and do indention if within type declaration." (interactive) - (insert last-command-char) + (insert last-command-event) (if (eq (car (pascal-calculate-indent)) 'declaration) (let ((pascal-tab-always-indent nil)) (pascal-indent-command)))) @@ -460,7 +461,7 @@ (defun electric-pascal-hash () "Insert `#', and indent to column 0 if this is a CPP directive." (interactive) - (insert last-command-char) + (insert last-command-event) (if (save-excursion (beginning-of-line) (looking-at "^[ \t]*#")) (save-excursion (beginning-of-line) (delete-horizontal-space)))) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/perl-mode.el --- a/lisp/progmodes/perl-mode.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/perl-mode.el Fri Jan 09 04:15:52 2009 +0000 @@ -1,7 +1,7 @@ ;;; perl-mode.el --- Perl code editing commands for GNU Emacs -;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -;; Free Software Foundation, Inc. +;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009 Free Software Foundation, Inc. ;; Author: William F. Mann ;; Maintainer: FSF @@ -606,14 +606,14 @@ (and (not ; eliminate comments quickly (and comment-start-skip (re-search-forward comment-start-skip insertpos t)) ) - (or (/= last-command-char ?:) + (or (/= last-command-event ?:) ;; Colon is special only after a label .... (looking-at "\\s-*\\(\\w\\|\\s_\\)+$")) (let ((pps (parse-partial-sexp (perl-beginning-of-function) insertpos))) (not (or (nth 3 pps) (nth 4 pps) (nth 5 pps)))))) (progn ; must insert, indent, delete - (insert-char last-command-char 1) + (insert-char last-command-event 1) (perl-indent-line) (delete-char -1)))) (self-insert-command (prefix-numeric-value arg))) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/prolog.el --- a/lisp/progmodes/prolog.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/prolog.el Fri Jan 09 04:15:52 2009 +0000 @@ -1,7 +1,7 @@ ;;; prolog.el --- major mode for editing and running Prolog under Emacs -;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -;; Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Keywords: languages @@ -357,7 +357,7 @@ (save-excursion (goto-char (- pmark 3)) (looking-at " \\? "))) - (comint-send-string proc (string last-command-char)) + (comint-send-string proc (string last-command-event)) (call-interactively 'self-insert-command)))) (defun prolog-consult-region (compile beg end) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/sh-script.el --- a/lisp/progmodes/sh-script.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/sh-script.el Fri Jan 09 04:15:52 2009 +0000 @@ -3747,7 +3747,7 @@ (interactive "*P") (self-insert-command (prefix-numeric-value arg)) (or arg - (not (eq (char-after (- (point) 2)) last-command-char)) + (not (eq (char-after (- (point) 2)) last-command-event)) (save-excursion (backward-char 2) (sh-quoted-p)) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/simula.el --- a/lisp/progmodes/simula.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/simula.el Fri Jan 09 04:15:52 2009 +0000 @@ -1197,7 +1197,7 @@ ;; to have the line inserted after the begin-end match. (if show-char (progn - (insert-char last-command-char 1) + (insert-char last-command-event 1) (sit-for 0) (backward-char 1))) (if (let ((where (simula-context)) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/tcl.el --- a/lisp/progmodes/tcl.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/tcl.el Fri Jan 09 04:15:52 2009 +0000 @@ -634,7 +634,7 @@ ;; Indent line first; this looks better if parens blink. (tcl-indent-line) (self-insert-command arg) - (if (and tcl-auto-newline (= last-command-char ?\;)) + (if (and tcl-auto-newline (= last-command-event ?\;)) (progn (newline) (tcl-indent-line)))) @@ -658,7 +658,7 @@ ;; In auto-newline case, must insert a newline after each ;; brace. So an explicit loop is needed. (while (> arg 0) - (insert last-command-char) + (insert last-command-event) (tcl-indent-line) (newline) (setq arg (1- arg)))) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/vera-mode.el --- a/lisp/progmodes/vera-mode.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/vera-mode.el Fri Jan 09 04:15:52 2009 +0000 @@ -1340,7 +1340,7 @@ (interactive "*P") (let* ((ch (char-before)) (indentp (and (not arg) - (eq last-command-char ?/) + (eq last-command-event ?/) (or (and (eq ch ?/) (not (vera-in-literal))) (and (eq ch ?*) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/verilog-mode.el --- a/lisp/progmodes/verilog-mode.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/verilog-mode.el Fri Jan 09 04:15:52 2009 +0000 @@ -2661,7 +2661,7 @@ (defun electric-verilog-semi () "Insert `;' character and reindent the line." (interactive) - (insert last-command-char) + (insert last-command-event) (if (or (verilog-in-comment-or-string-p) (verilog-in-escaped-name-p)) @@ -2686,7 +2686,7 @@ (defun electric-verilog-colon () "Insert `:' and do all indentations except line indent on this line." (interactive) - (insert last-command-char) + (insert last-command-event) ;; Do nothing if within string. (if (or (verilog-within-string) @@ -2705,7 +2705,7 @@ ;;(defun electric-verilog-equal () ;; "Insert `=', and do indentation if within block." ;; (interactive) -;; (insert last-command-char) +;; (insert last-command-event) ;; Could auto line up expressions, but not yet ;; (if (eq (car (verilog-calculate-indent)) 'block) ;; (let ((verilog-tab-always-indent nil)) @@ -2715,7 +2715,7 @@ (defun electric-verilog-tick () "Insert back-tick, and indent to column 0 if this is a CPP directive." (interactive) - (insert last-command-char) + (insert last-command-event) (save-excursion (if (progn (beginning-of-line) diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/vhdl-mode.el --- a/lisp/progmodes/vhdl-mode.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/vhdl-mode.el Fri Jan 09 04:15:52 2009 +0000 @@ -10612,7 +10612,7 @@ (backward-word 1) (vhdl-case-word 1) (delete-char 1)) - (let ((invoke-char last-command-char) + (let ((invoke-char last-command-event) (abbrev-mode -1) (vhdl-template-invoked-by-hook t)) (let ((caught (catch 'abort diff -r 14b421290b2f -r 3b3c7e10cd97 lisp/progmodes/xscheme.el --- a/lisp/progmodes/xscheme.el Fri Jan 09 03:57:12 2009 +0000 +++ b/lisp/progmodes/xscheme.el Fri Jan 09 04:15:52 2009 +0000 @@ -515,7 +515,7 @@ (defun scheme-debugger-self-insert () "Transmit this character to the Scheme process." (interactive) - (xscheme-send-char last-command-char)) + (xscheme-send-char last-command-event)) (defun xscheme-enter-debugger-mode (prompt-string) (save-excursion