Correct the position of point in some line-up functions.

[gnu-emacs] / lisp / progmodes / cc-align.el

diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index cdd0561a0541b7c7eb7f99e9865d2a4da5d9a03a..33836f25335217c3ecf31077f05329d0d1f6bb56 100644 (file)
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -737,7 +737,7 @@ arglist-cont-nonempty."
              (setq startpos (c-langelem-pos langelem)))))
 
       (setq startpos (c-langelem-pos langelem)
-           endpos (point))
+           endpos (c-point 'bol))
 
       ;; Find a syntactically relevant and unnested "=" token on the
       ;; current line.  equalp is in that case set to the number of
@@ -1039,6 +1039,7 @@ brace-list-close, brace-list-intro, statement-block-intro,
 arglist-intro, arglist-cont-nonempty, arglist-close, and all in*
 symbols, e.g. inclass and inextern-lang."
   (save-excursion
+    (beginning-of-line)
     (if (and (c-go-up-list-backward)
             (= (point) (c-point 'boi)))
        nil
@@ -1191,6 +1192,7 @@ Works with: arglist-cont, arglist-cont-nonempty."
   (let ((orig-pos (point))
        alignto)
     (save-excursion
+      (beginning-of-line)
       (and
        c-opt-asm-stmt-key