comparison lisp/progmodes/cc-cmds.el @ 90234:b1c1fc853d2f

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-86 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 562-568) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 125-128) - Merge from emacs--cvs-trunk--0 - Update from CVS
author Miles Bader <miles@gnu.org>
date Fri, 30 Sep 2005 11:43:45 +0000
parents edf295560b5a c2508361021b
children 7beb78bc1f8e
comparison
equal deleted inserted replaced
90233:ee12d75eb214 90234:b1c1fc853d2f
905 ;; do some special stuff with the character 905 ;; do some special stuff with the character
906 (let* (;; We want to inhibit blinking the paren since this will 906 (let* (;; We want to inhibit blinking the paren since this will
907 ;; be most disruptive. We'll blink it ourselves 907 ;; be most disruptive. We'll blink it ourselves
908 ;; afterwards. 908 ;; afterwards.
909 (old-blink-paren blink-paren-function) 909 (old-blink-paren blink-paren-function)
910 blink-paren-function) 910 blink-paren-function
911 (noblink (eq last-input-event ?\()))
911 (self-insert-command (prefix-numeric-value arg)) 912 (self-insert-command (prefix-numeric-value arg))
912 (if c-syntactic-indentation 913 (if c-syntactic-indentation
913 (indent-according-to-mode)) 914 (indent-according-to-mode))
914 (when (looking-at "[ \t]*\\\\?$") 915 (when (looking-at "[ \t]*\\\\?$")
915 (when c-auto-newline 916 (when c-auto-newline
980 (setq beg (point)) 981 (setq beg (point))
981 (c-on-identifier)))) 982 (c-on-identifier))))
982 (delete-region beg end)))) 983 (delete-region beg end))))
983 (and (not executing-kbd-macro) 984 (and (not executing-kbd-macro)
984 old-blink-paren 985 old-blink-paren
986 (not noblink)
985 (funcall old-blink-paren)))))) 987 (funcall old-blink-paren))))))
986 988
987 (defun c-electric-continued-statement () 989 (defun c-electric-continued-statement ()
988 "Reindent the current line if appropriate. 990 "Reindent the current line if appropriate.
989 991