(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 f786153b383c66bc9fb843fcf3f5a4ae9f3c8a7d..d0056183d515e4c0377cab09256b0104b12a3059 100644 (file)
--- 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.