aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorAlan Mackenzie2013-03-06 14:24:39 +0000
committerAlan Mackenzie2013-03-06 14:24:39 +0000
commit33d1e2f5bdaca00fa003faab1d3f8b03dec98023 (patch)
tree9bb5b87432aa6c966c025deba9bde0d333411726 /lisp/progmodes
parent1af1a51aada18d88fac7b2ba09231428c6a65d7c (diff)
downloademacs-33d1e2f5bdaca00fa003faab1d3f8b03dec98023.tar.gz
emacs-33d1e2f5bdaca00fa003faab1d3f8b03dec98023.zip
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. doc/misc/cc-mode.texi (Custom Line-Up): State explicitly that point starts at a random position in the line being indented.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/cc-align.el4
1 files changed, 3 insertions, 1 deletions
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."
737 (setq startpos (c-langelem-pos langelem))))) 737 (setq startpos (c-langelem-pos langelem)))))
738 738
739 (setq startpos (c-langelem-pos langelem) 739 (setq startpos (c-langelem-pos langelem)
740 endpos (point)) 740 endpos (c-point 'bol))
741 741
742 ;; Find a syntactically relevant and unnested "=" token on the 742 ;; Find a syntactically relevant and unnested "=" token on the
743 ;; current line. equalp is in that case set to the number of 743 ;; 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,
1039arglist-intro, arglist-cont-nonempty, arglist-close, and all in* 1039arglist-intro, arglist-cont-nonempty, arglist-close, and all in*
1040symbols, e.g. inclass and inextern-lang." 1040symbols, e.g. inclass and inextern-lang."
1041 (save-excursion 1041 (save-excursion
1042 (beginning-of-line)
1042 (if (and (c-go-up-list-backward) 1043 (if (and (c-go-up-list-backward)
1043 (= (point) (c-point 'boi))) 1044 (= (point) (c-point 'boi)))
1044 nil 1045 nil
@@ -1191,6 +1192,7 @@ Works with: arglist-cont, arglist-cont-nonempty."
1191 (let ((orig-pos (point)) 1192 (let ((orig-pos (point))
1192 alignto) 1193 alignto)
1193 (save-excursion 1194 (save-excursion
1195 (beginning-of-line)
1194 (and 1196 (and
1195 c-opt-asm-stmt-key 1197 c-opt-asm-stmt-key
1196 1198