]> git.eshelyaron.com Git - emacs.git/commitdiff
(c-beginning-of-statement-1): When checking for bare semi, don't match
authorRichard M. Stallman <rms@gnu.org>
Sat, 9 Aug 1997 18:28:54 +0000 (18:28 +0000)
committerRichard M. Stallman <rms@gnu.org>
Sat, 9 Aug 1997 18:28:54 +0000 (18:28 +0000)
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

index 2c3b22cd2493034113ba87effeb02dd4a074faa5..462288333ef206af5ccd93833e09dd173e3653e5 100644 (file)
@@ -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)
              (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)))))