comparison lisp/progmodes/cc-cmds.el @ 76811:72a276765477

(c-forward-to-nth-EOF-}): Fix EOB bug.

76810:af7f21e5508f

    (setq n (1- n)))
   ((eq where 'in-header)
    (c-syntactic-re-search-forward "{")
    (backward-char)
    (setq n (1- n)))
   (;; (or (eq where 'at-header) (eq where 'outwith-function)
;; 	(eq where 'at-function-end) (eq where 'in-trailer))
    (memq where '(at-header outwith-function at-function-end in-trailer))
    (c-syntactic-skip-backward "^}")
    (when (eq (char-before) ?\})
      (backward-sexp)
      (setq n (1- n))))
   (t (error "Unknown `where' %s in c-backward-to-nth-EOF-{" where)))

    (setq where (c-where-wrt-brace-construct))

    (if (< arg 0)
	;; Move forward to the closing brace of a function.
	(progn
	  (if ;; (or (eq where 'at-function-end) (eq where 'outwith-function))
	      (memq where '(at-function-end outwith-function))
	      (setq arg (1+ arg)))
	  (if (< arg 0)
	      (setq arg (c-forward-to-nth-EOF-} (- arg) where)))
	  ;; Move forward to the next opening brace....
	  (when (and (= arg 0)

    (forward-sexp)
    (setq n (1- n)))
   ((eq where 'in-trailer)
    (c-syntactic-skip-backward "^}")
    (setq n (1- n)))
   (;; (or (eq where 'at-function-end) (eq where 'outwith-function)
;; 	(eq where 'at-header) (eq where 'in-header))
    (memq where '(at-function-end outwith-function at-header in-header))
    (c-syntactic-re-search-forward "{")
    (backward-char)
    (forward-sexp)
    (setq n (1- n)))
   (t (error "c-forward-to-nth-EOF-}: `where' is %s" where)))

  ;; Each time round the loop, go forward to a "}" at the outermost level.
  (while (and (> n 0) (not (eobp)))
					;(c-parse-state)	; This call speeds up the following one by a factor

    (setq where (c-where-wrt-brace-construct))

    (if (< arg 0)
	;; Move backwards to the } of a function
	(progn
	  (if ;; (or (eq where 'at-header) (eq where 'outwith-function))
	      (memq where '(at-header outwith-function))
	      (setq arg (1+ arg)))
	  (if (< arg 0)
	      (setq arg (c-backward-to-nth-BOF-{ (- arg) where)))
	  (when (and (= arg 0)
		     (c-syntactic-skip-backward "^}")

76811:72a276765477

    (setq n (1- n)))
   ((eq where 'in-header)
    (c-syntactic-re-search-forward "{")
    (backward-char)
    (setq n (1- n)))
   ((memq where '(at-header outwith-function at-function-end in-trailer))
    (c-syntactic-skip-backward "^}")
    (when (eq (char-before) ?\})
      (backward-sexp)
      (setq n (1- n))))
   (t (error "Unknown `where' %s in c-backward-to-nth-EOF-{" where)))

    (setq where (c-where-wrt-brace-construct))

    (if (< arg 0)
	;; Move forward to the closing brace of a function.
	(progn
	  (if (memq where '(at-function-end outwith-function))
	      (setq arg (1+ arg)))
	  (if (< arg 0)
	      (setq arg (c-forward-to-nth-EOF-} (- arg) where)))
	  ;; Move forward to the next opening brace....
	  (when (and (= arg 0)

    (forward-sexp)
    (setq n (1- n)))
   ((eq where 'in-trailer)
    (c-syntactic-skip-backward "^}")
    (setq n (1- n)))
   ((memq where '(at-function-end outwith-function at-header in-header))
    (when (c-syntactic-re-search-forward "{" nil 'eob)
      (backward-char)
      (forward-sexp)
      (setq n (1- n))))
   (t (error "c-forward-to-nth-EOF-}: `where' is %s" where)))

  ;; Each time round the loop, go forward to a "}" at the outermost level.
  (while (and (> n 0) (not (eobp)))
					;(c-parse-state)	; This call speeds up the following one by a factor

    (setq where (c-where-wrt-brace-construct))

    (if (< arg 0)
	;; Move backwards to the } of a function
	(progn
	  (if (memq where '(at-header outwith-function))
	      (setq arg (1+ arg)))
	  (if (< arg 0)
	      (setq arg (c-backward-to-nth-BOF-{ (- arg) where)))
	  (when (and (= arg 0)
		     (c-syntactic-skip-backward "^}")