From d0c50a29ad600e8a0c3cd042438f86b13fd678a6 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 9 Aug 1997 18:28:54 +0000 Subject: [PATCH] (c-beginning-of-statement-1): When checking for bare semi, don't match on a semi following a close brace. (c-guess-basic-syntax): CASE 5I: When adding 'inclass syntax, use the relpos pointing to the class opening brace, unless that hangs on the right side, in which case, use the start of the class/struct keyword. --- lisp/progmodes/cc-engine.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 2c3b22cd249..462288333ef 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -7,7 +7,7 @@ ;; 1985 Richard M. Stallman ;; Maintainer: cc-mode-help@python.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: 5.13 +;; Version: 5.14 ;; Keywords: c languages oop ;; This file is part of GNU Emacs. @@ -57,7 +57,7 @@ (setq saved (point)) t)) (progn (c-backward-syntactic-ws lim) - (memq (char-before) '(?\; ?{ ?} ?:))) + (memq (char-before) '(?\; ?{ ?:))) ) (setq last-begin saved) (goto-char last-begin) @@ -1249,6 +1249,8 @@ (if inclass-p (progn (goto-char (aref inclass-p 1)) + (or (= (point) (c-point 'boi)) + (goto-char (aref inclass-p 0))) (if inextern-p (c-add-syntax 'inextern-lang) (c-add-syntax 'inclass (c-point 'boi))))) -- 2.39.2