Mercurial > emacs
annotate lisp/progmodes/c-mode.el @ 5423:8213b45445a6
Fix typo in previous change.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 03 Jan 1994 10:43:37 +0000 |
parents | b56d0a9dbcf2 |
children | 85ae0f534b7b |
rev | line source |
---|---|
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
472
diff
changeset
|
1 ;;; c-mode.el --- C code editing commands for Emacs |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
2 ;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
837
diff
changeset
|
3 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
759
diff
changeset
|
4 ;; Maintainer: FSF |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
759
diff
changeset
|
5 ;; Keywords: c |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
759
diff
changeset
|
6 |
453 | 7 ;; This file is part of GNU Emacs. |
8 | |
9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
10 ;; it under the terms of the GNU General Public License as published by | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
759
diff
changeset
|
11 ;; the Free Software Foundation; either version 2, or (at your option) |
453 | 12 ;; any later version. |
13 | |
14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 ;; GNU General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
20 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
21 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
22 | |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2084
diff
changeset
|
23 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2084
diff
changeset
|
24 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2084
diff
changeset
|
25 ;; A smart editing mode for C code. It knows a lot about C syntax and tries |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2084
diff
changeset
|
26 ;; to position the curser according to C layout conventions. You can |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2084
diff
changeset
|
27 ;; change the details of the layout style with option variables. Load it |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2084
diff
changeset
|
28 ;; and do M-x describe-mode for details. |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2084
diff
changeset
|
29 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
759
diff
changeset
|
30 ;;; Code: |
453 | 31 |
32 (defvar c-mode-abbrev-table nil | |
33 "Abbrev table in use in C mode.") | |
34 (define-abbrev-table 'c-mode-abbrev-table ()) | |
35 | |
5417
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
36 (defvar c-mode-map (make-sparse-keymap) |
453 | 37 "Keymap used in C mode.") |
5417
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
38 |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
39 (define-key c-mode-map "{" 'electric-c-brace) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
40 (define-key c-mode-map "}" 'electric-c-brace) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
41 (define-key c-mode-map ";" 'electric-c-semi) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
42 (define-key c-mode-map "#" 'electric-c-sharp-sign) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
43 (define-key c-mode-map ":" 'electric-c-terminator) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
44 (define-key c-mode-map "\e\C-h" 'mark-c-function) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
45 (define-key c-mode-map "\e\C-q" 'indent-c-exp) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
46 (define-key c-mode-map "\ea" 'c-beginning-of-statement) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
47 (define-key c-mode-map "\ee" 'c-end-of-statement) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
48 (define-key c-mode-map "\eq" 'c-fill-paragraph) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
49 (define-key c-mode-map "\C-c\C-n" 'c-forward-conditional) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
50 (define-key c-mode-map "\C-c\C-p" 'c-backward-conditional) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
51 (define-key c-mode-map "\C-c\C-u" 'c-up-conditional) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
52 (define-key c-mode-map "\177" 'backward-delete-char-untabify) |
5423
8213b45445a6
Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5422
diff
changeset
|
53 (define-key c-mode-map "\t" 'c-indent-command) |
5417
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
54 |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
55 (define-key c-mode-map [menu-bar] (make-sparse-keymap)) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
56 |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
57 (define-key c-mode-map [menu-bar c] |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
58 (cons "C" (make-sparse-keymap "C"))) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
59 |
5422 | 60 (define-key c-mode-map [menu-bar c comment-region] |
61 '("Comment Out Region" . comment-region)) | |
62 (define-key c-mode-map [menu-bar c c-macro-expand] | |
63 '("Macro Expand Region" . c-macro-expand)) | |
64 (define-key c-mode-map [menu-bar c c-backslash-region] | |
65 '("Backslashify" . c-backslash-region)) | |
5417
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
66 (define-key c-mode-map [menu-bar c indent-exp] |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
67 '("Indent Expression" . indent-c-exp)) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
68 (define-key c-mode-map [menu-bar c indent-line] |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
69 '("Indent Line" . c-indent-command)) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
70 (define-key c-mode-map [menu-bar c fill] |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
71 '("Fill Comment Paragraph" . c-fill-paragraph)) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
72 (define-key c-mode-map [menu-bar c up] |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
73 '("Up Conditional" . c-up-conditional)) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
74 (define-key c-mode-map [menu-bar c backward] |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
75 '("Backward Conditional" . c-backward-conditional)) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
76 (define-key c-mode-map [menu-bar c forward] |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
77 '("Forward Conditional" . c-forward-conditional)) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
78 (define-key c-mode-map [menu-bar c backward-stmt] |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
79 '("Backward Statement" . c-beginning-of-statement)) |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
80 (define-key c-mode-map [menu-bar c forward-stmt] |
4d74f3f4ed03
(c-mode-map): Add menu bar menu.
Richard M. Stallman <rms@gnu.org>
parents:
5305
diff
changeset
|
81 '("Forward Statement" . c-end-of-statement)) |
453 | 82 |
83 ;; cmacexp is lame because it uses no preprocessor symbols. | |
84 ;; It isn't very extensible either -- hardcodes /lib/cpp. | |
85 (autoload 'c-macro-expand "cmacexp" | |
86 "Display the result of expanding all C macros occurring in the region. | |
87 The expansion is entirely correct because it uses the C preprocessor." | |
88 t) | |
89 | |
90 (defvar c-mode-syntax-table nil | |
91 "Syntax table in use in C-mode buffers.") | |
92 | |
93 (if c-mode-syntax-table | |
94 () | |
95 (setq c-mode-syntax-table (make-syntax-table)) | |
96 (modify-syntax-entry ?\\ "\\" c-mode-syntax-table) | |
97 (modify-syntax-entry ?/ ". 14" c-mode-syntax-table) | |
98 (modify-syntax-entry ?* ". 23" c-mode-syntax-table) | |
99 (modify-syntax-entry ?+ "." c-mode-syntax-table) | |
100 (modify-syntax-entry ?- "." c-mode-syntax-table) | |
101 (modify-syntax-entry ?= "." c-mode-syntax-table) | |
102 (modify-syntax-entry ?% "." c-mode-syntax-table) | |
103 (modify-syntax-entry ?< "." c-mode-syntax-table) | |
104 (modify-syntax-entry ?> "." c-mode-syntax-table) | |
105 (modify-syntax-entry ?& "." c-mode-syntax-table) | |
106 (modify-syntax-entry ?| "." c-mode-syntax-table) | |
107 (modify-syntax-entry ?\' "\"" c-mode-syntax-table)) | |
108 | |
109 (defconst c-indent-level 2 | |
110 "*Indentation of C statements with respect to containing block.") | |
111 (defconst c-brace-imaginary-offset 0 | |
112 "*Imagined indentation of a C open brace that actually follows a statement.") | |
113 (defconst c-brace-offset 0 | |
114 "*Extra indentation for braces, compared with other text in same context.") | |
115 (defconst c-argdecl-indent 5 | |
116 "*Indentation level of declarations of C function arguments.") | |
117 (defconst c-label-offset -2 | |
118 "*Offset of C label lines and case statements relative to usual indentation.") | |
119 (defconst c-continued-statement-offset 2 | |
120 "*Extra indent for lines not starting new statements.") | |
121 (defconst c-continued-brace-offset 0 | |
122 "*Extra indent for substatements that start with open-braces. | |
123 This is in addition to c-continued-statement-offset.") | |
124 (defconst c-style-alist | |
125 '(("GNU" | |
126 (c-indent-level . 2) | |
127 (c-argdecl-indent . 5) | |
128 (c-brace-offset . 0) | |
129 (c-label-offset . -2) | |
130 (c-continued-statement-offset . 2)) | |
131 ("K&R" | |
132 (c-indent-level . 5) | |
133 (c-argdecl-indent . 0) | |
134 (c-brace-offset . -5) | |
135 (c-label-offset . -5) | |
136 (c-continued-statement-offset . 5)) | |
137 ("BSD" | |
138 (c-indent-level . 4) | |
139 (c-argdecl-indent . 4) | |
140 (c-brace-offset . -4) | |
141 (c-label-offset . -4) | |
142 (c-continued-statement-offset . 4)) | |
1661
26d8a65a6e32
* c-mode.el (c-style-alist): Add quotes around C++ style name.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1205
diff
changeset
|
143 ("C++" |
472 | 144 (c-indent-level . 4) |
145 (c-continued-statement-offset . 4) | |
146 (c-brace-offset . -4) | |
147 (c-argdecl-indent . 0) | |
148 (c-label-offset . -4) | |
149 (c-auto-newline . t)) | |
453 | 150 ("Whitesmith" |
151 (c-indent-level . 4) | |
152 (c-argdecl-indent . 4) | |
153 (c-brace-offset . 0) | |
154 (c-label-offset . -4) | |
155 (c-continued-statement-offset . 4)))) | |
156 | |
157 (defconst c-auto-newline nil | |
158 "*Non-nil means automatically newline before and after braces, | |
159 and after colons and semicolons, inserted in C code. | |
160 If you do not want a leading newline before braces then use: | |
1159 | 161 (define-key c-mode-map \"{\" 'electric-c-semi)") |
453 | 162 |
163 (defconst c-tab-always-indent t | |
164 "*Non-nil means TAB in C mode should always reindent the current line, | |
165 regardless of where in the line point is when the TAB command is used.") | |
1804
fe2bebf150c7
* c-mode.el (c-switch-label-regexp): New constant.
Jim Blandy <jimb@redhat.com>
parents:
1701
diff
changeset
|
166 |
fe2bebf150c7
* c-mode.el (c-switch-label-regexp): New constant.
Jim Blandy <jimb@redhat.com>
parents:
1701
diff
changeset
|
167 ;;; Regular expression used internally to recognize labels in switch |
fe2bebf150c7
* c-mode.el (c-switch-label-regexp): New constant.
Jim Blandy <jimb@redhat.com>
parents:
1701
diff
changeset
|
168 ;;; statements. |
fe2bebf150c7
* c-mode.el (c-switch-label-regexp): New constant.
Jim Blandy <jimb@redhat.com>
parents:
1701
diff
changeset
|
169 (defconst c-switch-label-regexp "case[ \t'/(]\\|default\\(\\S_\\|'\\)") |
fe2bebf150c7
* c-mode.el (c-switch-label-regexp): New constant.
Jim Blandy <jimb@redhat.com>
parents:
1701
diff
changeset
|
170 |
453 | 171 |
172 (defun c-mode () | |
173 "Major mode for editing C code. | |
174 Expression and list commands understand all C brackets. | |
175 Tab indents for C code. | |
176 Comments are delimited with /* ... */. | |
177 Paragraphs are separated by blank lines only. | |
178 Delete converts tabs to spaces as it moves back. | |
179 \\{c-mode-map} | |
180 Variables controlling indentation style: | |
181 c-tab-always-indent | |
182 Non-nil means TAB in C mode should always reindent the current line, | |
183 regardless of where in the line point is when the TAB command is used. | |
184 c-auto-newline | |
185 Non-nil means automatically newline before and after braces, | |
186 and after colons and semicolons, inserted in C code. | |
187 c-indent-level | |
188 Indentation of C statements within surrounding block. | |
189 The surrounding block's indentation is the indentation | |
190 of the line on which the open-brace appears. | |
191 c-continued-statement-offset | |
192 Extra indentation given to a substatement, such as the | |
193 then-clause of an if or body of a while. | |
194 c-continued-brace-offset | |
195 Extra indentation given to a brace that starts a substatement. | |
196 This is in addition to c-continued-statement-offset. | |
197 c-brace-offset | |
198 Extra indentation for line if it starts with an open brace. | |
199 c-brace-imaginary-offset | |
200 An open brace following other text is treated as if it were | |
201 this far to the right of the start of its line. | |
202 c-argdecl-indent | |
203 Indentation level of declarations of C function arguments. | |
204 c-label-offset | |
205 Extra indentation for line that is a label, or case or default. | |
206 | |
207 Settings for K&R and BSD indentation styles are | |
208 c-indent-level 5 8 | |
209 c-continued-statement-offset 5 8 | |
210 c-brace-offset -5 -8 | |
211 c-argdecl-indent 0 8 | |
212 c-label-offset -5 -8 | |
213 | |
214 Turning on C mode calls the value of the variable c-mode-hook with no args, | |
215 if that value is non-nil." | |
216 (interactive) | |
217 (kill-all-local-variables) | |
218 (use-local-map c-mode-map) | |
219 (setq major-mode 'c-mode) | |
220 (setq mode-name "C") | |
221 (setq local-abbrev-table c-mode-abbrev-table) | |
222 (set-syntax-table c-mode-syntax-table) | |
223 (make-local-variable 'paragraph-start) | |
224 (setq paragraph-start (concat "^$\\|" page-delimiter)) | |
225 (make-local-variable 'paragraph-separate) | |
226 (setq paragraph-separate paragraph-start) | |
227 (make-local-variable 'paragraph-ignore-fill-prefix) | |
228 (setq paragraph-ignore-fill-prefix t) | |
229 (make-local-variable 'indent-line-function) | |
230 (setq indent-line-function 'c-indent-line) | |
231 (make-local-variable 'indent-region-function) | |
232 (setq indent-region-function 'c-indent-region) | |
233 (make-local-variable 'require-final-newline) | |
234 (setq require-final-newline t) | |
235 (make-local-variable 'comment-start) | |
236 (setq comment-start "/* ") | |
237 (make-local-variable 'comment-end) | |
238 (setq comment-end " */") | |
239 (make-local-variable 'comment-column) | |
240 (setq comment-column 32) | |
241 (make-local-variable 'comment-start-skip) | |
242 (setq comment-start-skip "/\\*+ *") | |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2084
diff
changeset
|
243 (make-local-variable 'comment-indent-function) |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2084
diff
changeset
|
244 (setq comment-indent-function 'c-comment-indent) |
453 | 245 (make-local-variable 'parse-sexp-ignore-comments) |
246 (setq parse-sexp-ignore-comments t) | |
247 (run-hooks 'c-mode-hook)) | |
248 | |
249 ;; This is used by indent-for-comment | |
250 ;; to decide how much to indent a comment in C code | |
251 ;; based on its context. | |
252 (defun c-comment-indent () | |
253 (if (looking-at "^/\\*") | |
254 0 ;Existing comment at bol stays there. | |
255 (let ((opoint (point))) | |
256 (save-excursion | |
257 (beginning-of-line) | |
258 (cond ((looking-at "[ \t]*}[ \t]*\\($\\|/\\*\\)") | |
259 ;; A comment following a solitary close-brace | |
260 ;; should have only one space. | |
261 (search-forward "}") | |
262 (1+ (current-column))) | |
263 ((or (looking-at "^#[ \t]*endif[ \t]*") | |
264 (looking-at "^#[ \t]*else[ \t]*")) | |
265 7) ;2 spaces after #endif | |
266 ((progn | |
267 (goto-char opoint) | |
268 (skip-chars-backward " \t") | |
269 (and (= comment-column 0) (bolp))) | |
270 ;; If comment-column is 0, and nothing but space | |
271 ;; before the comment, align it at 0 rather than 1. | |
272 0) | |
273 (t | |
274 (max (1+ (current-column)) ;Else indent at comment column | |
275 comment-column))))))) ; except leave at least one space. | |
276 | |
277 (defun c-fill-paragraph (&optional arg) | |
278 "Like \\[fill-paragraph] but handle C comments. | |
1081
4e7d09b779eb
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1064
diff
changeset
|
279 If any of the current line is a comment or within a comment, |
4e7d09b779eb
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1064
diff
changeset
|
280 fill the comment or the paragraph of it that point is in, |
4e7d09b779eb
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1064
diff
changeset
|
281 preserving the comment indentation or line-starting decorations." |
453 | 282 (interactive "P") |
1086
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
283 (let* (comment-start-place |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
284 (first-line |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
285 ;; Check for obvious entry to comment. |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
286 (save-excursion |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
287 (beginning-of-line) |
1701
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
288 (skip-chars-forward " \t\n") |
1086
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
289 (and (looking-at comment-start-skip) |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
290 (setq comment-start-place (point)))))) |
453 | 291 (if (or first-line |
1064
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
292 ;; t if we enter a comment between start of function and this line. |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
293 (eq (calculate-c-indent) t) |
1081
4e7d09b779eb
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1064
diff
changeset
|
294 ;; t if this line contains a comment starter. |
1181
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
295 (setq first-line |
1701
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
296 (save-excursion |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
297 (beginning-of-line) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
298 (prog1 |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
299 (re-search-forward comment-start-skip |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
300 (save-excursion (end-of-line) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
301 (point)) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
302 t) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
303 (setq comment-start-place (point)))))) |
453 | 304 ;; Inside a comment: fill one comment paragraph. |
305 (let ((fill-prefix | |
306 ;; The prefix for each line of this paragraph | |
307 ;; is the appropriate part of the start of this line, | |
308 ;; up to the column at which text should be indented. | |
309 (save-excursion | |
310 (beginning-of-line) | |
311 (if (looking-at "[ \t]*/\\*.*\\*/") | |
312 (progn (re-search-forward comment-start-skip) | |
313 (make-string (current-column) ?\ )) | |
314 (if first-line (forward-line 1)) | |
1701
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
315 |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
316 (let ((line-width (progn (end-of-line) (current-column)))) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
317 (beginning-of-line) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
318 (prog1 |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
319 (buffer-substring |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
320 (point) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
321 |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
322 ;; How shall we decide where the end of the |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
323 ;; fill-prefix is? |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
324 ;; calculate-c-indent-within-comment bases its value |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
325 ;; on the indentation of previous lines; if they're |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
326 ;; indented specially, it could return a column |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
327 ;; that's well into the current line's text. So |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
328 ;; we'll take at most that many space, tab, or * |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
329 ;; characters, and use that as our fill prefix. |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
330 (let ((max-prefix-end |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
331 (progn |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
332 (move-to-column |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
333 (calculate-c-indent-within-comment t) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
334 t) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
335 (point)))) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
336 (beginning-of-line) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
337 (skip-chars-forward " \t*" max-prefix-end) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
338 (point))) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
339 |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
340 ;; If the comment is only one line followed by a blank |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
341 ;; line, calling move-to-column above may have added |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
342 ;; some spaces and tabs to the end of the line; the |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
343 ;; fill-paragraph function will then delete it and the |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
344 ;; newline following it, so we'll lose a blank line |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
345 ;; when we shouldn't. So delete anything |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
346 ;; move-to-column added to the end of the line. We |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
347 ;; record the line width instead of the position of the |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
348 ;; old line end because move-to-column might break a |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
349 ;; tab into spaces, and the new characters introduced |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
350 ;; there shouldn't be deleted. |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
351 |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
352 ;; If you can see a better way to do this, please make |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
353 ;; the change. This seems very messy to me. |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
354 (delete-region (progn (move-to-column line-width) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
355 (point)) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
356 (progn (end-of-line) (point)))))))) |
e0463f021e2f
* c-mode.el (c-fill-paragraph): Calculating the proper fill-prefix
Jim Blandy <jimb@redhat.com>
parents:
1662
diff
changeset
|
357 |
453 | 358 (paragraph-start |
359 ;; Lines containing just a comment start or just an end | |
360 ;; should not be filled into paragraphs they are next to. | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1804
diff
changeset
|
361 (concat |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1804
diff
changeset
|
362 paragraph-start |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1804
diff
changeset
|
363 "\\|^[ \t]*/\\*[ \t]*$\\|^[ \t]*\\*/[ \t]*$\\|^[ \t/*]*$")) |
453 | 364 (paragraph-separate |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1804
diff
changeset
|
365 (concat |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1804
diff
changeset
|
366 paragraph-separate |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1804
diff
changeset
|
367 "\\|^[ \t]*/\\*[ \t]*$\\|^[ \t]*\\*/[ \t]*$\\|^[ \t/*]*$")) |
1181
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
368 (chars-to-delete 0)) |
453 | 369 (save-restriction |
370 ;; Don't fill the comment together with the code following it. | |
1086
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
371 ;; So temporarily exclude everything before the comment start, |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
372 ;; and everything after the line where the comment ends. |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
373 ;; If comment-start-place is non-nil, the comment starter is there. |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
374 ;; Otherwise, point is inside the comment. |
1181
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
375 (narrow-to-region (save-excursion |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
376 (if comment-start-place |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
377 (goto-char comment-start-place) |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
378 (search-backward "/*")) |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
379 ;; Protect text before the comment start |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
380 ;; by excluding it. Add spaces to bring back |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
381 ;; proper indentation of that point. |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
382 (let ((column (current-column))) |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
383 (prog1 (point) |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
384 (setq chars-to-delete column) |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
385 (insert-char ?\ column)))) |
453 | 386 (save-excursion |
1086
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
387 (if comment-start-place |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
388 (goto-char (+ comment-start-place 2))) |
453 | 389 (search-forward "*/" nil 'move) |
390 (forward-line 1) | |
391 (point))) | |
1181
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
392 |
453 | 393 (fill-paragraph arg) |
394 (save-excursion | |
1181
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
395 ;; Delete the chars we inserted to avoid clobbering |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
396 ;; the stuff before the comment start. |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
397 (goto-char (point-min)) |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
398 (if (> chars-to-delete 0) |
5897b220ad8e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1177
diff
changeset
|
399 (delete-region (point) (+ (point) chars-to-delete))) |
1086
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
400 ;; Find the comment ender (should be on last line of buffer, |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
401 ;; given the narrowing) and don't leave it on its own line. |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
402 (goto-char (point-max)) |
273918bf0a95
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1081
diff
changeset
|
403 (forward-line -1) |
1662
ee7f627ef26e
Fri Dec 4 00:31:30 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1661
diff
changeset
|
404 (search-forward "*/" nil 'move) |
453 | 405 (beginning-of-line) |
406 (if (looking-at "[ \t]*\\*/") | |
407 (delete-indentation))))) | |
408 ;; Outside of comments: do ordinary filling. | |
409 (fill-paragraph arg)))) | |
410 | |
411 (defun electric-c-brace (arg) | |
412 "Insert character and correct line's indentation." | |
413 (interactive "P") | |
414 (let (insertpos) | |
415 (if (and (not arg) | |
416 (eolp) | |
417 (or (save-excursion | |
418 (skip-chars-backward " \t") | |
419 (bolp)) | |
420 (if c-auto-newline (progn (c-indent-line) (newline) t) nil))) | |
421 (progn | |
422 (insert last-command-char) | |
423 (c-indent-line) | |
424 (if c-auto-newline | |
425 (progn | |
426 (newline) | |
427 ;; (newline) may have done auto-fill | |
428 (setq insertpos (- (point) 2)) | |
429 (c-indent-line))) | |
430 (save-excursion | |
431 (if insertpos (goto-char (1+ insertpos))) | |
432 (delete-char -1)))) | |
433 (if insertpos | |
434 (save-excursion | |
435 (goto-char insertpos) | |
436 (self-insert-command (prefix-numeric-value arg))) | |
437 (self-insert-command (prefix-numeric-value arg))))) | |
438 | |
439 (defun electric-c-sharp-sign (arg) | |
440 "Insert character and correct line's indentation." | |
441 (interactive "P") | |
442 (if (save-excursion | |
443 (skip-chars-backward " \t") | |
444 (bolp)) | |
445 (let ((c-auto-newline nil)) | |
446 (electric-c-terminator arg)) | |
447 (self-insert-command (prefix-numeric-value arg)))) | |
448 | |
449 (defun electric-c-semi (arg) | |
450 "Insert character and correct line's indentation." | |
451 (interactive "P") | |
452 (if c-auto-newline | |
453 (electric-c-terminator arg) | |
454 (self-insert-command (prefix-numeric-value arg)))) | |
455 | |
456 (defun electric-c-terminator (arg) | |
457 "Insert character and correct line's indentation." | |
458 (interactive "P") | |
459 (let (insertpos (end (point))) | |
460 (if (and (not arg) (eolp) | |
461 (not (save-excursion | |
462 (beginning-of-line) | |
463 (skip-chars-forward " \t") | |
464 (or (= (following-char) ?#) | |
465 ;; Colon is special only after a label, or case .... | |
466 ;; So quickly rule out most other uses of colon | |
467 ;; and do no indentation for them. | |
468 (and (eq last-command-char ?:) | |
1804
fe2bebf150c7
* c-mode.el (c-switch-label-regexp): New constant.
Jim Blandy <jimb@redhat.com>
parents:
1701
diff
changeset
|
469 (not (looking-at c-switch-label-regexp)) |
453 | 470 (save-excursion |
471 (skip-chars-forward "a-zA-Z0-9_$") | |
472 (skip-chars-forward " \t") | |
473 (< (point) end))) | |
474 (progn | |
475 (beginning-of-defun) | |
476 (let ((pps (parse-partial-sexp (point) end))) | |
477 (or (nth 3 pps) (nth 4 pps) (nth 5 pps)))))))) | |
478 (progn | |
479 (insert last-command-char) | |
480 (c-indent-line) | |
481 (and c-auto-newline | |
482 (not (c-inside-parens-p)) | |
483 (progn | |
484 (newline) | |
485 ;; (newline) may have done auto-fill | |
486 (setq insertpos (- (point) 2)) | |
487 (c-indent-line))) | |
488 (save-excursion | |
489 (if insertpos (goto-char (1+ insertpos))) | |
490 (delete-char -1)))) | |
491 (if insertpos | |
492 (save-excursion | |
493 (goto-char insertpos) | |
494 (self-insert-command (prefix-numeric-value arg))) | |
495 (self-insert-command (prefix-numeric-value arg))))) | |
496 | |
497 (defun c-inside-parens-p () | |
498 (condition-case () | |
499 (save-excursion | |
500 (save-restriction | |
501 (narrow-to-region (point) | |
502 (progn (beginning-of-defun) (point))) | |
503 (goto-char (point-max)) | |
504 (= (char-after (or (scan-lists (point) -1 1) (point-min))) ?\())) | |
505 (error nil))) | |
506 | |
507 (defun c-indent-command (&optional whole-exp) | |
508 "Indent current line as C code, or in some cases insert a tab character. | |
509 If `c-tab-always-indent' is non-nil (the default), always indent current line. | |
510 Otherwise, indent the current line only if point is at the left margin or | |
511 in the line's indentation; otherwise insert a tab. | |
512 | |
513 A numeric argument, regardless of its value, means indent rigidly all the | |
514 lines of the expression starting after point so that this line becomes | |
515 properly indented. The relative indentation among the lines of the | |
516 expression are preserved." | |
517 (interactive "P") | |
518 (if whole-exp | |
519 ;; If arg, always indent this line as C | |
520 ;; and shift remaining lines of expression the same amount. | |
521 (let ((shift-amt (c-indent-line)) | |
522 beg end) | |
523 (save-excursion | |
524 (if c-tab-always-indent | |
525 (beginning-of-line)) | |
526 ;; Find beginning of following line. | |
527 (save-excursion | |
528 (forward-line 1) (setq beg (point))) | |
529 ;; Find first beginning-of-sexp for sexp extending past this line. | |
530 (while (< (point) beg) | |
531 (forward-sexp 1) | |
532 (setq end (point)) | |
533 (skip-chars-forward " \t\n"))) | |
534 (if (> end beg) | |
535 (indent-code-rigidly beg end shift-amt "#"))) | |
536 (if (and (not c-tab-always-indent) | |
537 (save-excursion | |
538 (skip-chars-backward " \t") | |
539 (not (bolp)))) | |
540 (insert-tab) | |
541 (c-indent-line)))) | |
542 | |
543 (defun c-indent-line () | |
544 "Indent current line as C code. | |
545 Return the amount the indentation changed by." | |
546 (let ((indent (calculate-c-indent nil)) | |
547 beg shift-amt | |
548 (case-fold-search nil) | |
549 (pos (- (point-max) (point)))) | |
550 (beginning-of-line) | |
551 (setq beg (point)) | |
552 (cond ((eq indent nil) | |
553 (setq indent (current-indentation))) | |
554 ((eq indent t) | |
555 (setq indent (calculate-c-indent-within-comment))) | |
556 ((looking-at "[ \t]*#") | |
557 (setq indent 0)) | |
558 (t | |
559 (skip-chars-forward " \t") | |
560 (if (listp indent) (setq indent (car indent))) | |
1804
fe2bebf150c7
* c-mode.el (c-switch-label-regexp): New constant.
Jim Blandy <jimb@redhat.com>
parents:
1701
diff
changeset
|
561 (cond ((or (looking-at c-switch-label-regexp) |
453 | 562 (and (looking-at "[A-Za-z]") |
563 (save-excursion | |
564 (forward-sexp 1) | |
565 (looking-at ":")))) | |
566 (setq indent (max 1 (+ indent c-label-offset)))) | |
567 ((and (looking-at "else\\b") | |
568 (not (looking-at "else\\s_"))) | |
569 (setq indent (save-excursion | |
570 (c-backward-to-start-of-if) | |
571 (current-indentation)))) | |
572 ((looking-at "}[ \t]*else") | |
573 (setq indent (save-excursion | |
574 (forward-char) | |
575 (backward-sexp) | |
3716
c8af07496d54
(c-indent-line): Call c-backward-to-start-of-if
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
576 (c-backward-to-start-of-if) |
453 | 577 (current-indentation)))) |
578 ((and (looking-at "while\\b") | |
579 (save-excursion | |
580 (c-backward-to-start-of-do))) | |
581 ;; This is a `while' that ends a do-while. | |
582 (setq indent (save-excursion | |
583 (c-backward-to-start-of-do) | |
584 (current-indentation)))) | |
585 ((= (following-char) ?}) | |
586 (setq indent (- indent c-indent-level))) | |
587 ((= (following-char) ?{) | |
588 (setq indent (+ indent c-brace-offset)))))) | |
589 (skip-chars-forward " \t") | |
590 (setq shift-amt (- indent (current-column))) | |
591 (if (zerop shift-amt) | |
592 (if (> (- (point-max) pos) (point)) | |
593 (goto-char (- (point-max) pos))) | |
594 (delete-region beg (point)) | |
595 (indent-to indent) | |
596 ;; If initial point was within line's indentation, | |
597 ;; position after the indentation. Else stay at same point in text. | |
598 (if (> (- (point-max) pos) (point)) | |
599 (goto-char (- (point-max) pos)))) | |
600 shift-amt)) | |
601 | |
602 (defun calculate-c-indent (&optional parse-start) | |
603 "Return appropriate indentation for current line as C code. | |
604 In usual case returns an integer: the column to indent to. | |
605 Returns nil if line starts inside a string, t if in a comment." | |
606 (save-excursion | |
607 (beginning-of-line) | |
608 (let ((indent-point (point)) | |
609 (case-fold-search nil) | |
610 state | |
611 containing-sexp) | |
612 (if parse-start | |
613 (goto-char parse-start) | |
614 (beginning-of-defun)) | |
615 (while (< (point) indent-point) | |
616 (setq parse-start (point)) | |
617 (setq state (parse-partial-sexp (point) indent-point 0)) | |
618 (setq containing-sexp (car (cdr state)))) | |
619 (cond ((or (nth 3 state) (nth 4 state)) | |
620 ;; return nil or t if should not change this line | |
621 (nth 4 state)) | |
622 ((null containing-sexp) | |
623 ;; Line is at top level. May be data or function definition, | |
624 ;; or may be function argument declaration. | |
625 ;; Indent like the previous top level line | |
626 ;; unless that ends in a closeparen without semicolon, | |
627 ;; in which case this line is the first argument decl. | |
628 (goto-char indent-point) | |
629 (skip-chars-forward " \t") | |
630 (if (= (following-char) ?{) | |
631 0 ; Unless it starts a function body | |
632 (c-backward-to-noncomment (or parse-start (point-min))) | |
633 ;; Look at previous line that's at column 0 | |
634 ;; to determine whether we are in top-level decls | |
635 ;; or function's arg decls. Set basic-indent accordingly. | |
636 (let ((basic-indent | |
637 (save-excursion | |
638 (re-search-backward "^[^ \^L\t\n#]" nil 'move) | |
759
58b7fc91b74a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
662
diff
changeset
|
639 (let (comment lim) |
1064
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
640 ;; Recognize the DEFUN macro in Emacs. |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
641 (if (save-excursion |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
642 ;; Move down to the (putative) argnames line. |
1184 | 643 (while (and (not (eobp)) |
644 (not (looking-at " *[({}#/]"))) | |
1064
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
645 (forward-line 1)) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
646 ;; Go back to the DEFUN, if it is one. |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
647 (condition-case nil |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
648 (backward-sexp 1) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
649 (error)) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
650 (beginning-of-line) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
651 (looking-at "DEFUN\\b")) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
652 c-argdecl-indent |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
653 (if (and (looking-at "\\sw\\|\\s_") |
1205
56d315ca10ee
(calculate-c-indent): When testing for function-start line,
Richard M. Stallman <rms@gnu.org>
parents:
1184
diff
changeset
|
654 ;; This is careful to stop at the first |
56d315ca10ee
(calculate-c-indent): When testing for function-start line,
Richard M. Stallman <rms@gnu.org>
parents:
1184
diff
changeset
|
655 ;; paren if we have |
56d315ca10ee
(calculate-c-indent): When testing for function-start line,
Richard M. Stallman <rms@gnu.org>
parents:
1184
diff
changeset
|
656 ;; int foo Proto ((int, int)); |
56d315ca10ee
(calculate-c-indent): When testing for function-start line,
Richard M. Stallman <rms@gnu.org>
parents:
1184
diff
changeset
|
657 (looking-at "[^\"\n=(]*(") |
1064
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
658 (progn |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
659 (goto-char (1- (match-end 0))) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
660 (setq lim (point)) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
661 (condition-case nil |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
662 (forward-sexp 1) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
663 (error)) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
664 (skip-chars-forward " \t\f") |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
665 (and (< (point) indent-point) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
666 (not (memq (following-char) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
667 '(?\, ?\;))))) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
668 ;; Make sure the "function decl" we found |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
669 ;; is not inside a comment. |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
670 (progn |
4333
c356a81e1a46
(calculate-c-indent): When checking whether function decl
Richard M. Stallman <rms@gnu.org>
parents:
4286
diff
changeset
|
671 ;; Move back to the `(' starting arglist |
c356a81e1a46
(calculate-c-indent): When checking whether function decl
Richard M. Stallman <rms@gnu.org>
parents:
4286
diff
changeset
|
672 (goto-char lim) |
1064
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
673 (beginning-of-line) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
674 (while (and (not comment) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
675 (search-forward "/*" lim t)) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
676 (setq comment |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
677 (not (search-forward "*/" lim t)))) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
678 (not comment))) |
e699ce19609f
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1054
diff
changeset
|
679 c-argdecl-indent 0)))))) |
453 | 680 basic-indent))) |
681 | |
682 ;; ;; Now add a little if this is a continuation line. | |
683 ;; (+ basic-indent (if (or (bobp) | |
684 ;; (memq (preceding-char) '(?\) ?\; ?\})) | |
685 ;; ;; Line with zero indentation | |
686 ;; ;; is probably the return-type | |
687 ;; ;; of a function definition, | |
688 ;; ;; so following line is function name. | |
689 ;; (= (current-indentation) 0)) | |
690 ;; 0 c-continued-statement-offset)) | |
691 | |
692 ((/= (char-after containing-sexp) ?{) | |
693 ;; line is expression, not statement: | |
694 ;; indent to just after the surrounding open. | |
695 (goto-char (1+ containing-sexp)) | |
696 (current-column)) | |
697 (t | |
698 ;; Statement level. Is it a continuation or a new statement? | |
699 ;; Find previous non-comment character. | |
700 (goto-char indent-point) | |
701 (c-backward-to-noncomment containing-sexp) | |
702 ;; Back up over label lines, since they don't | |
703 ;; affect whether our line is a continuation. | |
704 (while (or (eq (preceding-char) ?\,) | |
705 (and (eq (preceding-char) ?:) | |
706 (or (eq (char-after (- (point) 2)) ?\') | |
707 (memq (char-syntax (char-after (- (point) 2))) | |
708 '(?w ?_))))) | |
709 (if (eq (preceding-char) ?\,) | |
710 (progn (forward-char -1) | |
711 (c-backward-to-start-of-continued-exp containing-sexp))) | |
712 (beginning-of-line) | |
713 (c-backward-to-noncomment containing-sexp)) | |
714 ;; Check for a preprocessor statement or its continuation lines. | |
715 ;; Move back to end of previous non-preprocessor line. | |
716 (let ((found (point)) stop) | |
717 (while (not stop) | |
718 (cond ((save-excursion (end-of-line 0) | |
719 (= (preceding-char) ?\\)) | |
720 (end-of-line 0)) | |
721 ;; This line is not preceded by a backslash. | |
722 ;; So either it starts a preprocessor command | |
723 ;; or any following continuation lines | |
724 ;; should not be skipped. | |
725 ((progn (beginning-of-line) (= (following-char) ?#)) | |
726 (end-of-line 0) | |
727 (setq found (point))) | |
728 (t (setq stop t)))) | |
729 (goto-char found)) | |
730 ;; Now we get the answer. | |
731 (if (and (not (memq (preceding-char) '(nil ?\, ?\; ?\} ?\{))) | |
732 ;; But don't treat a line with a close-brace | |
733 ;; as a continuation. It is probably the | |
734 ;; end of an enum type declaration. | |
735 (save-excursion | |
736 (goto-char indent-point) | |
737 (skip-chars-forward " \t") | |
738 (not (= (following-char) ?})))) | |
739 ;; This line is continuation of preceding line's statement; | |
740 ;; indent c-continued-statement-offset more than the | |
741 ;; previous line of the statement. | |
742 (progn | |
743 (c-backward-to-start-of-continued-exp containing-sexp) | |
744 (+ c-continued-statement-offset (current-column) | |
745 (if (save-excursion (goto-char indent-point) | |
746 (skip-chars-forward " \t") | |
747 (eq (following-char) ?{)) | |
748 c-continued-brace-offset 0))) | |
749 ;; This line starts a new statement. | |
750 ;; Position following last unclosed open. | |
751 (goto-char containing-sexp) | |
752 ;; Is line first statement after an open-brace? | |
753 (or | |
754 ;; If no, find that first statement and indent like it. | |
755 (save-excursion | |
756 (forward-char 1) | |
757 (let ((colon-line-end 0)) | |
758 (while (progn (skip-chars-forward " \t\n") | |
759 (looking-at "#\\|/\\*\\|case[ \t\n'/(].*:\\|[a-zA-Z0-9_$]*:")) | |
760 ;; Skip over comments and labels following openbrace. | |
761 (cond ((= (following-char) ?\#) | |
762 (forward-line 1)) | |
763 ((= (following-char) ?\/) | |
764 (forward-char 2) | |
765 (search-forward "*/" nil 'move)) | |
766 ;; case or label: | |
767 (t | |
768 (save-excursion (end-of-line) | |
769 (setq colon-line-end (point))) | |
770 (search-forward ":")))) | |
771 ;; The first following code counts | |
772 ;; if it is before the line we want to indent. | |
773 (and (< (point) indent-point) | |
1054
f6f13367d93c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
909
diff
changeset
|
774 (- |
f6f13367d93c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
909
diff
changeset
|
775 (if (> colon-line-end (point)) |
f6f13367d93c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
909
diff
changeset
|
776 (- (current-indentation) c-label-offset) |
f6f13367d93c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
909
diff
changeset
|
777 (current-column)) |
f6f13367d93c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
909
diff
changeset
|
778 ;; If prev stmt starts with open-brace, that |
f6f13367d93c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
909
diff
changeset
|
779 ;; open brace was offset by c-brace-offset. |
f6f13367d93c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
909
diff
changeset
|
780 ;; Compensate to get the column where |
f6f13367d93c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
909
diff
changeset
|
781 ;; an ordinary statement would start. |
f6f13367d93c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
909
diff
changeset
|
782 (if (= (following-char) ?\{) c-brace-offset 0))))) |
453 | 783 ;; If no previous statement, |
784 ;; indent it relative to line brace is on. | |
785 ;; For open brace in column zero, don't let statement | |
786 ;; start there too. If c-indent-level is zero, | |
787 ;; use c-brace-offset + c-continued-statement-offset instead. | |
788 ;; For open-braces not the first thing in a line, | |
789 ;; add in c-brace-imaginary-offset. | |
790 (+ (if (and (bolp) (zerop c-indent-level)) | |
791 (+ c-brace-offset c-continued-statement-offset) | |
792 c-indent-level) | |
793 ;; Move back over whitespace before the openbrace. | |
794 ;; If openbrace is not first nonwhite thing on the line, | |
795 ;; add the c-brace-imaginary-offset. | |
796 (progn (skip-chars-backward " \t") | |
797 (if (bolp) 0 c-brace-imaginary-offset)) | |
798 ;; If the openbrace is preceded by a parenthesized exp, | |
799 ;; move to the beginning of that; | |
800 ;; possibly a different line | |
801 (progn | |
802 (if (eq (preceding-char) ?\)) | |
803 (forward-sexp -1)) | |
804 ;; Get initial indentation of the line we are on. | |
805 (current-indentation)))))))))) | |
806 | |
807 (defun calculate-c-indent-within-comment (&optional after-star) | |
808 "Return the indentation amount for line inside a block comment. | |
809 Optional arg AFTER-STAR means, if lines in the comment have a leading star, | |
810 return the indentation of the text that would follow this star." | |
811 (let (end star-start) | |
812 (save-excursion | |
813 (beginning-of-line) | |
814 (skip-chars-forward " \t") | |
815 (setq star-start (= (following-char) ?\*)) | |
816 (skip-chars-backward " \t\n") | |
817 (setq end (point)) | |
818 (beginning-of-line) | |
819 (skip-chars-forward " \t") | |
820 (if after-star | |
821 (and (looking-at "\\*") | |
822 (re-search-forward "\\*[ \t]*"))) | |
823 (and (re-search-forward "/\\*[ \t]*" end t) | |
824 star-start | |
825 (not after-star) | |
826 (goto-char (1+ (match-beginning 0)))) | |
827 (if (and (looking-at "[ \t]*$") (= (preceding-char) ?\*)) | |
828 (1+ (current-column)) | |
829 (current-column))))) | |
830 | |
831 | |
832 (defun c-backward-to-noncomment (lim) | |
833 (let (opoint stop) | |
834 (while (not stop) | |
835 (skip-chars-backward " \t\n\f" lim) | |
836 (setq opoint (point)) | |
837 (if (and (>= (point) (+ 2 lim)) | |
838 (save-excursion | |
839 (forward-char -2) | |
840 (looking-at "\\*/"))) | |
841 (search-backward "/*" lim 'move) | |
842 (setq stop (or (<= (point) lim) | |
843 (save-excursion | |
844 (beginning-of-line) | |
845 (skip-chars-forward " \t") | |
846 (not (looking-at "#"))))) | |
847 (or stop (beginning-of-line)))))) | |
848 | |
849 (defun c-backward-to-start-of-continued-exp (lim) | |
850 (if (memq (preceding-char) '(?\) ?\")) | |
851 (forward-sexp -1)) | |
852 (beginning-of-line) | |
853 (if (<= (point) lim) | |
854 (goto-char (1+ lim))) | |
855 (skip-chars-forward " \t")) | |
856 | |
857 (defun c-backward-to-start-of-if (&optional limit) | |
858 "Move to the start of the last \"unbalanced\" `if'." | |
859 (or limit (setq limit (save-excursion (beginning-of-defun) (point)))) | |
860 (let ((if-level 1) | |
861 (case-fold-search nil)) | |
862 (while (and (not (bobp)) (not (zerop if-level))) | |
863 (backward-sexp 1) | |
864 (cond ((looking-at "else\\b") | |
865 (setq if-level (1+ if-level))) | |
866 ((looking-at "if\\b") | |
867 (setq if-level (1- if-level))) | |
868 ((< (point) limit) | |
869 (setq if-level 0) | |
870 (goto-char limit)))))) | |
871 | |
872 (defun c-backward-to-start-of-do (&optional limit) | |
873 "If point follows a `do' statement, move to beginning of it and return t. | |
874 Otherwise return nil and don't move point." | |
875 (or limit (setq limit (save-excursion (beginning-of-defun) (point)))) | |
876 (let ((first t) | |
877 (startpos (point)) | |
878 (done nil)) | |
879 (while (not done) | |
880 (let ((next-start (point))) | |
881 (condition-case nil | |
882 ;; Move back one token or one brace or paren group. | |
883 (backward-sexp 1) | |
884 ;; If we find an open-brace, we lose. | |
885 (error (setq done 'fail))) | |
886 (if done | |
887 nil | |
888 ;; If we reached a `do', we win. | |
889 (if (looking-at "do\\b") | |
890 (setq done 'succeed) | |
891 ;; Otherwise, if we skipped a semicolon, we lose. | |
892 ;; (Exception: we can skip one semicolon before getting | |
893 ;; to a the last token of the statement, unless that token | |
894 ;; is a close brace.) | |
895 (if (save-excursion | |
896 (forward-sexp 1) | |
897 (or (and (not first) (= (preceding-char) ?})) | |
898 (search-forward ";" next-start t | |
899 (if (and first | |
900 (/= (preceding-char) ?})) | |
901 2 1)))) | |
902 (setq done 'fail) | |
903 (setq first nil) | |
904 ;; If we go too far back in the buffer, we lose. | |
905 (if (< (point) limit) | |
906 (setq done 'fail))))))) | |
907 (if (eq done 'succeed) | |
908 t | |
909 (goto-char startpos) | |
910 nil))) | |
911 | |
912 (defun c-beginning-of-statement (count) | |
913 "Go to the beginning of the innermost C statement. | |
914 With prefix arg, go back N - 1 statements. If already at the beginning of a | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3256
diff
changeset
|
915 statement then go to the beginning of the preceding one. |
2084
9561d2584cbb
(c-beginning-of-statement): If next to a comment, use sentence motion.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
916 If within a string or comment, or next to a comment (only whitespace between), |
9561d2584cbb
(c-beginning-of-statement): If next to a comment, use sentence motion.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
917 move by sentences instead of statements." |
453 | 918 (interactive "p") |
871
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
919 (let ((here (point)) state) |
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
920 (save-excursion |
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
921 (beginning-of-defun) |
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
922 (setq state (parse-partial-sexp (point) here nil nil))) |
2084
9561d2584cbb
(c-beginning-of-statement): If next to a comment, use sentence motion.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
923 (if (or (nth 3 state) (nth 4 state) |
9561d2584cbb
(c-beginning-of-statement): If next to a comment, use sentence motion.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
924 (looking-at (concat "[ \t]*" comment-start-skip)) |
9561d2584cbb
(c-beginning-of-statement): If next to a comment, use sentence motion.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
925 (save-excursion (skip-chars-backward " \t") |
9561d2584cbb
(c-beginning-of-statement): If next to a comment, use sentence motion.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
926 (goto-char (- (point) 2)) |
9561d2584cbb
(c-beginning-of-statement): If next to a comment, use sentence motion.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
927 (looking-at "\\*/"))) |
871
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
928 (forward-sentence (- count)) |
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
929 (while (> count 0) |
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
930 (c-beginning-of-statement-1) |
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
931 (setq count (1- count))) |
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
932 (while (< count 0) |
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
933 (c-end-of-statement-1) |
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
934 (setq count (1+ count)))))) |
453 | 935 |
936 (defun c-end-of-statement (count) | |
937 "Go to the end of the innermost C statement. | |
871
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
938 With prefix arg, go forward N - 1 statements. |
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
939 Move forward to end of the next statement if already at end. |
34b6b37092c7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
861
diff
changeset
|
940 If within a string or comment, move by sentences instead of statements." |
453 | 941 (interactive "p") |
942 (c-beginning-of-statement (- count))) | |
943 | |
944 (defun c-beginning-of-statement-1 () | |
945 (let ((last-begin (point)) | |
946 (first t)) | |
947 (condition-case () | |
948 (progn | |
949 (while (and (not (bobp)) | |
950 (progn | |
951 (backward-sexp 1) | |
952 (or first | |
953 (not (re-search-forward "[;{}]" last-begin t))))) | |
954 (setq last-begin (point) first nil)) | |
955 (goto-char last-begin)) | |
956 (error (if first (backward-up-list 1) (goto-char last-begin)))))) | |
957 | |
958 (defun c-end-of-statement-1 () | |
959 (condition-case () | |
960 (progn | |
961 (while (and (not (eobp)) | |
962 (let ((beg (point))) | |
963 (forward-sexp 1) | |
964 (let ((end (point))) | |
965 (save-excursion | |
966 (goto-char beg) | |
967 (not (re-search-forward "[;{}]" end t))))))) | |
968 (re-search-backward "[;}]") | |
969 (forward-char 1)) | |
970 (error | |
971 (let ((beg (point))) | |
972 (backward-up-list -1) | |
973 (let ((end (point))) | |
974 (goto-char beg) | |
975 (search-forward ";" end 'move)))))) | |
976 | |
977 (defun mark-c-function () | |
978 "Put mark at end of C function, point at beginning." | |
979 (interactive) | |
980 (push-mark (point)) | |
981 (end-of-defun) | |
2829
688e57a7ade8
(mark-c-function): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
982 (push-mark (point) nil t) |
453 | 983 (beginning-of-defun) |
984 (backward-paragraph)) | |
985 | |
4419
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
986 ;; Idea of ENDPOS is, indent each line, stopping when |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
987 ;; ENDPOS is encountered. But it's too much of a pain to make that work. |
453 | 988 (defun indent-c-exp (&optional endpos) |
4419
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
989 "Indent each line of the C grouping following point." |
453 | 990 (interactive) |
991 (let* ((indent-stack (list nil)) | |
992 (opoint (point)) ;; May be altered below. | |
993 (contain-stack | |
994 (list (if endpos | |
995 (let (funbeg) | |
996 ;; Find previous fcn-start. | |
997 (save-excursion (forward-char 1) | |
998 (beginning-of-defun) | |
999 (setq funbeg (point))) | |
4201
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1000 (setq opoint funbeg) |
453 | 1001 ;; Try to find containing open, |
1002 ;; but don't scan past that fcn-start. | |
1003 (save-restriction | |
1004 (narrow-to-region funbeg (point)) | |
1005 (condition-case nil | |
1006 (save-excursion | |
4201
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1007 (backward-up-list 1) |
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1008 (point)) |
453 | 1009 ;; We gave up: must be between fcns. |
1010 ;; Set opoint to beg of prev fcn | |
1011 ;; since otherwise calculate-c-indent | |
1012 ;; will get wrong answers. | |
1013 (error (setq opoint funbeg) | |
1014 (point))))) | |
1015 (point)))) | |
1016 (case-fold-search nil) | |
1017 restart outer-loop-done inner-loop-done state ostate | |
1018 this-indent last-sexp | |
1019 at-else at-brace at-while | |
4286
d719788a0aaa
(indent-c-exp): When previous line ends in comma,
Richard M. Stallman <rms@gnu.org>
parents:
4202
diff
changeset
|
1020 last-depth this-point |
453 | 1021 (next-depth 0)) |
1022 ;; If the braces don't match, get an error right away. | |
1023 (save-excursion | |
1024 (forward-sexp 1)) | |
1025 ;; Realign the comment on the first line, even though we don't reindent it. | |
1026 (save-excursion | |
1027 (let ((beg (point))) | |
1028 (and (re-search-forward | |
1029 comment-start-skip | |
1030 (save-excursion (end-of-line) (point)) t) | |
4201
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1031 ;; Make sure this isn't a comment alone on a line |
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1032 ;; (which should be indented like code instead). |
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1033 (save-excursion |
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1034 (goto-char (match-beginning 0)) |
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1035 (skip-chars-backward " \t") |
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1036 (not (bolp))) |
453 | 1037 ;; Make sure the comment starter we found |
1038 ;; is not actually in a string or quoted. | |
1039 (let ((new-state | |
1040 (parse-partial-sexp beg (point) | |
1041 nil nil state))) | |
1042 (and (not (nth 3 new-state)) (not (nth 5 new-state)))) | |
1043 (progn (indent-for-comment) (beginning-of-line))))) | |
1044 (save-excursion | |
1045 (setq outer-loop-done nil) | |
1046 (while (and (not (eobp)) | |
1047 (if endpos (< (point) endpos) | |
1048 (not outer-loop-done))) | |
1049 (setq last-depth next-depth) | |
1050 ;; Compute how depth changes over this line | |
1051 ;; plus enough other lines to get to one that | |
1052 ;; does not end inside a comment or string. | |
1053 ;; Meanwhile, do appropriate indentation on comment lines. | |
1054 (setq inner-loop-done nil) | |
1055 (while (and (not inner-loop-done) | |
1056 (not (and (eobp) (setq outer-loop-done t)))) | |
1057 (setq ostate state) | |
1058 (setq state (parse-partial-sexp (point) (progn (end-of-line) (point)) | |
1059 nil nil state)) | |
1060 (setq next-depth (car state)) | |
1061 (if (and (car (cdr (cdr state))) | |
1062 (>= (car (cdr (cdr state))) 0)) | |
1063 (setq last-sexp (car (cdr (cdr state))))) | |
4286
d719788a0aaa
(indent-c-exp): When previous line ends in comma,
Richard M. Stallman <rms@gnu.org>
parents:
4202
diff
changeset
|
1064 ;; If this line started within a comment, indent it as such. |
d719788a0aaa
(indent-c-exp): When previous line ends in comma,
Richard M. Stallman <rms@gnu.org>
parents:
4202
diff
changeset
|
1065 (if (or (nth 4 ostate) (nth 7 ostate)) |
453 | 1066 (c-indent-line)) |
4286
d719788a0aaa
(indent-c-exp): When previous line ends in comma,
Richard M. Stallman <rms@gnu.org>
parents:
4202
diff
changeset
|
1067 ;; If it ends outside of comments or strings, exit the inner loop. |
d719788a0aaa
(indent-c-exp): When previous line ends in comma,
Richard M. Stallman <rms@gnu.org>
parents:
4202
diff
changeset
|
1068 ;; Otherwise move on to next line. |
d719788a0aaa
(indent-c-exp): When previous line ends in comma,
Richard M. Stallman <rms@gnu.org>
parents:
4202
diff
changeset
|
1069 (if (or (nth 3 state) (nth 4 state) (nth 7 state)) |
453 | 1070 (forward-line 1) |
1071 (setq inner-loop-done t))) | |
1072 (and endpos | |
1073 (while (< next-depth 0) | |
1074 (setq indent-stack (append indent-stack (list nil))) | |
1075 (setq contain-stack (append contain-stack (list nil))) | |
1076 (setq next-depth (1+ next-depth)) | |
1077 (setq last-depth (1+ last-depth)) | |
1078 (setcar (nthcdr 6 state) (1+ (nth 6 state))))) | |
1079 (setq outer-loop-done (and (not endpos) (<= next-depth 0))) | |
1080 (if outer-loop-done | |
1081 nil | |
1082 ;; If this line had ..))) (((.. in it, pop out of the levels | |
1083 ;; that ended anywhere in this line, even if the final depth | |
1084 ;; doesn't indicate that they ended. | |
1085 (while (> last-depth (nth 6 state)) | |
1086 (setq indent-stack (cdr indent-stack) | |
1087 contain-stack (cdr contain-stack) | |
1088 last-depth (1- last-depth))) | |
1089 (if (/= last-depth next-depth) | |
1090 (setq last-sexp nil)) | |
1091 ;; Add levels for any parens that were started in this line. | |
1092 (while (< last-depth next-depth) | |
1093 (setq indent-stack (cons nil indent-stack) | |
1094 contain-stack (cons nil contain-stack) | |
1095 last-depth (1+ last-depth))) | |
1096 (if (null (car contain-stack)) | |
1097 (setcar contain-stack (or (car (cdr state)) | |
1098 (save-excursion (forward-sexp -1) | |
1099 (point))))) | |
1100 (forward-line 1) | |
1101 (skip-chars-forward " \t") | |
4201
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1102 ;; Don't really reindent if the line is just whitespace, |
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1103 ;; or if it is past the endpos. |
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1104 ;; (The exit test in the outer while |
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1105 ;; does not exit until we have passed the first line |
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1106 ;; past the region.) |
8b53e0fa08b4
(indent-c-exp): If ENDPOS, always set OPOINT
Richard M. Stallman <rms@gnu.org>
parents:
3906
diff
changeset
|
1107 (if (or (eolp) (and endpos (>= (point) endpos))) |
453 | 1108 nil |
1109 (if (and (car indent-stack) | |
1110 (>= (car indent-stack) 0)) | |
1111 ;; Line is on an existing nesting level. | |
1112 ;; Lines inside parens are handled specially. | |
1113 (if (/= (char-after (car contain-stack)) ?{) | |
1114 (setq this-indent (car indent-stack)) | |
1115 ;; Line is at statement level. | |
1116 ;; Is it a new statement? Is it an else? | |
1117 ;; Find last non-comment character before this line | |
1118 (save-excursion | |
4286
d719788a0aaa
(indent-c-exp): When previous line ends in comma,
Richard M. Stallman <rms@gnu.org>
parents:
4202
diff
changeset
|
1119 (setq this-point (point)) |
453 | 1120 (setq at-else (looking-at "else\\W")) |
1121 (setq at-brace (= (following-char) ?{)) | |
1122 (setq at-while (looking-at "while\\b")) | |
1123 (c-backward-to-noncomment opoint) | |
1124 (if (not (memq (preceding-char) '(nil ?\, ?\; ?} ?: ?{))) | |
1125 ;; Preceding line did not end in comma or semi; | |
1126 ;; indent this line c-continued-statement-offset | |
1127 ;; more than previous. | |
1128 (progn | |
1129 (c-backward-to-start-of-continued-exp (car contain-stack)) | |
1130 (setq this-indent | |
1131 (+ c-continued-statement-offset (current-column) | |
1132 (if at-brace c-continued-brace-offset 0)))) | |
1133 ;; Preceding line ended in comma or semi; | |
1134 ;; use the standard indent for this level. | |
1135 (cond (at-else (progn (c-backward-to-start-of-if opoint) | |
1136 (setq this-indent | |
1137 (current-indentation)))) | |
1138 ((and at-while (c-backward-to-start-of-do opoint)) | |
1139 (setq this-indent (current-indentation))) | |
4286
d719788a0aaa
(indent-c-exp): When previous line ends in comma,
Richard M. Stallman <rms@gnu.org>
parents:
4202
diff
changeset
|
1140 ((eq (preceding-char) ?\,) |
d719788a0aaa
(indent-c-exp): When previous line ends in comma,
Richard M. Stallman <rms@gnu.org>
parents:
4202
diff
changeset
|
1141 (goto-char this-point) |
d719788a0aaa
(indent-c-exp): When previous line ends in comma,
Richard M. Stallman <rms@gnu.org>
parents:
4202
diff
changeset
|
1142 (setq this-indent (calculate-c-indent))) |
453 | 1143 (t (setq this-indent (car indent-stack))))))) |
1144 ;; Just started a new nesting level. | |
1145 ;; Compute the standard indent for this level. | |
1146 (let ((val (calculate-c-indent | |
1147 (if (car indent-stack) | |
1148 (- (car indent-stack)) | |
1149 opoint)))) | |
4202
4d0dd361b49a
(indent-c-exp): Call calculate-c-indent-within-comment when appropriate.
Richard M. Stallman <rms@gnu.org>
parents:
4201
diff
changeset
|
1150 ;; t means we are in a block comment and should |
4d0dd361b49a
(indent-c-exp): Call calculate-c-indent-within-comment when appropriate.
Richard M. Stallman <rms@gnu.org>
parents:
4201
diff
changeset
|
1151 ;; calculate accordingly. |
4d0dd361b49a
(indent-c-exp): Call calculate-c-indent-within-comment when appropriate.
Richard M. Stallman <rms@gnu.org>
parents:
4201
diff
changeset
|
1152 (if (eq val t) |
4d0dd361b49a
(indent-c-exp): Call calculate-c-indent-within-comment when appropriate.
Richard M. Stallman <rms@gnu.org>
parents:
4201
diff
changeset
|
1153 (setq val (calculate-c-indent-within-comment))) |
453 | 1154 (setcar indent-stack |
1155 (setq this-indent val)))) | |
1156 ;; Adjust line indentation according to its contents | |
1804
fe2bebf150c7
* c-mode.el (c-switch-label-regexp): New constant.
Jim Blandy <jimb@redhat.com>
parents:
1701
diff
changeset
|
1157 (if (or (looking-at c-switch-label-regexp) |
453 | 1158 (and (looking-at "[A-Za-z]") |
1159 (save-excursion | |
1160 (forward-sexp 1) | |
1161 (looking-at ":")))) | |
1162 (setq this-indent (max 1 (+ this-indent c-label-offset)))) | |
1163 (if (= (following-char) ?}) | |
1164 (setq this-indent (- this-indent c-indent-level))) | |
1165 (if (= (following-char) ?{) | |
4979 | 1166 ;; Don't move an open-brace in column 0. |
1167 ;; This is good when constructs such as | |
1168 ;; `extern "C" {' surround a function definition | |
1169 ;; that should be indented as usual. | |
1170 ;; It is also good for nested functions. | |
1171 ;; It is bad when an open-brace is indented at column 0 | |
1172 ;; and you want to fix that, but we can't win 'em all. | |
4388
c020f9a57cfe
(indent-c-exp): Don't move an { from column 0.
Richard M. Stallman <rms@gnu.org>
parents:
4333
diff
changeset
|
1173 (if (zerop (current-column)) |
c020f9a57cfe
(indent-c-exp): Don't move an { from column 0.
Richard M. Stallman <rms@gnu.org>
parents:
4333
diff
changeset
|
1174 (setq this-indent 0) |
c020f9a57cfe
(indent-c-exp): Don't move an { from column 0.
Richard M. Stallman <rms@gnu.org>
parents:
4333
diff
changeset
|
1175 (setq this-indent (+ this-indent c-brace-offset)))) |
453 | 1176 ;; Don't leave indentation in empty lines. |
1177 (if (eolp) (setq this-indent 0)) | |
1178 ;; Put chosen indentation into effect. | |
1179 (or (= (current-column) this-indent) | |
1180 (= (following-char) ?\#) | |
1181 (progn | |
1182 (delete-region (point) (progn (beginning-of-line) (point))) | |
1183 (indent-to this-indent))) | |
1184 ;; Indent any comment following the text. | |
1185 (or (looking-at comment-start-skip) | |
1186 (let ((beg (point))) | |
1187 (and (re-search-forward | |
1188 comment-start-skip | |
1189 (save-excursion (end-of-line) (point)) t) | |
1190 ;; Make sure the comment starter we found | |
1191 ;; is not actually in a string or quoted. | |
1192 (let ((new-state | |
1193 (parse-partial-sexp beg (point) | |
1194 nil nil state))) | |
1195 (and (not (nth 3 new-state)) (not (nth 5 new-state)))) | |
1196 (progn (indent-for-comment) (beginning-of-line))))))))))) | |
1197 | |
1198 ;; Look at all comment-start strings in the current line after point. | |
1199 ;; Return t if one of them starts a real comment. | |
1200 ;; This is not used yet, because indent-for-comment | |
1201 ;; isn't smart enough to handle the cases this can find. | |
1202 (defun indent-c-find-real-comment () | |
1203 (let (win) | |
1204 (while (and (not win) | |
1205 (re-search-forward comment-start-skip | |
1206 (save-excursion (end-of-line) (point)) | |
1207 t)) | |
1208 ;; Make sure the comment start is not quoted. | |
1209 (let ((state-1 | |
1210 (parse-partial-sexp | |
1211 (save-excursion (beginning-of-line) (point)) | |
1212 (point) nil nil state))) | |
1213 (setq win (and (null (nth 3 state-1)) (null (nth 5 state-1)))))) | |
1214 win)) | |
1215 | |
1216 ;; Indent every line whose first char is between START and END inclusive. | |
1217 (defun c-indent-region (start end) | |
1218 (save-excursion | |
1219 (goto-char start) | |
5137
d11c5909a2d0
(c-indent-region): As first thing, advance to a nonblank line.
Richard M. Stallman <rms@gnu.org>
parents:
5124
diff
changeset
|
1220 ;; Advance to first nonblank line. |
d11c5909a2d0
(c-indent-region): As first thing, advance to a nonblank line.
Richard M. Stallman <rms@gnu.org>
parents:
5124
diff
changeset
|
1221 (skip-chars-forward " \t\n") |
d11c5909a2d0
(c-indent-region): As first thing, advance to a nonblank line.
Richard M. Stallman <rms@gnu.org>
parents:
5124
diff
changeset
|
1222 (beginning-of-line) |
4419
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1223 (let ((endmark (copy-marker end)) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1224 (c-tab-always-indent t)) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1225 (while (and (bolp) (not (eolp))) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1226 ;; Indent one line as with TAB. |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1227 (let ((shift-amt (c-indent-line)) |
4976
a81642d50a8e
(c-indent-region): When looking for a sexp that ends
Richard M. Stallman <rms@gnu.org>
parents:
4419
diff
changeset
|
1228 nextline sexpbeg sexpend) |
4419
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1229 (save-excursion |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1230 ;; Find beginning of following line. |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1231 (save-excursion |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1232 (forward-line 1) (setq nextline (point))) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1233 ;; Find first beginning-of-sexp for sexp extending past this line. |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1234 (beginning-of-line) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1235 (while (< (point) nextline) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1236 (condition-case nil |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1237 (progn |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1238 (forward-sexp 1) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1239 (setq sexpend (point-marker))) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1240 (error (setq sexpend nil) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1241 (goto-char nextline))) |
4976
a81642d50a8e
(c-indent-region): When looking for a sexp that ends
Richard M. Stallman <rms@gnu.org>
parents:
4419
diff
changeset
|
1242 (skip-chars-forward " \t\n")) |
5124
1aba6a79cb3d
(c-indent-region): Don't goto-char sexpend if it's nil.
Richard M. Stallman <rms@gnu.org>
parents:
4979
diff
changeset
|
1243 (if sexpend |
1aba6a79cb3d
(c-indent-region): Don't goto-char sexpend if it's nil.
Richard M. Stallman <rms@gnu.org>
parents:
4979
diff
changeset
|
1244 (progn |
1aba6a79cb3d
(c-indent-region): Don't goto-char sexpend if it's nil.
Richard M. Stallman <rms@gnu.org>
parents:
4979
diff
changeset
|
1245 ;; Make sure the sexp we found really starts on the |
1aba6a79cb3d
(c-indent-region): Don't goto-char sexpend if it's nil.
Richard M. Stallman <rms@gnu.org>
parents:
4979
diff
changeset
|
1246 ;; current line and extends past it. |
1aba6a79cb3d
(c-indent-region): Don't goto-char sexpend if it's nil.
Richard M. Stallman <rms@gnu.org>
parents:
4979
diff
changeset
|
1247 (goto-char sexpend) |
1aba6a79cb3d
(c-indent-region): Don't goto-char sexpend if it's nil.
Richard M. Stallman <rms@gnu.org>
parents:
4979
diff
changeset
|
1248 (backward-sexp 1) |
1aba6a79cb3d
(c-indent-region): Don't goto-char sexpend if it's nil.
Richard M. Stallman <rms@gnu.org>
parents:
4979
diff
changeset
|
1249 (setq sexpbeg (point))))) |
4419
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1250 ;; If that sexp ends within the region, |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1251 ;; indent it all at once, fast. |
4976
a81642d50a8e
(c-indent-region): When looking for a sexp that ends
Richard M. Stallman <rms@gnu.org>
parents:
4419
diff
changeset
|
1252 (if (and sexpend (> sexpend nextline) (<= sexpend endmark) |
a81642d50a8e
(c-indent-region): When looking for a sexp that ends
Richard M. Stallman <rms@gnu.org>
parents:
4419
diff
changeset
|
1253 (< sexpbeg nextline)) |
4419
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1254 (progn |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1255 (indent-c-exp) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1256 (goto-char sexpend))) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1257 ;; Move to following line and try again. |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1258 (and sexpend (set-marker sexpend nil)) |
e7348af6762b
(indent-c-exp): Don't document ENDPOS.
Richard M. Stallman <rms@gnu.org>
parents:
4388
diff
changeset
|
1259 (forward-line 1))) |
453 | 1260 (set-marker endmark nil)))) |
1261 | |
837
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1262 (defun set-c-style (style &optional global) |
453 | 1263 "Set C-mode variables to use one of several different indentation styles. |
837
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1264 The arguments are a string representing the desired style |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1265 and a flag which, if non-nil, means to set the style globally. |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1266 \(Interactively, the flag comes from the prefix argument.) |
861
345296f94a1e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
1267 Available styles are GNU, K&R, BSD and Whitesmith." |
453 | 1268 (interactive (list (completing-read "Use which C indentation style? " |
837
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1269 c-style-alist nil t) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1270 current-prefix-arg)) |
453 | 1271 (let ((vars (cdr (assoc style c-style-alist)))) |
837
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1272 (or vars |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1273 (error "Invalid C indentation style `%s'" style)) |
453 | 1274 (while vars |
837
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1275 (or global |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1276 (make-local-variable (car (car vars)))) |
453 | 1277 (set (car (car vars)) (cdr (car vars))) |
1278 (setq vars (cdr vars))))) | |
837
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1279 |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1280 ;;; This page handles insertion and removal of backslashes for C macros. |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1281 |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1282 (defvar c-backslash-column 48 |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1283 "*Minimum column for end-of-line backslashes of macro definitions.") |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1284 |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1285 (defun c-backslash-region (from to delete-flag) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1286 "Insert, align, or delete end-of-line backslashes on the lines in the region. |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1287 With no argument, inserts backslashes and aligns existing backslashes. |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1288 With an argument, deletes the backslashes. |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1289 |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1290 This function does not modify the last line of the region if the region ends |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1291 right at the start of the following line; it does not modify blank lines |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1292 at the start of the region. So you can put the region around an entire macro |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1293 definition and conveniently use this command." |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1294 (interactive "r\nP") |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1295 (save-excursion |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1296 (goto-char from) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1297 (let ((column c-backslash-column) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1298 (endmark (make-marker))) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1299 (move-marker endmark to) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1300 ;; Compute the smallest column number past the ends of all the lines. |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1301 (if (not delete-flag) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1302 (while (< (point) to) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1303 (end-of-line) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1304 (if (= (preceding-char) ?\\) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1305 (progn (forward-char -1) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1306 (skip-chars-backward " \t"))) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1307 (setq column (max column (1+ (current-column)))) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1308 (forward-line 1))) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1309 ;; Adjust upward to a tab column, if that doesn't push past the margin. |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1310 (if (> (% column tab-width) 0) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1311 (let ((adjusted (* (/ (+ column tab-width -1) tab-width) tab-width))) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1312 (if (< adjusted (window-width)) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1313 (setq column adjusted)))) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1314 ;; Don't modify blank lines at start of region. |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1315 (goto-char from) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1316 (while (and (< (point) endmark) (eolp)) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1317 (forward-line 1)) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1318 ;; Add or remove backslashes on all the lines. |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1319 (while (and (< (point) endmark) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1320 ;; Don't backslashify the last line |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1321 ;; if the region ends right at the start of the next line. |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1322 (save-excursion |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1323 (forward-line 1) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1324 (< (point) endmark))) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1325 (if (not delete-flag) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1326 (c-append-backslash column) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1327 (c-delete-backslash)) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1328 (forward-line 1)) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1329 (move-marker endmark nil)))) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1330 |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1331 (defun c-append-backslash (column) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1332 (end-of-line) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1333 ;; Note that "\\\\" is needed to get one backslash. |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1334 (if (= (preceding-char) ?\\) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1335 (progn (forward-char -1) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1336 (delete-horizontal-space) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1337 (indent-to column)) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1338 (indent-to column) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1339 (insert "\\"))) |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1340 |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1341 (defun c-delete-backslash () |
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
807
diff
changeset
|
1342 (end-of-line) |
5305
1a32c9c9cfbb
(c-delete-backslash): Do nothing if empty line.
Richard M. Stallman <rms@gnu.org>
parents:
5137
diff
changeset
|
1343 (or (bolp) |
1a32c9c9cfbb
(c-delete-backslash): Do nothing if empty line.
Richard M. Stallman <rms@gnu.org>
parents:
5137
diff
changeset
|
1344 (progn |
1a32c9c9cfbb
(c-delete-backslash): Do nothing if empty line.
Richard M. Stallman <rms@gnu.org>
parents:
5137
diff
changeset
|
1345 (forward-char -1) |
1a32c9c9cfbb
(c-delete-backslash): Do nothing if empty line.
Richard M. Stallman <rms@gnu.org>
parents:
5137
diff
changeset
|
1346 (if (looking-at "\\\\") |
1a32c9c9cfbb
(c-delete-backslash): Do nothing if empty line.
Richard M. Stallman <rms@gnu.org>
parents:
5137
diff
changeset
|
1347 (delete-region (1+ (point)) |
1a32c9c9cfbb
(c-delete-backslash): Do nothing if empty line.
Richard M. Stallman <rms@gnu.org>
parents:
5137
diff
changeset
|
1348 (progn (skip-chars-backward " \t") (point))))))) |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1349 |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1350 (defun c-up-conditional (count) |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1351 "Move back to the containing preprocessor conditional, leaving mark behind. |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1352 A prefix argument acts as a repeat count. With a negative argument, |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1353 move forward to the end of the containing preprocessor conditional. |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1354 When going backwards, `#elif' is treated like `#else' followed by `#if'. |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1355 When going forwards, `#elif' is ignored." |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1356 (interactive "p") |
3906
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1357 (c-forward-conditional (- count) t)) |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1358 |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1359 (defun c-backward-conditional (count &optional up-flag) |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1360 "Move back across a preprocessor conditional, leaving mark behind. |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1361 A prefix argument acts as a repeat count. With a negative argument, |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1362 move forward across a preprocessor conditional." |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1363 (interactive "p") |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1364 (c-forward-conditional (- count) up-flag)) |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1365 |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1366 (defun c-forward-conditional (count &optional up-flag) |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1367 "Move forward across a preprocessor conditional, leaving mark behind. |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1368 A prefix argument acts as a repeat count. With a negative argument, |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1369 move backward across a preprocessor conditional." |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1370 (interactive "p") |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1371 (let* ((forward (> count 0)) |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1372 (increment (if forward -1 1)) |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1373 (search-function (if forward 're-search-forward 're-search-backward)) |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1374 (opoint (point)) |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1375 (new)) |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1376 (save-excursion |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1377 (while (/= count 0) |
3906
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1378 (let ((depth (if up-flag 0 -1)) found) |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1379 (save-excursion |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1380 ;; Find the "next" significant line in the proper direction. |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1381 (while (and (not found) |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1382 ;; Rather than searching for a # sign that comes |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1383 ;; at the beginning of a line aside from whitespace, |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1384 ;; search first for a string starting with # sign. |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1385 ;; Then verify what precedes it. |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1386 ;; This is faster on account of the fastmap feature of |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1387 ;; the regexp matcher. |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1388 (funcall search-function |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1389 "#[ \t]*\\(if\\|elif\\|endif\\)" |
3256
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1390 nil t)) |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1391 (beginning-of-line) |
3256
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1392 ;; Now verify it is really a preproc line. |
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1393 (if (looking-at "^[ \t]*#[ \t]*\\(if\\|elif\\|endif\\)") |
3906
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1394 (let ((prev depth)) |
3256
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1395 ;; Update depth according to what we found. |
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1396 (beginning-of-line) |
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1397 (cond ((looking-at "[ \t]*#[ \t]*endif") |
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1398 (setq depth (+ depth increment))) |
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1399 ((looking-at "[ \t]*#[ \t]*elif") |
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1400 (if (and forward (= depth 0)) |
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1401 (setq found (point)))) |
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1402 (t (setq depth (- depth increment)))) |
3906
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1403 ;; If we are trying to move across, and we find |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1404 ;; an end before we find a beginning, get an error. |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1405 (if (and (< prev 0) (< depth prev)) |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1406 (error (if forward |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1407 "No following conditional at this level" |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1408 "No previous conditional at this level"))) |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1409 ;; When searching forward, start from next line |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1410 ;; so that we don't find the same line again. |
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1411 (if forward (forward-line 1)) |
3256
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1412 ;; If this line exits a level of conditional, exit inner loop. |
14eb227cad41
(c-up-conditional): Handle commented-out #-cmds properly.
Richard M. Stallman <rms@gnu.org>
parents:
2829
diff
changeset
|
1413 (if (< depth 0) |
3906
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1414 (setq found (point))))))) |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1415 (or found |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1416 (error "No containing preprocessor conditional")) |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1417 (goto-char (setq new found))) |
3906
a03d6cac1cd1
(c-forward-conditional): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3716
diff
changeset
|
1418 (setq count (+ count increment)))) |
909
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1419 (push-mark) |
4c6cdb66c74c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
871
diff
changeset
|
1420 (goto-char new))) |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
472
diff
changeset
|
1421 |
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
472
diff
changeset
|
1422 ;;; c-mode.el ends here |