Commit 9796cb5b authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(c-end-of-statement-1): Wrap backward-up-list in a c-safe call so no

error results when buffer contains only a comment and point is at eob.

(c-inside-bracelist-p): Add a test to the enum list test so that enum
in a k&r arg decl doesn't confuse handling of the function body.
parent b2eeba64
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;; 1985 Richard M. Stallman ;; 1985 Richard M. Stallman
;; Maintainer: cc-mode-help@python.org ;; Maintainer: cc-mode-help@python.org
;; Created: 22-Apr-1997 (split from cc-mode.el) ;; Created: 22-Apr-1997 (split from cc-mode.el)
;; Version: 5.16 ;; Version: 5.17
;; Keywords: c languages oop ;; Keywords: c languages oop
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -188,13 +188,13 @@ ...@@ -188,13 +188,13 @@
(goto-char end)) (goto-char end))
(re-search-backward "[;{}]") (re-search-backward "[;{}]")
(forward-char 1)) (forward-char 1))
(error (error
(let ((beg (point))) (let ((beg (point)))
(backward-up-list -1) (c-safe (backward-up-list -1))
(let ((end (point))) (let ((end (point)))
(goto-char beg) (goto-char beg)
(search-forward ";" end 'move)))))) (search-forward ";" end 'move)))
)))
(defun c-crosses-statement-barrier-p (from to) (defun c-crosses-statement-barrier-p (from to)
...@@ -750,9 +750,11 @@ ...@@ -750,9 +750,11 @@
(save-excursion (save-excursion
(goto-char containing-sexp) (goto-char containing-sexp)
(forward-sexp -1) (forward-sexp -1)
(if (or (looking-at "enum[\t\n ]+") (if (and (or (looking-at "enum[\t\n ]+")
(progn (forward-sexp -1) (progn (forward-sexp -1)
(looking-at "enum[\t\n ]+"))) (looking-at "enum[\t\n ]+")))
(progn (c-end-of-statement-1)
(> (point) containing-sexp)))
(point))) (point)))
(error nil)) (error nil))
;; this will pick up array/aggregate init lists, even if they are nested. ;; this will pick up array/aggregate init lists, even if they are nested.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment