(c-style-alist): The basic offset for the BSD

style corrected to 8.

(c-style-alist): Adjusted the indentation of
brace list openers in the gnu style.

(c-make-styles-buffer-local): Flag style
variable localness in c-style-variables-are-local-p to make
the compatibility measure in c-common-init work well.

(c-set-style-1): c-special-indent-hook can no
longer contain set-from-style.
(c-initialize-builtin-style): Don't check for
set-from-style on c-special-indent-hook.
(c-copy-tree): Obsolete.  The standard function
copy-alist is sufficient now.

(c-set-style, c-set-style-1,
c-get-style-variables): Fixes to variable initialization so
that duplicate entries in styles have the same effect
regardless of DONT-OVERRIDE.

(c-set-style-2): Fixed bug where the
initialization of inheriting styles failed when the
dont-override flag is set.

diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index 7cfb1d1e99f6734a869dcf2a2a95d46638a08db8..3707d091d55704b93b445400d7f4eac2a984aca5 100644 (file)
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -1,8 +1,9 @@
 ;;; cc-styles.el --- support for styles in CC Mode
 
-;; Copyright (C) 1985,1987,1992-1999 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2000 Free Software Foundation, Inc.
 
-;; Authors:    1998-1999 Barry A. Warsaw and Martin Stjernholm
+;; Authors:    2000- Martin Stjernholm
+;;            1998-1999 Barry A. Warsaw and Martin Stjernholm
 ;;             1992-1997 Barry A. Warsaw
 ;;             1987 Dave Detlefs and Stewart Clamen
 ;;             1985 Richard M. Stallman
@@ -54,6 +55,7 @@
                         (arglist-intro . c-lineup-arglist-intro-after-paren)
                         (arglist-close . c-lineup-arglist)
                         (inline-open . 0)
+                        (brace-list-open . +)
                         ))
      (c-special-indent-hook . c-gnu-impose-minimum)
      (c-block-comment-prefix . "")
@@ -69,7 +71,7 @@
                         ))
      )
     ("bsd"
-     (c-basic-offset . 4)
+     (c-basic-offset . 8)
      (c-comment-only-line-offset . 0)
      (c-offsets-alist . ((statement-block-intro . +)
                         (knr-argdecl-intro . +)