Mercurial > emacs
annotate lisp/progmodes/cc-styles.el @ 83619:5da6a46ddbd6
* s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
* termhooks.h (union display_info): Add mac_display_info.
* term.c (init_tty): Only use terminal->kboard when MULTI_KBOARD
is defined.
* macterm.h (struct mac_display_info): Add terminal.
* w32term.c (w32_initialize): Make static.
* macterm.c (XTset_terminal_modes): Add a terminal parameter.
(XTreset_terminal_modes): Likewise.
(x_clear_frame): Add a frame parameter.
(note_mouse_movement): Get rif from the frame.
(mac_term_init): Initialize the terminal.
(mac_initialize): Make static and move terminal initialization ...
(mac_create_terminal): ... in this new function.
* macmenu.c: Reorder includes.
(Fx_popup_menu): Use terminal specific mouse_position_hook.
* macfns.c (x_set_mouse_color): Get rif from the frame.
(x_set_tool_bar_lines): Don't use updating_frame.
(mac_window): Add 2 new parameters for consistency with other
systems.
(Fx_create_frame): Fix doc string. Rename the parameter.
(Fx_create_frame): Set the frame parameters following what is done
in X11 and w32.
(Fx_open_connection): Remove window-system check.
(start_hourglass): Likewise.
(x_create_tip_frame): Get the keyboard from the terminal.
* w32fns.c (Fx_create_frame): Use kboard from the terminal.
* term/mac-win.el: Provide mac-win.
(mac-initialized): New variable.
(mac-initialize-window-system): New function. Move global setup
here.
(handle-args-function-alist, frame-creation-function-alist):
(window-system-initialization-alist): Add mac entries.
* loadup.el: Load mac-win on a Mac.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sat, 19 May 2007 19:08:02 +0000 |
parents | e3694f1cb928 |
children | c1ec1c8a8d2e 95d0cdf160ea |
rev | line source |
---|---|
18720 | 1 ;;; cc-styles.el --- support for styles in CC Mode |
2 | |
74372 | 3 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, |
75347 | 4 ;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 |
5 ;; Free Software Foundation, Inc. | |
18720 | 6 |
75307 | 7 ;; Authors: 2004- Alan Mackenzie |
8 ;; 1998- Martin Stjernholm | |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
9 ;; 1992-1999 Barry A. Warsaw |
18720 | 10 ;; 1987 Dave Detlefs and Stewart Clamen |
11 ;; 1985 Richard M. Stallman | |
24282 | 12 ;; Maintainer: bug-cc-mode@gnu.org |
18720 | 13 ;; Created: 22-Apr-1997 (split from cc-mode.el) |
20147 | 14 ;; Version: See cc-mode.el |
18720 | 15 ;; Keywords: c languages oop |
16 | |
17 ;; This file is part of GNU Emacs. | |
18 | |
19 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
20 ;; it under the terms of the GNU General Public License as published by | |
21 ;; the Free Software Foundation; either version 2, or (at your option) | |
22 ;; any later version. | |
23 | |
24 ;; GNU Emacs is distributed in the hope that it will be useful, | |
25 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
26 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
27 ;; GNU General Public License for more details. | |
28 | |
29 ;; You should have received a copy of the GNU General Public License | |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
30 ;; along with this program; see the file COPYING. If not, write to |
64085 | 31 ;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
32 ;; Boston, MA 02110-1301, USA. | |
18720 | 33 |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38167
diff
changeset
|
34 ;;; Commentary: |
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38167
diff
changeset
|
35 |
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38167
diff
changeset
|
36 ;;; Code: |
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38167
diff
changeset
|
37 |
26817 | 38 (eval-when-compile |
39 (let ((load-path | |
36920 | 40 (if (and (boundp 'byte-compile-dest-file) |
41 (stringp byte-compile-dest-file)) | |
42 (cons (file-name-directory byte-compile-dest-file) load-path) | |
26817 | 43 load-path))) |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
44 (load "cc-bytecomp" nil t))) |
18720 | 45 |
36920 | 46 (cc-require 'cc-defs) |
47 (cc-require 'cc-vars) | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
48 (cc-require 'cc-align) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
49 ;; cc-align is only indirectly required: Styles added with |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
50 ;; `c-add-style' often contains references to functions defined there. |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
51 |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
52 ;; Silence the compiler. |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
53 (cc-bytecomp-defvar adaptive-fill-first-line-regexp) ; Emacs |
62641
27b53b1903b6
2005-05-23 Martin Stjernholm <bug-cc-mode@gnu.org>
Martin Stjernholm <mast@lysator.liu.se>
parents:
56646
diff
changeset
|
54 (cc-bytecomp-obsolete-fun make-local-hook) ; Marked obsolete in Emacs 21.1. |
24282 | 55 |
18720 | 56 |
51748
f3cad02bce62
(c-style-alist, c-lang-variable-inits, c-lang-variable-inits-tail): The
Martin Stjernholm <mast@lysator.liu.se>
parents:
51714
diff
changeset
|
57 (defvar c-style-alist |
18720 | 58 '(("gnu" |
59 (c-basic-offset . 2) | |
60 (c-comment-only-line-offset . (0 . 0)) | |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
61 (c-hanging-braces-alist . ((substatement-open before after))) |
18720 | 62 (c-offsets-alist . ((statement-block-intro . +) |
63 (knr-argdecl-intro . 5) | |
64 (substatement-open . +) | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
65 (substatement-label . 0) |
18720 | 66 (label . 0) |
67 (statement-case-open . +) | |
68 (statement-cont . +) | |
69 (arglist-intro . c-lineup-arglist-intro-after-paren) | |
70 (arglist-close . c-lineup-arglist) | |
24282 | 71 (inline-open . 0) |
75027
9f636bd65206
Update CC Mode to version 5.31.4. The detailed changes are those
Alan Mackenzie <acm@muc.de>
parents:
74372
diff
changeset
|
72 (brace-list-open . +) |
9f636bd65206
Update CC Mode to version 5.31.4. The detailed changes are those
Alan Mackenzie <acm@muc.de>
parents:
74372
diff
changeset
|
73 (topmost-intro-cont |
9f636bd65206
Update CC Mode to version 5.31.4. The detailed changes are those
Alan Mackenzie <acm@muc.de>
parents:
74372
diff
changeset
|
74 . (first c-lineup-topmost-intro-cont |
9f636bd65206
Update CC Mode to version 5.31.4. The detailed changes are those
Alan Mackenzie <acm@muc.de>
parents:
74372
diff
changeset
|
75 c-lineup-gnu-DEFUN-intro-cont)))) |
18720 | 76 (c-special-indent-hook . c-gnu-impose-minimum) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
77 (c-block-comment-prefix . "")) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
78 |
18720 | 79 ("k&r" |
80 (c-basic-offset . 5) | |
81 (c-comment-only-line-offset . 0) | |
82 (c-offsets-alist . ((statement-block-intro . +) | |
83 (knr-argdecl-intro . 0) | |
84 (substatement-open . 0) | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
85 (substatement-label . 0) |
18720 | 86 (label . 0) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
87 (statement-cont . +)))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
88 |
18720 | 89 ("bsd" |
30400
58d2360c8677
(c-style-alist): The basic offset for the BSD
Gerd Moellmann <gerd@gnu.org>
parents:
26817
diff
changeset
|
90 (c-basic-offset . 8) |
18720 | 91 (c-comment-only-line-offset . 0) |
92 (c-offsets-alist . ((statement-block-intro . +) | |
93 (knr-argdecl-intro . +) | |
94 (substatement-open . 0) | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
95 (substatement-label . 0) |
18720 | 96 (label . 0) |
97 (statement-cont . +) | |
26817 | 98 (inline-open . 0) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
99 (inexpr-class . 0)))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
100 |
18720 | 101 ("stroustrup" |
102 (c-basic-offset . 4) | |
103 (c-comment-only-line-offset . 0) | |
104 (c-offsets-alist . ((statement-block-intro . +) | |
105 (substatement-open . 0) | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
106 (substatement-label . 0) |
18720 | 107 (label . 0) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
108 (statement-cont . +)))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
109 |
18720 | 110 ("whitesmith" |
111 (c-basic-offset . 4) | |
112 (c-comment-only-line-offset . 0) | |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
113 ;; It's obvious that the CC Mode way of choosing anchor positions |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
114 ;; doesn't fit this style at all. :P |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
115 (c-offsets-alist . ((defun-open . +) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
116 (defun-close . c-lineup-whitesmith-in-block) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
117 (defun-block-intro . (add c-lineup-whitesmith-in-block |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
118 c-indent-multi-line-block)) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
119 (class-open . +) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
120 (class-close . +) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
121 (inline-open . +) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
122 (inline-close . c-lineup-whitesmith-in-block) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
123 (knr-argdecl-intro . +) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
124 (block-open . 0) ; Get indentation from `statement' instead. |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
125 (block-close . c-lineup-whitesmith-in-block) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
126 (brace-list-open . +) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
127 (brace-list-close . c-lineup-whitesmith-in-block) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
128 (brace-list-intro . (add c-lineup-whitesmith-in-block |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
129 c-indent-multi-line-block)) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
130 (brace-list-entry . (add c-lineup-after-whitesmith-blocks |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
131 c-indent-multi-line-block)) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
132 (brace-entry-open . (add c-lineup-after-whitesmith-blocks |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
133 c-indent-multi-line-block)) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
134 (statement . (add c-lineup-after-whitesmith-blocks |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
135 c-indent-multi-line-block)) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
136 (statement-block-intro . (add c-lineup-whitesmith-in-block |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
137 c-indent-multi-line-block)) |
26817 | 138 (substatement-open . +) |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
139 (substatement-label . +) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
140 (label . 0) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
141 (arglist-intro . (add c-lineup-whitesmith-in-block |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
142 c-indent-multi-line-block)) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
143 (arglist-cont . (add c-lineup-after-whitesmith-blocks |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
144 c-indent-multi-line-block)) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
145 (arglist-cont-nonempty . (add c-lineup-whitesmith-in-block |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
146 c-indent-multi-line-block)) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
147 (arglist-close . c-lineup-whitesmith-in-block) |
26817 | 148 (inclass . c-lineup-whitesmith-in-block) |
149 (extern-lang-open . +) | |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
150 (namespace-open . +) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
151 (module-open . +) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
152 (composition-open . +) |
26817 | 153 (extern-lang-close . +) |
154 (namespace-close . +) | |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
155 (module-close . +) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
156 (composition-close . +) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
157 (inextern-lang . c-lineup-whitesmith-in-block) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
158 (innamespace . c-lineup-whitesmith-in-block) |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
159 (inmodule . c-lineup-whitesmith-in-block) |
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
160 (incomposition . c-lineup-whitesmith-in-block) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
161 (inexpr-class . 0)))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
162 |
18720 | 163 ("ellemtel" |
164 (c-basic-offset . 3) | |
165 (c-comment-only-line-offset . 0) | |
166 (c-hanging-braces-alist . ((substatement-open before after))) | |
167 (c-offsets-alist . ((topmost-intro . 0) | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
168 (substatement . +) |
18720 | 169 (substatement-open . 0) |
170 (case-label . +) | |
171 (access-label . -) | |
172 (inclass . ++) | |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
173 (inline-open . 0)))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
174 |
18720 | 175 ("linux" |
176 (c-basic-offset . 8) | |
177 (c-comment-only-line-offset . 0) | |
178 (c-hanging-braces-alist . ((brace-list-open) | |
24282 | 179 (brace-entry-open) |
18720 | 180 (substatement-open after) |
181 (block-close . c-snug-do-while))) | |
182 (c-cleanup-list . (brace-else-brace)) | |
183 (c-offsets-alist . ((statement-block-intro . +) | |
184 (knr-argdecl-intro . 0) | |
185 (substatement-open . 0) | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
186 (substatement-label . 0) |
18720 | 187 (label . 0) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
188 (statement-cont . +)))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
189 |
18720 | 190 ("python" |
191 (indent-tabs-mode . t) | |
26817 | 192 (fill-column . 78) |
18720 | 193 (c-basic-offset . 8) |
194 (c-offsets-alist . ((substatement-open . 0) | |
19807
86412da1174b
(c-style-alist) <python>:, knr-argdecl-intro == +
Richard M. Stallman <rms@gnu.org>
parents:
19376
diff
changeset
|
195 (inextern-lang . 0) |
86412da1174b
(c-style-alist) <python>:, knr-argdecl-intro == +
Richard M. Stallman <rms@gnu.org>
parents:
19376
diff
changeset
|
196 (arglist-intro . +) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
197 (knr-argdecl-intro . +))) |
18720 | 198 (c-hanging-braces-alist . ((brace-list-open) |
199 (brace-list-intro) | |
200 (brace-list-close) | |
24282 | 201 (brace-entry-open) |
18720 | 202 (substatement-open after) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
203 (block-close . c-snug-do-while))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
204 (c-block-comment-prefix . "")) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
205 |
18720 | 206 ("java" |
20918
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
207 (c-basic-offset . 4) |
18720 | 208 (c-comment-only-line-offset . (0 . 0)) |
19254
81353d4e05b7
(c-styles-alist): In "java" style, set
Richard M. Stallman <rms@gnu.org>
parents:
19212
diff
changeset
|
209 ;; the following preserves Javadoc starter lines |
20918
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
210 (c-offsets-alist . ((inline-open . 0) |
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
211 (topmost-intro-cont . +) |
18720 | 212 (statement-block-intro . +) |
213 (knr-argdecl-intro . 5) | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
214 (substatement-open . +) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
215 (substatement-label . +) |
26817 | 216 (label . +) |
18720 | 217 (statement-case-open . +) |
218 (statement-cont . +) | |
219 (arglist-intro . c-lineup-arglist-intro-after-paren) | |
220 (arglist-close . c-lineup-arglist) | |
221 (access-label . 0) | |
222 (inher-cont . c-lineup-java-inher) | |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
223 (func-decl-cont . c-lineup-java-throws)))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
224 |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
225 ;; awk style exists primarily for auto-newline settings. Otherwise it's |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
226 ;; pretty much like k&r. |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
227 ("awk" |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
228 (c-basic-offset . 4) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
229 (c-comment-only-line-offset . 0) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
230 (c-hanging-braces-alist . ((defun-open after) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
231 (defun-close . c-snug-1line-defun-close) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
232 (substatement-open after) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
233 (block-close . c-snug-do-while))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
234 (c-hanging-semi&comma-criteria . nil) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
235 (c-cleanup-list . nil) ; You might want one-liner-defun here. |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
236 (c-offsets-alist . ((statement-block-intro . +) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
237 (substatement-open . 0) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
238 (statement-cont . +)))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
239 |
18720 | 240 ) |
241 "Styles of indentation. | |
242 Elements of this alist are of the form: | |
243 | |
244 (STYLE-STRING [BASE-STYLE] (VARIABLE . VALUE) [(VARIABLE . VALUE) ...]) | |
245 | |
246 where STYLE-STRING is a short descriptive string used to select a | |
247 style, VARIABLE is any Emacs variable, and VALUE is the intended value | |
248 for that variable when using the selected style. | |
249 | |
250 Optional BASE-STYLE if present, is a string and must follow | |
251 STYLE-STRING. BASE-STYLE names a style that this style inherits from. | |
26817 | 252 By default, all styles inherit from the \"user\" style, which is |
18720 | 253 computed at run time. Style loops generate errors. |
254 | |
255 Two variables are treated specially. When VARIABLE is | |
256 `c-offsets-alist', the VALUE is a list containing elements of the | |
257 form: | |
258 | |
259 (SYNTACTIC-SYMBOL . OFFSET) | |
260 | |
261 as described in `c-offsets-alist'. These are passed directly to | |
262 `c-set-offset' so there is no need to set every syntactic symbol in | |
263 your style, only those that are different from the default. | |
264 | |
265 When VARIABLE is `c-special-indent-hook', its VALUE is added to | |
266 `c-special-indent-hook' using `add-hook'. If VALUE is a list, each | |
267 element of the list is added with `add-hook'. | |
268 | |
269 Do not change this variable directly. Use the function `c-add-style' | |
270 to add new styles or modify existing styles (it is not a good idea to | |
271 modify existing styles -- you should create a new style that inherits | |
70742 | 272 the existing style).") |
18720 | 273 |
274 | |
275 ;; Functions that manipulate styles | |
26817 | 276 (defun c-set-style-1 (conscell dont-override) |
18720 | 277 ;; Set the style for one variable |
278 (let ((attr (car conscell)) | |
279 (val (cdr conscell))) | |
280 (cond | |
281 ;; first special variable | |
282 ((eq attr 'c-offsets-alist) | |
45703
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
283 (let ((offsets (cond ((eq dont-override t) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
284 c-offsets-alist) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
285 (dont-override |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
286 (default-value 'c-offsets-alist))))) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
287 (mapcar (lambda (langentry) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
288 (let ((langelem (car langentry)) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
289 (offset (cdr langentry))) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
290 (unless (assq langelem offsets) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
291 (c-set-offset langelem offset)))) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
292 val))) |
18720 | 293 ;; second special variable |
294 ((eq attr 'c-special-indent-hook) | |
45703
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
295 ;; Maybe we should ignore dont-override here and always add new |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
296 ;; hooks? |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
297 (unless (cond ((eq dont-override t) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
298 c-special-indent-hook) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
299 (dont-override |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
300 (default-value 'c-special-indent-hook))) |
26817 | 301 (if (listp val) |
45703
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
302 (mapcar (lambda (func) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
303 (add-hook 'c-special-indent-hook func t t)) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
304 val) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
305 (add-hook 'c-special-indent-hook val t t)))) |
18720 | 306 ;; all other variables |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
307 (t (when (or (not dont-override) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
308 (not (memq attr c-style-variables)) |
45703
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
309 (eq (if (eq dont-override t) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
310 (symbol-value attr) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
311 (default-value attr)) |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
312 'set-from-style)) |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
313 (set attr val) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
314 ;; Must update a number of other variables if |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
315 ;; c-comment-prefix-regexp is set. |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
316 (if (eq attr 'c-comment-prefix-regexp) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
317 (c-setup-paragraph-variables))))))) |
18720 | 318 |
26817 | 319 (defun c-get-style-variables (style basestyles) |
320 ;; Return all variables in a style by resolving inheritances. | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
321 (if (not style) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
322 (copy-alist c-fallback-style) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
323 (let ((vars (cdr (or (assoc (downcase style) c-style-alist) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
324 (assoc (upcase style) c-style-alist) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
325 (assoc style c-style-alist) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
326 (progn |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
327 (c-benign-error "Undefined style: %s" style) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
328 nil))))) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
329 (let ((base (and (stringp (car-safe vars)) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
330 (prog1 |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
331 (downcase (car vars)) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
332 (setq vars (cdr vars)))))) |
26817 | 333 (if (memq base basestyles) |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
334 (c-benign-error "Style loop detected: %s in %s" base basestyles) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
335 (nconc (c-get-style-variables base (cons base basestyles)) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
336 (copy-alist vars))))))) |
26817 | 337 |
18720 | 338 (defvar c-set-style-history nil) |
339 | |
340 ;;;###autoload | |
26817 | 341 (defun c-set-style (stylename &optional dont-override) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
342 "Set the current buffer to use the style STYLENAME. |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
343 STYLENAME, a string, must be an existing CC Mode style - These are contained |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
344 in the variable `c-style-alist'. |
18720 | 345 |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
346 The variable `c-indentation-style' will get set to STYLENAME. |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
347 |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
348 \"Setting the style\" is done by setting CC Mode's \"style variables\" to the |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
349 values indicated by the pertinent entry in `c-style-alist'. Other variables |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
350 might get set too. |
26817 | 351 |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
352 If DONT-OVERRIDE is neither nil nor t, style variables whose default values |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
353 have been set (more precisely, whose default values are not the symbol |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
354 `set-from-style') will not be changed. This avoids overriding global settings |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
355 done in ~/.emacs. It is useful to call c-set-style from a mode hook in this |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
356 way. |
26817 | 357 |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
358 If DONT-OVERRIDE is t, style variables that already have values (i.e., whose |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
359 values are not the symbol `set-from-style') will not be overridden. CC Mode |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
360 calls c-set-style internally in this way whilst initializing a buffer; if |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
361 cc-set-style is called like this from anywhere else, it will usually behave as |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
362 a null operation." |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
363 (interactive |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
364 (list (let ((completion-ignore-case t) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
365 (prompt (format "Which %s indentation style? " |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
366 mode-name))) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
367 (completing-read prompt c-style-alist nil t nil |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
368 'c-set-style-history |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
369 c-indentation-style)))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
370 (or c-buffer-is-cc-mode |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
371 (error "Buffer %s is not a CC Mode buffer (c-set-style)" (buffer-name))) |
56646
b7446b6f097d
Updated CC Mode to 5.30.9.
Martin Stjernholm <mast@lysator.liu.se>
parents:
52608
diff
changeset
|
372 (or (stringp stylename) |
b7446b6f097d
Updated CC Mode to 5.30.9.
Martin Stjernholm <mast@lysator.liu.se>
parents:
52608
diff
changeset
|
373 (error "Argument to c-set-style was not a string")) |
19254
81353d4e05b7
(c-styles-alist): In "java" style, set
Richard M. Stallman <rms@gnu.org>
parents:
19212
diff
changeset
|
374 (c-initialize-builtin-style) |
26817 | 375 (let ((vars (c-get-style-variables stylename nil))) |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
376 (unless dont-override |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
377 ;; Since we always add to c-special-indent-hook we must reset it |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
378 ;; first, or else the hooks from the preceding style will |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
379 ;; remain. This is not necessary for c-offsets-alist, since |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
380 ;; c-get-style-variables contains every valid offset type in the |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
381 ;; fallback entry. |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
382 (setq c-special-indent-hook |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
383 (default-value 'c-special-indent-hook))) |
26817 | 384 (mapcar (lambda (elem) |
385 (c-set-style-1 elem dont-override)) | |
386 ;; Need to go through the variables backwards when we | |
45703
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
387 ;; don't override any settings. |
b022aba47c59
(c-set-style, c-set-style-1): Added another state for the
Martin Stjernholm <mast@lysator.liu.se>
parents:
44728
diff
changeset
|
388 (if (eq dont-override t) (nreverse vars) vars))) |
18720 | 389 (setq c-indentation-style stylename) |
390 (c-keep-region-active)) | |
391 | |
392 ;;;###autoload | |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
393 (defun c-add-style (style description &optional set-p) |
18720 | 394 "Adds a style to `c-style-alist', or updates an existing one. |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
395 STYLE is a string identifying the style to add or update. DESCRIPTION |
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
396 is an association list describing the style and must be of the form: |
18720 | 397 |
398 ([BASESTYLE] (VARIABLE . VALUE) [(VARIABLE . VALUE) ...]) | |
399 | |
400 See the variable `c-style-alist' for the semantics of BASESTYLE, | |
401 VARIABLE and VALUE. This function also sets the current style to | |
402 STYLE using `c-set-style' if the optional SET-P flag is non-nil." | |
403 (interactive | |
404 (let ((stylename (completing-read "Style to add: " c-style-alist | |
405 nil nil nil 'c-set-style-history)) | |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
406 (descr (eval-minibuffer "Style description: "))) |
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
407 (list stylename descr |
18720 | 408 (y-or-n-p "Set the style too? ")))) |
409 (setq style (downcase style)) | |
410 (let ((s (assoc style c-style-alist))) | |
411 (if s | |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
412 (setcdr s (copy-alist description)) ; replace |
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
413 (setq c-style-alist (cons (cons style description) c-style-alist)))) |
18720 | 414 (and set-p (c-set-style style))) |
415 | |
416 | |
417 (defvar c-read-offset-history nil) | |
418 | |
419 (defun c-read-offset (langelem) | |
420 ;; read new offset value for LANGELEM from minibuffer. return a | |
421 ;; legal value only | |
26817 | 422 (let* ((oldoff (cdr-safe (or (assq langelem c-offsets-alist) |
423 (assq langelem (get 'c-offsets-alist | |
424 'c-stylevar-fallback))))) | |
24282 | 425 (symname (symbol-name langelem)) |
426 (defstr (format "(default %s): " oldoff)) | |
36920 | 427 (errmsg (concat "Offset must be int, func, var, vector, list, " |
24282 | 428 "or [+,-,++,--,*,/] " |
429 defstr)) | |
430 (prompt (concat symname " offset " defstr)) | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
431 (keymap (make-sparse-keymap)) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
432 (minibuffer-completion-table obarray) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
433 (minibuffer-completion-predicate 'fboundp) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
434 offset input) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
435 ;; In principle completing-read is used here, but SPC is unbound |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
436 ;; to make it less annoying to enter lists. |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
437 (set-keymap-parent keymap minibuffer-local-completion-map) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
438 (define-key keymap " " 'self-insert-command) |
18720 | 439 (while (not offset) |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
440 (setq input (read-from-minibuffer prompt nil keymap t |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
441 'c-read-offset-history |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
442 (format "%s" oldoff))) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
443 (if (c-valid-offset input) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
444 (setq offset input) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
445 ;; error, but don't signal one, keep trying |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
446 ;; to read an input value |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
447 (ding) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
448 (setq prompt errmsg))) |
18720 | 449 offset)) |
450 | |
19212
024594beef65
(c-set-offset): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
18845
diff
changeset
|
451 ;;;###autoload |
26817 | 452 (defun c-set-offset (symbol offset &optional ignored) |
18720 | 453 "Change the value of a syntactic element symbol in `c-offsets-alist'. |
454 SYMBOL is the syntactic element symbol to change and OFFSET is the new | |
26817 | 455 offset for that syntactic element. The optional argument is not used |
456 and exists only for compatibility reasons." | |
18720 | 457 (interactive |
458 (let* ((langelem | |
459 (intern (completing-read | |
460 (concat "Syntactic symbol to change" | |
461 (if current-prefix-arg " or add" "") | |
462 ": ") | |
463 (mapcar | |
464 #'(lambda (langelem) | |
465 (cons (format "%s" (car langelem)) nil)) | |
26817 | 466 (get 'c-offsets-alist 'c-stylevar-fallback)) |
18720 | 467 nil (not current-prefix-arg) |
468 ;; initial contents tries to be the last element | |
469 ;; on the syntactic analysis list for the current | |
470 ;; line | |
49660
425dcb97eca4
(c-set-offset): Don't find a default syntactic element through
Martin Stjernholm <mast@lysator.liu.se>
parents:
49478
diff
changeset
|
471 (and c-buffer-is-cc-mode |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
472 (c-save-buffer-state |
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
473 ((syntax (c-guess-basic-syntax)) |
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
474 (len (length syntax)) |
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
475 (ic (format "%s" (car (nth (1- len) syntax))))) |
49660
425dcb97eca4
(c-set-offset): Don't find a default syntactic element through
Martin Stjernholm <mast@lysator.liu.se>
parents:
49478
diff
changeset
|
476 (cons ic 0))) |
18720 | 477 ))) |
478 (offset (c-read-offset langelem))) | |
479 (list langelem offset current-prefix-arg))) | |
480 ;; sanity check offset | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
481 (if (c-valid-offset offset) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
482 (let ((entry (assq symbol c-offsets-alist))) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
483 (if entry |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
484 (setcdr entry offset) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
485 (if (assq symbol (get 'c-offsets-alist 'c-stylevar-fallback)) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
486 (setq c-offsets-alist (cons (cons symbol offset) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
487 c-offsets-alist)) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
488 (c-benign-error "%s is not a valid syntactic symbol" symbol)))) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
489 (c-benign-error "Invalid indentation setting for symbol %s: %S" |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
490 symbol offset)) |
18720 | 491 (c-keep-region-active)) |
492 | |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
493 |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
494 (defun c-setup-paragraph-variables () |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
495 "Fix things up for paragraph recognition and filling inside comments and |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
496 strings by incorporating the values of `c-comment-prefix-regexp', |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
497 `sentence-end', `paragraph-start' and `paragraph-separate' in the relevant |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
498 variables." |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
499 |
52608
fae5ff03687a
(c-setup-paragraph-variables): Made it interactive.
Martin Stjernholm <mast@lysator.liu.se>
parents:
52401
diff
changeset
|
500 (interactive) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
501 (or c-buffer-is-cc-mode |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
502 (error "Buffer %s is not a CC Mode buffer (c-setup-paragraph-variables)" |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
503 (buffer-name))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
504 ;; Set up the values for use in comments. |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
505 (setq c-current-comment-prefix |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
506 (if (listp c-comment-prefix-regexp) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
507 (cdr-safe (or (assoc major-mode c-comment-prefix-regexp) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
508 (assoc 'other c-comment-prefix-regexp))) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
509 c-comment-prefix-regexp)) |
52608
fae5ff03687a
(c-setup-paragraph-variables): Made it interactive.
Martin Stjernholm <mast@lysator.liu.se>
parents:
52401
diff
changeset
|
510 |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
511 (let ((comment-line-prefix |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
512 (concat "[ \t]*\\(" c-current-comment-prefix "\\)[ \t]*"))) |
52608
fae5ff03687a
(c-setup-paragraph-variables): Made it interactive.
Martin Stjernholm <mast@lysator.liu.se>
parents:
52401
diff
changeset
|
513 |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
514 (setq paragraph-start (concat comment-line-prefix |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
515 c-paragraph-start |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
516 "\\|" |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
517 page-delimiter) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
518 paragraph-separate (concat comment-line-prefix |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
519 c-paragraph-separate |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
520 "\\|" |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
521 page-delimiter) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
522 paragraph-ignore-fill-prefix t |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
523 adaptive-fill-mode t |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
524 adaptive-fill-regexp |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
525 (concat comment-line-prefix |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
526 (if (default-value 'adaptive-fill-regexp) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
527 (concat "\\(" |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
528 (default-value 'adaptive-fill-regexp) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
529 "\\)") |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
530 ""))) |
52608
fae5ff03687a
(c-setup-paragraph-variables): Made it interactive.
Martin Stjernholm <mast@lysator.liu.se>
parents:
52401
diff
changeset
|
531 |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
532 (when (boundp 'adaptive-fill-first-line-regexp) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
533 ;; XEmacs adaptive fill mode doesn't have this. |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
534 (make-local-variable 'adaptive-fill-first-line-regexp) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
535 (setq adaptive-fill-first-line-regexp |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
536 (concat "\\`" comment-line-prefix |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
537 ;; Maybe we should incorporate the old value here, |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
538 ;; but then we have to do all sorts of kludges to |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
539 ;; deal with the \` and \' it probably contains. |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
540 "\\'")))) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
541 |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
542 ;; Set up the values for use in strings. These are the default |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
543 ;; paragraph-start/separate values, enhanced to accept escaped EOLs as |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
544 ;; whitespace. Used in c-beginning/end-of-sentence-in-string in cc-cmds. |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
545 (setq c-string-par-start |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
546 ;;(concat "\\(" (default-value 'paragraph-start) "\\)\\|[ \t]*\\\\$")) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
547 "\f\\|[ \t]*\\\\?$") |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
548 (setq c-string-par-separate |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
549 ;;(concat "\\(" (default-value 'paragraph-separate) "\\)\\|[ \t]*\\\\$")) |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
550 "[ \t\f]*\\\\?$") |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
551 (setq c-sentence-end-with-esc-eol |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
552 (concat "\\(\\(" (c-default-value-sentence-end) "\\)" |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
553 ;; N.B.: "$" would be illegal when not enclosed like "\\($\\)". |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
554 "\\|" "[.?!][]\"')}]* ?\\\\\\($\\)[ \t\n]*" |
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
555 "\\)"))) |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
556 |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
557 |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
558 ;; Helper for setting up Filladapt mode. It's not used by CC Mode itself. |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
559 |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
560 (cc-bytecomp-defvar filladapt-token-table) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
561 (cc-bytecomp-defvar filladapt-token-match-table) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
562 (cc-bytecomp-defvar filladapt-token-conversion-table) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
563 |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
564 (defun c-setup-filladapt () |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
565 "Convenience function to configure Kyle E. Jones' Filladapt mode for |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
566 CC Mode by making sure the proper entries are present on |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
567 `filladapt-token-table', `filladapt-token-match-table', and |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
568 `filladapt-token-conversion-table'. This is intended to be used on |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
569 `c-mode-common-hook' or similar." |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
570 ;; This function is intended to be used explicitly by the end user |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
571 ;; only. |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
572 |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
573 ;; The default configuration already handles C++ comments, but we |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
574 ;; need to add handling of C block comments. A new filladapt token |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
575 ;; `c-comment' is added for that. |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
576 (let (p) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
577 (setq p filladapt-token-table) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
578 (while (and p (not (eq (car-safe (cdr-safe (car-safe p))) 'c-comment))) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
579 (setq p (cdr-safe p))) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
580 (if p |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
581 (setcar (car p) c-current-comment-prefix) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
582 (setq filladapt-token-table |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
583 (append (list (car filladapt-token-table) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
584 (list c-current-comment-prefix 'c-comment)) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
585 (cdr filladapt-token-table))))) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
586 (unless (assq 'c-comment filladapt-token-match-table) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
587 (setq filladapt-token-match-table |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
588 (append '((c-comment c-comment)) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
589 filladapt-token-match-table))) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
590 (unless (assq 'c-comment filladapt-token-conversion-table) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
591 (setq filladapt-token-conversion-table |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
592 (append '((c-comment . exact)) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
593 filladapt-token-conversion-table)))) |
26817 | 594 |
24282 | 595 |
18720 | 596 (defun c-initialize-builtin-style () |
597 ;; Dynamically append the default value of most variables. This is | |
598 ;; crucial because future c-set-style calls will always reset the | |
599 ;; variables first to the `cc-mode' style before instituting the new | |
600 ;; style. Only do this once! | |
24282 | 601 (unless (get 'c-initialize-builtin-style 'is-run) |
602 (put 'c-initialize-builtin-style 'is-run t) | |
36920 | 603 ;;(c-initialize-cc-mode) |
44728
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
604 (unless (assoc "user" c-style-alist) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
605 (let ((vars c-style-variables) var val uservars) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
606 (while vars |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
607 (setq var (car vars) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
608 val (symbol-value var) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
609 vars (cdr vars)) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
610 (cond ((eq var 'c-offsets-alist) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
611 (or (null val) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
612 (setq uservars (cons (cons 'c-offsets-alist val) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
613 uservars)))) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
614 ((not (eq val 'set-from-style)) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
615 (setq uservars (cons (cons var val) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
616 uservars))))) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
617 (c-add-style "user" uservars))) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
618 (unless (assoc "cc-mode" c-style-alist) |
7a3ac6c387fe
CC Mode update to version 5.29. This is for testing; it's not a released
Martin Stjernholm <mast@lysator.liu.se>
parents:
38422
diff
changeset
|
619 (c-add-style "cc-mode" '("user"))) |
24282 | 620 (if c-style-variables-are-local-p |
621 (c-make-styles-buffer-local)))) | |
19254
81353d4e05b7
(c-styles-alist): In "java" style, set
Richard M. Stallman <rms@gnu.org>
parents:
19212
diff
changeset
|
622 |
20918
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
623 (defun c-make-styles-buffer-local (&optional this-buf-only-p) |
18720 | 624 "Make all CC Mode style variables buffer local. |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
625 If `this-buf-only-p' is non-nil, the style variables will be made |
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
626 buffer local only in the current buffer. Otherwise they'll be made |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
627 permanently buffer local in any buffer that changes their values. |
18720 | 628 |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
629 The buffer localness of the style variables are normally controlled |
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
630 with the variable `c-style-variables-are-local-p', so there's seldom |
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49660
diff
changeset
|
631 any reason to call this function directly." |
18720 | 632 |
633 ;; style variables | |
20918
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
634 (let ((func (if this-buf-only-p |
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
635 'make-local-variable |
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
636 'make-variable-buffer-local)) |
26817 | 637 (varsyms (cons 'c-indentation-style (copy-alist c-style-variables)))) |
638 (delq 'c-special-indent-hook varsyms) | |
20918
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
639 (mapcar func varsyms) |
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
640 ;; Hooks must be handled specially |
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
641 (if this-buf-only-p |
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
642 (make-local-hook 'c-special-indent-hook) |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
643 (with-no-warnings (make-variable-buffer-local 'c-special-indent-hook)) |
26817 | 644 (setq c-style-variables-are-local-p t)) |
20918
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
645 )) |
8e64bd5b1b5f
(c-make-styles-buffer-local): Take an optional argument which switches
Richard M. Stallman <rms@gnu.org>
parents:
20147
diff
changeset
|
646 |
18720 | 647 |
648 | |
36920 | 649 (cc-provide 'cc-styles) |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38167
diff
changeset
|
650 |
67252
04d2abb755d9
Update CC Mode to release 5.31.
Alan Mackenzie <acm@muc.de>
parents:
65811
diff
changeset
|
651 ;;; arch-tag: c764f61a-96ba-484a-a68f-101c0e9d5d2c |
18720 | 652 ;;; cc-styles.el ends here |