procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace last-command-char with last-command-event.

Browse source
This commit is contained in:
Glenn Morris 2009-01-09 04:23:38 +00:00
parent e93c003eb1
commit 1ba983e8d9
27 changed files with 102 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lisp/progmodes/cc-cmds.el
View file

@ -476,7 +476,7 @@ inside a literal or a macro, nothing special happens."
(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 @@ settings of `c-cleanup-list' are done."
;; `}': 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 @@ settings of `c-cleanup-list' are done."
;; `}': 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 @@ settings of `c-cleanup-list' are done."
))))
;; 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 @@ is inhibited."
(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 @@ is inhibited."
(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 @@ settings of `c-cleanup-list'."
(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 @@ numeric argument is supplied, or the point is inside a literal."
<-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 @@ newline cleanups are done if appropriate; see the variable `c-cleanup-list'."
;; 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 @@ newline cleanups are done if appropriate; see the variable `c-cleanup-list'."
;; 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 @@ newline cleanups are done if appropriate; see the variable `c-cleanup-list'."
;; 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 @@ newline cleanups are done if appropriate; see the variable `c-cleanup-list'."
;; 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 @@ keyword on the line, the keyword is not inserted inside a literal, and
(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))