# HG changeset patch
# User Martin Stjernholm <mast@lysator.liu.se>
# Date 1064411707 0
# Node ID cf28ad83bf76d629c0d5979fddce8e663fd3beb5
# Parent  ce7149334608cee74cc593a617de5cc51a78e426
(c-electric-brace): Fixed a bug in the expand-abbrev' workaround
which caused braces to disbehave inside macros.

diff -r ce7149334608 -r cf28ad83bf76 lisp/progmodes/cc-cmds.el
--- a/lisp/progmodes/cc-cmds.el	Wed Sep 24 11:57:40 2003 +0000
+++ b/lisp/progmodes/cc-cmds.el	Wed Sep 24 13:55:07 2003 +0000
@@ -509,7 +509,9 @@
 	  ;; 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 @@
 
 		   ;; 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.