2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac56cd8ba79..18242539cca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-06  Alan Mackenzie  <acm@muc.de>
+
+        Correct the position of point in some line-up functions.
+        * progmodes/cc-align.el (c-lineup-whitesmith-in-block)
+        (c-lineup-assignments, c-lineup-gcc-asm-reg ): take position of
+        point at column 0 rather than at a random place in the line.
+
 2013-03-05  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-compat.el (tramp-compat-delete-directory): Implement
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index cdd0561a054..33836f25335 100644
--- 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