From: Martin Stjernholm Date: Wed, 24 Sep 2003 13:55:07 +0000 (+0000) Subject: (c-electric-brace): Fixed a bug in the expand-abbrev' workaround X-Git-Tag: ttn-vms-21-2-B4~8751 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d858963e6b6f92dc3099eff3752fdcb4efcf1ea1;p=emacs.git (c-electric-brace): Fixed a bug in the expand-abbrev' workaround which caused braces to disbehave inside macros. --- diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index f786153b383..d0056183d51 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -509,7 +509,9 @@ This function does various newline cleanups based on the value of ;; this case. So the marker that we put after "else" would ;; end up before it. (setq delete-temp-newline - (cons (copy-marker (c-point 'eopl) t) + (cons (save-excursion + (c-backward-syntactic-ws) + (copy-marker (point) t)) (point-marker)))) (unwind-protect (progn @@ -2671,7 +2673,7 @@ command to conveniently insert and align the necessary backslashes." ;; There's no nonempty prefix on the line after the ;; comment opener. If the line is empty, or if the - ;; text on has less or equal indentation than the + ;; text on it has less or equal indentation than the ;; comment starter we assume it's an unclosed ;; comment starter, i.e. that ;; `c-block-comment-prefix' should be used.