diff options
| author | Karl Heuer | 1995-03-24 02:50:54 +0000 |
|---|---|---|
| committer | Karl Heuer | 1995-03-24 02:50:54 +0000 |
| commit | 02da8c820970cc43f999cb27a6d9f5c1640c4ff7 (patch) | |
| tree | 32cbef2d54c3572a7347bacbb23eeeae873b4d7b | |
| parent | 12b4943a3745c6abdaf44f8a0a12529f4d6fd02b (diff) | |
| download | emacs-02da8c820970cc43f999cb27a6d9f5c1640c4ff7.tar.gz emacs-02da8c820970cc43f999cb27a6d9f5c1640c4ff7.zip | |
(c-style-alist): Set c-continued-brace-offset and
c-brace-offset in all styles, so that they don't inherit a trash
value from a previously set style.
| -rw-r--r-- | lisp/progmodes/c-mode.el | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lisp/progmodes/c-mode.el b/lisp/progmodes/c-mode.el index 266cd330ca3..1958ac58941 100644 --- a/lisp/progmodes/c-mode.el +++ b/lisp/progmodes/c-mode.el | |||
| @@ -128,31 +128,36 @@ This is in addition to `c-continued-statement-offset'.") | |||
| 128 | (c-indent-level . 2) | 128 | (c-indent-level . 2) |
| 129 | (c-argdecl-indent . 5) | 129 | (c-argdecl-indent . 5) |
| 130 | (c-brace-offset . 0) | 130 | (c-brace-offset . 0) |
| 131 | (c-continued-brace-offset . 0) | ||
| 131 | (c-label-offset . -2) | 132 | (c-label-offset . -2) |
| 132 | (c-continued-statement-offset . 2)) | 133 | (c-continued-statement-offset . 2)) |
| 133 | ("K&R" | 134 | ("K&R" |
| 134 | (c-indent-level . 5) | 135 | (c-indent-level . 5) |
| 135 | (c-argdecl-indent . 0) | 136 | (c-argdecl-indent . 0) |
| 136 | (c-brace-offset . -5) | 137 | (c-brace-offset . 0) |
| 138 | (c-continued-brace-offset . -5) | ||
| 137 | (c-label-offset . -5) | 139 | (c-label-offset . -5) |
| 138 | (c-continued-statement-offset . 5)) | 140 | (c-continued-statement-offset . 5)) |
| 139 | ("BSD" | 141 | ("BSD" |
| 140 | (c-indent-level . 4) | 142 | (c-indent-level . 4) |
| 141 | (c-argdecl-indent . 4) | 143 | (c-argdecl-indent . 4) |
| 144 | (c-brace-offset . 0) | ||
| 142 | (c-continued-brace-offset . -4) | 145 | (c-continued-brace-offset . -4) |
| 143 | (c-label-offset . -4) | 146 | (c-label-offset . -4) |
| 144 | (c-continued-statement-offset . 4)) | 147 | (c-continued-statement-offset . 4)) |
| 145 | ("C++" | 148 | ("C++" |
| 146 | (c-indent-level . 4) | 149 | (c-indent-level . 4) |
| 147 | (c-continued-statement-offset . 4) | 150 | (c-argdecl-indent . 0) |
| 148 | (c-brace-offset . -4) | 151 | (c-brace-offset . 0) |
| 149 | (c-argdecl-indent . 0) | 152 | (c-continued-brace-offset . -4) |
| 150 | (c-label-offset . -4) | 153 | (c-label-offset . -4) |
| 151 | (c-auto-newline . t)) | 154 | (c-continued-statement-offset . 4) |
| 155 | (c-auto-newline . t)) | ||
| 152 | ("Whitesmith" | 156 | ("Whitesmith" |
| 153 | (c-indent-level . 4) | 157 | (c-indent-level . 4) |
| 154 | (c-argdecl-indent . 4) | 158 | (c-argdecl-indent . 4) |
| 155 | (c-brace-offset . 0) | 159 | (c-brace-offset . 0) |
| 160 | (c-continued-brace-offset . 0) | ||
| 156 | (c-label-offset . -4) | 161 | (c-label-offset . -4) |
| 157 | (c-continued-statement-offset . 4)))) | 162 | (c-continued-statement-offset . 4)))) |
| 158 | 163 | ||