comparison lisp/progmodes/c-mode.el @ 4976:a81642d50a8e

(c-indent-region): When looking for a sexp that ends past this line, make sure it really starts on this line.

4975:db0c6ed6f145

    (let ((endmark (copy-marker end))
	  (c-tab-always-indent t))
      (while (and (bolp) (not (eolp)))
	;; Indent one line as with TAB.
	(let ((shift-amt (c-indent-line))
	      nextline sexpend)
	  (save-excursion
	    ;; Find beginning of following line.
	    (save-excursion
	      (forward-line 1) (setq nextline (point)))
	    ;; Find first beginning-of-sexp for sexp extending past this line.

		  (progn
		    (forward-sexp 1)
		    (setq sexpend (point-marker)))
		(error (setq sexpend nil)
		       (goto-char nextline)))
	      (skip-chars-forward " \t\n")))
	  ;; If that sexp ends within the region,
	  ;; indent it all at once, fast.
	  (if (and sexpend (> sexpend nextline) (<= sexpend endmark))
	      (progn
		(indent-c-exp)
		(goto-char sexpend)))
	  ;; Move to following line and try again.
	  (and sexpend (set-marker sexpend nil))

4976:a81642d50a8e

    (let ((endmark (copy-marker end))
	  (c-tab-always-indent t))
      (while (and (bolp) (not (eolp)))
	;; Indent one line as with TAB.
	(let ((shift-amt (c-indent-line))
	      nextline sexpbeg sexpend)
	  (save-excursion
	    ;; Find beginning of following line.
	    (save-excursion
	      (forward-line 1) (setq nextline (point)))
	    ;; Find first beginning-of-sexp for sexp extending past this line.

		  (progn
		    (forward-sexp 1)
		    (setq sexpend (point-marker)))
		(error (setq sexpend nil)
		       (goto-char nextline)))
	      (skip-chars-forward " \t\n"))
	    ;; Make sure the sexp we found really starts on the
	    ;; current line and extends past it.
	    (goto-char sexpend)
	    (backward-sexp 1)
	    (setq sexpbeg (point)))
	  ;; If that sexp ends within the region,
	  ;; indent it all at once, fast.
	  (if (and sexpend (> sexpend nextline) (<= sexpend endmark)
		   (< sexpbeg nextline))
	      (progn
		(indent-c-exp)
		(goto-char sexpend)))
	  ;; Move to following line and try again.
	  (and sexpend (set-marker sexpend nil))