summaryrefslogtreecommitdiff
path: root/lisp/progmodes/cc-styles.el
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2000-07-24 11:10:15 +0000
committerGerd Moellmann <gerd@gnu.org>2000-07-24 11:10:15 +0000
commit6cfd56b338d5f0489a980f5cc6c4e0d2eee75ac2 (patch)
treef5ac718bcfb7b577db458fab8eb58dfe6961a500 /lisp/progmodes/cc-styles.el
parente96f5cb7478070e9c91b503d6d3e881ec2ce7dd7 (diff)
downloademacs-6cfd56b338d5f0489a980f5cc6c4e0d2eee75ac2.tar.gz
(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.
Diffstat (limited to 'lisp/progmodes/cc-styles.el')
-rw-r--r--lisp/progmodes/cc-styles.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index 7cfb1d1e99f..3707d091d55 100644
--- 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 . +)