From 9ce49c8d7741df95faec6bf7c1ecb4d411d79dc1 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 21 Jul 1993 08:44:36 +0000 Subject: [PATCH] (indent-c-exp): If ENDPOS, always set OPOINT to the function start. And don'tindet a line which is past ENDPOS. Don't indent a comment on the first line if it's the only thing on that line. --- lisp/progmodes/c-mode.el | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/c-mode.el b/lisp/progmodes/c-mode.el index b52f9fa68de..667f1d174e9 100644 --- a/lisp/progmodes/c-mode.el +++ b/lisp/progmodes/c-mode.el @@ -969,13 +969,15 @@ ENDPOS is encountered." (save-excursion (forward-char 1) (beginning-of-defun) (setq funbeg (point))) + (setq opoint funbeg) ;; Try to find containing open, ;; but don't scan past that fcn-start. (save-restriction (narrow-to-region funbeg (point)) (condition-case nil (save-excursion - (backward-up-list 1) (point)) + (backward-up-list 1) + (point)) ;; We gave up: must be between fcns. ;; Set opoint to beg of prev fcn ;; since otherwise calculate-c-indent @@ -998,6 +1000,12 @@ ENDPOS is encountered." (and (re-search-forward comment-start-skip (save-excursion (end-of-line) (point)) t) + ;; Make sure this isn't a comment alone on a line + ;; (which should be indented like code instead). + (save-excursion + (goto-char (match-beginning 0)) + (skip-chars-backward " \t") + (not (bolp))) ;; Make sure the comment starter we found ;; is not actually in a string or quoted. (let ((new-state @@ -1060,7 +1068,12 @@ ENDPOS is encountered." (point))))) (forward-line 1) (skip-chars-forward " \t") - (if (eolp) + ;; Don't really reindent if the line is just whitespace, + ;; or if it is past the endpos. + ;; (The exit test in the outer while + ;; does not exit until we have passed the first line + ;; past the region.) + (if (or (eolp) (and endpos (>= (point) endpos))) nil (if (and (car indent-stack) (>= (car indent-stack) 0)) -- 2.39.5