annotate lisp/modes/cc-mode.el @ 153:25f70ba0133c r20-3b3

Import from CVS: tag r20-3b3
author cvs
date Mon, 13 Aug 2007 09:38:25 +0200
parents cca96a509cfe
children 43dd3413c7c7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1 ;;; cc-mode.el --- major mode for editing C, C++, Objective-C, and Java code
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
3 ;; Copyright (C) 1985,87,92,93,94,95,96,97 Free Software Foundation, Inc.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5 ;; Authors: 1992-1997 Barry A. Warsaw
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 ;; 1987 Dave Detlefs and Stewart Clamen
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 ;; 1985 Richard M. Stallman
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 ;; Created: a long, long, time ago. adapted from the original c-mode.el
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
9 ;; Version: 4.390-x
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
10 ;; Last Modified: 1997/04/02 15:46:35
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 ;; Keywords: c languages oop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 ;; NOTE: Read the commentary below for the right way to submit bug reports!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 ;; NOTE: See the accompanying texinfo manual for details on using this mode!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 ;; This file is part of GNU Emacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 ;; GNU Emacs is free software; you can redistribute it and/or modify
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 ;; it under the terms of the GNU General Public License as published by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 ;; the Free Software Foundation; either version 2, or (at your option)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 ;; any later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 ;; GNU Emacs is distributed in the hope that it will be useful,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 ;; GNU General Public License for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 ;; You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 ;; along with GNU Emacs; see the file COPYING. If not, write to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 ;; Boston, MA 02111-1307, USA.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 ;;; Commentary:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
35 ;; This package provides GNU Emacs major modes for editing C, C++,
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
36 ;; Objective-C, and Java code. As of the latest Emacs and XEmacs
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
37 ;; releases, it is the default package for editing these languages.
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
38 ;; This package is called "CC Mode", and should be spelled exactly
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
39 ;; this way. It supports K&R and ANSI C, ANSI C++, Objective-C, and
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
40 ;; Java, with a consistent indentation model across all modes. This
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
41 ;; indentation model is intuitive and very flexible, so that almost
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
42 ;; any desired style of indentation can be supported. Installation,
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
43 ;; usage, and programming details are contained in an accompanying
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
44 ;; texinfo manual.
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
45
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
46 ;; CC Mode's immediate ancestors were, c++-mode.el, cplus-md.el, and
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
47 ;; cplus-md1.el..
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
49 ;; NOTE: This mode does not perform font-locking (a.k.a syntactic
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
50 ;; coloring, keyword highlighting, etc.) for any of the supported
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
51 ;; modes. Typically this is done by a package called font-lock.el
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
52 ;; which I do *not* maintain. You should contact the Emacs
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
53 ;; maintainers for questions about coloring or highlighting in any
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
54 ;; language mode.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
55
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 ;; To submit bug reports, type "C-c C-b". These will be sent to
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
57 ;; bug-gnu-emacs@prep.ai.mit.edu as well as cc-mode-help@python.org,
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
58 ;; and I'll read about them there (the former is mirrored as the
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
59 ;; Usenet newsgroup gnu.emacs.bug). Questions can sent to
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
60 ;; help-gnu-emacs@prep.ai.mit.edu (mirrored as gnu.emacs.help) and/or
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
61 ;; cc-mode-help@python.org. Please do not send bugs or questions to
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
62 ;; my personal account.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 ;; YOU CAN IGNORE ALL BYTE-COMPILER WARNINGS. They are the result of
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
65 ;; the cross-Emacsen support. GNU Emacs 19 (from the FSF), GNU XEmacs
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
66 ;; 19 (formerly Lucid Emacs), and GNU Emacs 18 all do things
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
67 ;; differently and there's no way to shut the byte-compiler up at the
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
68 ;; necessary granularity. Let me say this again: YOU CAN IGNORE ALL
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 ;; BYTE-COMPILER WARNINGS (you'd be surprised at how many people don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 ;; follow this advice :-).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 ;; Many, many thanks go out to all the folks on the beta test list.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 ;; Without their patience, testing, insight, code contributions, and
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
74 ;; encouragement CC Mode would be a far inferior package.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
75
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
76 ;; You can get the latest version of CC Mode, including PostScript
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
77 ;; documentation and separate individual files from:
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 ;;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
79 ;; http://www.python.org/ftp/emacs/
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
80
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
81 ;; Or if you don't have access to the World Wide Web, through
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
82 ;; anonymous ftp from:
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
83 ;;
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
84 ;; ftp://ftp.python.org/pub/emacs
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
86 ;; Customization added by Hrvoje Niksic <hniksic@srce.hr>
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
87
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 ;;; Code:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 ;; user definable variables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 ;; vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
94 (defgroup cc-mode nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
95 "Major mode for editing C, C++, Objective-C, and Java code"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
96 :group 'c
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
97 :prefix "c-")
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
98
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
99 (defgroup cc-style nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
100 "Styles for cc mode"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
101 :prefix "c-"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
102 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
103
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
104 (defgroup cc-indent nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
105 "Indentation of cc-mode"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
106 :prefix "c-"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
107 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
108
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
109 (defgroup cc-syntax nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
110 "Syntactical analysis performed by cc-mode"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
111 :prefix "c-"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
112 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
113
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
114 (defgroup cc-comment nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
115 "Handling of comments by cc-mode"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
116 :prefix "c-"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
117 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
118
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
119 (defgroup cc-auto nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
120 "Auto-insertion features of cc-mode"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
121 :prefix "c-"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
122 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
123
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
124
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
125 (defcustom c-inhibit-startup-warnings-p nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
126 "*If non-nil, inhibits start up compatibility warnings."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
127 :type 'boolean
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
128 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
129 (defcustom c-strict-syntax-p nil
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 "*If non-nil, all syntactic symbols must be found in `c-offsets-alist'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 If the syntactic symbol for a particular line does not match a symbol
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 in the offsets alist, an error is generated, otherwise no error is
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
133 reported and the syntactic symbol is ignored."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
134 :type 'boolean
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
135 :group 'cc-syntax)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
136 (defcustom c-echo-syntactic-information-p nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
137 "*If non-nil, syntactic info is echoed when the line is indented."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
138 :type 'boolean
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
139 :group 'cc-syntax)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
140 (defcustom c-basic-offset 4
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
141 "*Amount of basic offset used by + and - symbols in `c-offsets-alist'."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
142 :type 'integer
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
143 :group 'cc-indent)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
144
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
145 (defcustom c-offsets-alist
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 '((string . -1000)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 (c . c-lineup-C-comments)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 (defun-open . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 (defun-close . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 (defun-block-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 (class-open . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 (class-close . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 (inline-open . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 (inline-close . 0)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
155 (func-decl-cont . +)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 (knr-argdecl-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 (knr-argdecl . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 (topmost-intro . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 (topmost-intro-cont . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 (member-init-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 (member-init-cont . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 (inher-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 (inher-cont . c-lineup-multi-inher)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 (block-open . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 (block-close . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 (brace-list-open . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 (brace-list-close . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 (brace-list-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 (brace-list-entry . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 (statement . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 ;; some people might prefer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 ;;(statement . c-lineup-runin-statements)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 (statement-cont . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 ;; some people might prefer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 ;;(statement-cont . c-lineup-math)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 (statement-block-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 (statement-case-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 (statement-case-open . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 (substatement . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 (substatement-open . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 (case-label . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 (access-label . -)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 (label . 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 (do-while-closure . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 (else-clause . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 (comment-intro . c-lineup-comment)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 (arglist-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 (arglist-cont . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 (arglist-cont-nonempty . c-lineup-arglist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 (arglist-close . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 (stream-op . c-lineup-streamop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 (inclass . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 (cpp-macro . -1000)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 (friend . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 (objc-method-intro . -1000)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 (objc-method-args-cont . c-lineup-ObjC-method-args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 (objc-method-call-cont . c-lineup-ObjC-method-call)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
198 (extern-lang-open . 0)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
199 (extern-lang-close . 0)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
200 (inextern-lang . +)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 "*Association list of syntactic element symbols and indentation offsets.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 As described below, each cons cell in this list has the form:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 (SYNTACTIC-SYMBOL . OFFSET)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
207 When a line is indented, CC Mode first determines the syntactic
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 context of the line by generating a list of symbols called syntactic
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 elements. This list can contain more than one syntactic element and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 the global variable `c-syntactic-context' contains the context list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 for the line being indented. Each element in this list is actually a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 cons cell of the syntactic symbol and a buffer position. This buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 position is called the relative indent point for the line. Some
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 syntactic symbols may not have a relative indent point associated with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
217 After the syntactic context list for a line is generated, CC Mode
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 calculates the absolute indentation for the line by looking at each
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 syntactic element in the list. First, it compares the syntactic
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 element against the SYNTACTIC-SYMBOL's in `c-offsets-alist'. When it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 finds a match, it adds the OFFSET to the column of the relative indent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 point. The sum of this calculation for each element in the syntactic
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 list is the absolute offset for line being indented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 If the syntactic element does not match any in the `c-offsets-alist',
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
226 an error is generated if `c-strict-syntax-p' is non-nil, otherwise the
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
227 element is ignored.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 Actually, OFFSET can be an integer, a function, a variable, or one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 the following symbols: `+', `-', `++', `--', `*', or `/'. These
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 latter designate positive or negative multiples of `c-basic-offset',
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 respectively: *1, *-1, *2, *-2, *0.5, and *-0.5. If OFFSET is a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 function, it is called with a single argument containing the cons of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 the syntactic element symbol and the relative indent point. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 function should return an integer offset.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 Here is the current list of valid syntactic element symbols:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 string -- inside multi-line string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 c -- inside a multi-line C style block comment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 defun-open -- brace that opens a function definition
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 defun-close -- brace that closes a function definition
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 defun-block-intro -- the first line in a top-level defun
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 class-open -- brace that opens a class definition
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 class-close -- brace that closes a class definition
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 inline-open -- brace that opens an in-class inline method
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 inline-close -- brace that closes an in-class inline method
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
248 func-decl-cont -- the nether region between a function
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
249 declaration and the defun opening brace.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
250 In C++ and Java, this can include `throws'
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
251 declarations
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 knr-argdecl-intro -- first line of a K&R C argument declaration
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 knr-argdecl -- subsequent lines in a K&R C argument declaration
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 topmost-intro -- the first line in a topmost construct definition
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 topmost-intro-cont -- topmost definition continuation lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 member-init-intro -- first line in a member initialization list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 member-init-cont -- subsequent member initialization list lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 inher-intro -- first line of a multiple inheritance list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 inher-cont -- subsequent multiple inheritance lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 block-open -- statement block open brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 block-close -- statement block close brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 brace-list-open -- open brace of an enum or static array list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 brace-list-close -- close brace of an enum or static array list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 brace-list-intro -- first line in an enum or static array list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 brace-list-entry -- subsequent lines in an enum or static array list
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
266 statement -- a C (or like) statement
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
267 statement-cont -- a continuation of a C (or like) statement
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 statement-block-intro -- the first line in a new statement block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 statement-case-intro -- the first line in a case `block'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 statement-case-open -- the first line in a case block starting with brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 substatement -- the first line after an if/while/for/do/else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 substatement-open -- the brace that opens a substatement block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 case-label -- a case or default label
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 access-label -- C++ private/protected/public access label
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
275 label -- any non-special C (or like) label
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 do-while-closure -- the `while' that ends a do/while construct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 else-clause -- the `else' of an if/else construct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 comment-intro -- a line containing only a comment introduction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 arglist-intro -- the first line in an argument list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 arglist-cont -- subsequent argument list lines when no
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 arguments follow on the same line as the
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
282 arglist opening paren
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 arglist-cont-nonempty -- subsequent argument list lines when at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 least one argument follows on the same
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 line as the arglist opening paren
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 arglist-close -- the solo close paren of an argument list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 stream-op -- lines continuing a stream operator construct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 inclass -- the construct is nested inside a class definition
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 cpp-macro -- the start of a cpp macro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 friend -- a C++ friend declaration
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 objc-method-intro -- the first line of an Objective-C method definition
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 objc-method-args-cont -- lines continuing an Objective-C method definition
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 objc-method-call-cont -- lines continuing an Objective-C method call
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
294 extern-lang-open -- brace that opens an external language block
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
295 extern-lang-close -- brace that closes an external language block
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
296 inextern-lang -- analogous to `inclass' syntactic symbol
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
297 "
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
298 :type '(repeat (cons symbol sexp))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
299 :group 'cc-syntax
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
300 :group 'cc-indent)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
301
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
302 (defcustom c-tab-always-indent t
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 "*Controls the operation of the TAB key.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 If t, hitting TAB always just indents the current line. If nil,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 hitting TAB indents the current line if point is at the left margin or
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
306 in the line's indentation, otherwise it insert a `real' tab character
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
307 \(see note\). If other than nil or t, then tab is inserted only
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
308 within literals -- defined as comments and strings -- and inside
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
309 preprocessor directives, but line is always reindented.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
311 Note: The value of `indent-tabs-mode' will determine whether a real
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
312 tab character will be inserted, or the equivalent number of space.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
313 When inserting a tab, actually the function stored in the variable
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
314 `c-insert-tab-function' is called.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
315
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
316 Note: indentation of lines containing only comments is also controlled
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
317 by the `c-comment-only-line-offset' variable."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
318 :type '(choice (const :tag "on" t)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
319 (const :tag "off" nil)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
320 (const :tag "insert within literals" other))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
321 :group 'cc-indent)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
322
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
323 (defcustom c-insert-tab-function 'insert-tab
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
324 "*Function used when inserting a tab for \\[TAB].
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
325 Only used when `c-tab-always-indent' indicates a `real' tab character
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
326 should be inserted. Value must be a function taking no arguments."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
327 :type 'function
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
328 :group 'cc-indent)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
329
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
330 (defcustom c-comment-only-line-offset 0
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 "*Extra offset for line which contains only the start of a comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 Can contain an integer or a cons cell of the form:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 (NON-ANCHORED-OFFSET . ANCHORED-OFFSET)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 Where NON-ANCHORED-OFFSET is the amount of offset given to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 non-column-zero anchored comment-only lines, and ANCHORED-OFFSET is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 the amount of offset to give column-zero anchored comment-only lines.
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
339 Just an integer as value is equivalent to (<val> . -1000)."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
340 :type '(choice integer
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
341 (cons integer integer))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
342 :group 'cc-comment)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
343
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
344 (defcustom c-indent-comments-syntactically-p nil
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 "*Specifies how comment-only lines should be indented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 When this variable is non-nil, comment-only lines are indented
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 according to syntactic analysis via `c-offsets-alist', even when
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
348 \\[indent-for-comment] is used."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
349 :type 'boolean
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
350 :group 'cc-indent
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
351 :group 'cc-comment)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
352
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
353 (defcustom c-cleanup-list '(scope-operator)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 "*List of various C/C++/ObjC constructs to \"clean up\".
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
355 These clean ups only take place when the auto-newline feature is
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
356 turned on, as evidenced by the `/a' or `/ah' appearing next to the
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
357 mode name. Valid symbols are:
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 brace-else-brace -- cleans up `} else {' constructs by placing entire
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
360 construct on a single line. This clean up
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
361 only takes place when there is nothing but
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
362 white space between the braces and the `else'.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
363 Clean up occurs when the open-brace after the
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
364 `else' is typed.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
365 brace-elseif-brace -- similar to brace-else-brace, but cleans up
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
366 `} else if {' constructs.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 empty-defun-braces -- cleans up empty defun braces by placing the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 braces on the same line. Clean up occurs when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369 the defun closing brace is typed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 defun-close-semi -- cleans up the terminating semi-colon on defuns
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 by placing the semi-colon on the same line as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 the closing brace. Clean up occurs when the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 semi-colon is typed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 list-close-comma -- cleans up commas following braces in array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 and aggregate initializers. Clean up occurs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 when the comma is typed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 scope-operator -- cleans up double colons which may designate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 a C++ scope operator split across multiple
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 lines. Note that certain C++ constructs can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 generate ambiguous situations. This clean up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 only takes place when there is nothing but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 whitespace between colons. Clean up occurs
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
383 when the second colon is typed."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
384 :type '(repeat (choice (const brace-else-brace) (const brace-elseif-brace)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
385 (const empty-defun-braces) (const defun-close-semi)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
386 (const list-close-comma) (const scope-operator)))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
387 :group 'cc-auto)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
388
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
389 (defcustom c-hanging-braces-alist '((brace-list-open)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
390 (substatement-open after)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
391 (block-close . c-snug-do-while)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
392 (extern-lang-open after)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
393 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 "*Controls the insertion of newlines before and after braces.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 This variable contains an association list with elements of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 following form: (SYNTACTIC-SYMBOL . ACTION).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 When a brace (either opening or closing) is inserted, the syntactic
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 context it defines is looked up in this list, and if found, the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 associated ACTION is used to determine where newlines are inserted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 If the context is not found, the default is to insert a newline both
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 before and after the brace.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 SYNTACTIC-SYMBOL can be any of: defun-open, defun-close, class-open,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 class-close, inline-open, inline-close, block-open, block-close,
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
406 substatement-open, statement-case-open, extern-lang-open,
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
407 extern-lang-close, brace-list-open, brace-list-close,
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
408 brace-list-intro, or brace-list-entry. See `c-offsets-alist' for
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
409 details.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 ACTION can be either a function symbol or a list containing any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 combination of the symbols `before' or `after'. If the list is empty,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 no newlines are inserted either before or after the brace.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 When ACTION is a function symbol, the function is called with a two
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 arguments: the syntactic symbol for the brace and the buffer position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 at which the brace was inserted. The function must return a list as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 described in the preceding paragraph. Note that during the call to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 the function, the variable `c-syntactic-context' is set to the entire
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
420 syntactic context for the brace line."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
421 :type '(repeat (cons symbol (choice (const nil)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
422 (repeat (choice (const before)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
423 (const after)))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
424 function
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
425 )))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
426 :group 'cc-auto)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
427
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
428 (defcustom c-hanging-colons-alist nil
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 "*Controls the insertion of newlines before and after certain colons.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 This variable contains an association list with elements of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 following form: (SYNTACTIC-SYMBOL . ACTION).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 See the variable `c-hanging-braces-alist' for the semantics of this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 variable. Note however that making ACTION a function symbol is
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
435 currently not supported for this variable."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
436 :type '(repeat (cons symbol (choice (repeat (choice (const before)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
437 (const after)))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
438 )))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
439 :group 'cc-auto)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
440
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
441 (defcustom c-hanging-semi&comma-criteria '(c-semi&comma-inside-parenlist)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 "*List of functions that decide whether to insert a newline or not.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 The functions in this list are called, in order, whenever the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 auto-newline minor mode is activated (as evidenced by a `/a' or `/ah'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 string in the mode line), and a semicolon or comma is typed (see
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 `c-electric-semi&comma'). Each function in this list is called with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 no arguments, and should return one of the following values:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 nil -- no determination made, continue checking
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 'stop -- do not insert a newline, and stop checking
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 (anything else) -- insert a newline, and stop checking
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 If every function in the list is called with no determination made,
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
454 then no newline is inserted."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
455 :type '(repeat function)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
456 :group 'cc-auto)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
457
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
458 (defcustom c-hanging-comment-ender-p t
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
459 "*Controls what \\[fill-paragraph] does to C block comment enders.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
460 When set to nil, C block comment enders are left on their own line.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
461 When set to t, block comment enders will be placed at the end of the
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
462 previous line (i.e. they `hang' on that line)."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
463 :type 'boolean
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
464 :group 'cc-comment)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
465
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
466 (defcustom c-hanging-comment-starter-p t
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
467 "*Controls what \\[fill-paragraph] does to C block comment starters.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
468 When set to nil, C block comment starters are left on their own line.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
469 When set to t, text that follows a block comment starter will be
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
470 placed on the same line as the block comment starter (i.e. the text
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
471 `hangs' on that line)."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
472 :type 'boolean
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
473 :group 'cc-comment)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
474
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
475 (defcustom c-backslash-column 48
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
476 "*Column to insert backslashes when macroizing a region."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
477 :type 'integer
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
478 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
479 (defcustom c-special-indent-hook nil
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 "*Hook for user defined special indentation adjustments.
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
481 This hook gets called after a line is indented by the mode."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
482 :type 'hook
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
483 :group 'cc-indent)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
484 (defcustom c-delete-function 'backward-delete-char-untabify
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
485 "*Function called by `c-electric-delete' when deleting characters."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
486 :type 'function
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
487 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
488 (defcustom c-electric-pound-behavior nil
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 "*List of behaviors for electric pound insertion.
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
490 Only currently supported behavior is `alignleft'."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
491 :type '(repeat (choice (const alignleft)))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
492 :group 'cc-auto)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
493
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
494 (defcustom c-label-minimum-indentation 1
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
495 "*Minimum indentation for lines inside of top-level constructs.
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
496 This variable typically only affects code using the `gnu' style, which
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
497 mandates a minimum of one space in front of every line inside
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
498 top-level constructs. Specifically, the function
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
499 `c-gnu-impose-minimum' on your `c-special-indent-hook' is what
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
500 enforces this."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
501 :type 'integer
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
502 :group 'cc-indent)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
503
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
504 (defcustom c-progress-interval 5
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 "*Interval used to update progress status during long re-indentation.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 If a number, percentage complete gets updated after each interval of
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
507 that many seconds. Set to nil to inhibit updating. This is only
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
508 useful for Emacs 19."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
509 :type 'integer
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
510 :group 'cc-indent)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
512 (defconst c-style-alist
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 '(("gnu"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 (c-basic-offset . 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 (c-comment-only-line-offset . (0 . 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 (c-offsets-alist . ((statement-block-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 (knr-argdecl-intro . 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 (substatement-open . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 (label . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 (statement-case-open . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 (statement-cont . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 (arglist-intro . c-lineup-arglist-intro-after-paren)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 (arglist-close . c-lineup-arglist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 ))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
525 (c-special-indent-hook . c-gnu-impose-minimum)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 ("k&r"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 (c-basic-offset . 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 (c-comment-only-line-offset . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 (c-offsets-alist . ((statement-block-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 (knr-argdecl-intro . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 (substatement-open . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 (label . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 (statement-cont . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 ("bsd"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 (c-basic-offset . 4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 (c-comment-only-line-offset . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 (c-offsets-alist . ((statement-block-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 (knr-argdecl-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 (substatement-open . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 (label . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 (statement-cont . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 ("stroustrup"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 (c-basic-offset . 4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 (c-comment-only-line-offset . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 (c-offsets-alist . ((statement-block-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 (substatement-open . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 (label . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 (statement-cont . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 ("whitesmith"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 (c-basic-offset . 4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 (c-comment-only-line-offset . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 (c-offsets-alist . ((statement-block-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 (knr-argdecl-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 (substatement-open . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 (label . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 (statement-cont . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 ("ellemtel"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 (c-basic-offset . 3)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 (c-comment-only-line-offset . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 (c-hanging-braces-alist . ((substatement-open before after)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 (c-offsets-alist . ((topmost-intro . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 (topmost-intro-cont . 0)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
573 (substatement . +)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 (substatement-open . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 (case-label . +)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
576 (access-label . -)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
577 (inclass . ++)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 (inline-open . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 )
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
581 ("linux"
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
582 (c-basic-offset . 8)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
583 (c-comment-only-line-offset . 0)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
584 (c-hanging-braces-alist . ((brace-list-open)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
585 (substatement-open after)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
586 (block-close . c-snug-do-while)))
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
587 (c-cleanup-list . (brace-else-brace))
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
588 (c-offsets-alist . ((statement-block-intro . +)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
589 (knr-argdecl-intro . 0)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
590 (substatement-open . 0)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
591 (label . 0)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
592 (statement-cont . +)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
593 ))
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
594 )
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
595 ("python"
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
596 (indent-tabs-mode . t)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
597 (c-basic-offset . 8)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
598 (c-offsets-alist . ((substatement-open . 0)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
599 ))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
600 (c-hanging-braces-alist . ((brace-list-open)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
601 (brace-list-intro)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
602 (brace-list-close)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
603 (substatement-open after)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
604 (block-close . c-snug-do-while)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
605 ))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
606 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 ("java"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 (c-basic-offset . 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 (c-comment-only-line-offset . (0 . 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 (c-offsets-alist . ((statement-block-intro . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 (knr-argdecl-intro . 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 (substatement-open . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 (label . 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 (statement-case-open . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 (statement-cont . +)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 (arglist-intro . c-lineup-arglist-intro-after-paren)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 (arglist-close . c-lineup-arglist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 (access-label . 0)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
619 (inher-cont . c-lineup-java-inher)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 "Styles of Indentation.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 Elements of this alist are of the form:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 (STYLE-STRING (VARIABLE . VALUE) [(VARIABLE . VALUE) ...])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 where STYLE-STRING is a short descriptive string used to select a
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
630 style, VARIABLE is any CC Mode variable, and VALUE is the intended
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 value for that variable when using the selected style.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 There is one special case when VARIABLE is `c-offsets-alist'. In this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634 case, the VALUE is a list containing elements of the form:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 (SYNTACTIC-SYMBOL . VALUE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 as described in `c-offsets-alist'. These are passed directly to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 `c-set-offset' so there is no need to set every syntactic symbol in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 your style, only those that are different from the default.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 Note that all styles inherit from the `cc-mode' style, which is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 computed at the time the mode is loaded.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
645 (defcustom c-file-style nil
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 "*Variable interface for setting style via File Local Variables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 In a file's Local Variable section, you can set this variable to a
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
648 string suitable for `c-set-style'. When the file is visited, CC Mode
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 will set the style of the file to this value automatically.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 Note that file style settings are applied before file offset settings
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
652 as designated in the variable `c-file-offsets'."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
653 :type '(repeat (cons regexp (string :tag "Style")))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
654 :group 'cc-style)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
655
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
656 (defcustom c-file-offsets nil
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 "*Variable interface for setting offsets via File Local Variables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 In a file's Local Variable section, you can set this variable to an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 association list similar to the values allowed in `c-offsets-alist'.
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
660 When the file is visited, CC Mode will institute these offset settings
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 automatically.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 Note that file offset settings are applied after file style settings
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
664 as designated in the variable `c-file-style'."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
665 :type '(repeat (cons regexp (string :tag "Style")))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
666 :group 'cc-indent)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
667
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
668 (defcustom c-site-default-style "gnu"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 "Default style for your site.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 To change the default style at your site, you can set this variable to
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
671 any style defined in `c-style-alist'. However, if CC Mode is usually
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 loaded into your Emacs at compile time, you will need to set this
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
673 variable in the `site-init.el' file before CC Mode is loaded, then
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
674 re-dump Emacs."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
675 :type 'string
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
676 :group 'cc-style)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
677
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
678 (defcustom c-style-variables-are-local-p t
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
679 "*Whether style variables should be buffer local by default.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
680 If non-nil, then all indentation style related variables will be made
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
681 buffer local by default. If nil, they will remain global. Variables
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
682 are made buffer local when this file is loaded, and once buffer
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
683 localized, they cannot be made global again.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
684
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
685 The list of variables to buffer localize are:
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
686 c-offsets-alist
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
687 c-basic-offset
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
688 c-file-style
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
689 c-file-offsets
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
690 c-comment-only-line-offset
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
691 c-cleanup-list
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
692 c-hanging-braces-alist
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
693 c-hanging-colons-alist
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
694 c-hanging-comment-starter-p
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
695 c-hanging-comment-ender-p
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
696 c-backslash-column
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
697 c-label-minimum-indentation
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
698 c-special-indent-hook
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
699 c-indentation-style"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
700 :type 'boolean
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
701 :group 'cc-style)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
702
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
703
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
704 (defcustom c-mode-hook nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
705 "*Hook called by `c-mode'."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
706 :type 'hook
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
707 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
708 (defcustom c++-mode-hook nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
709 "*Hook called by `c++-mode'."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
710 :type 'hook
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
711 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
712 (defcustom objc-mode-hook nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
713 "*Hook called by `objc-mode'."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
714 :type 'hook
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
715 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
716 (defcustom java-mode-hook nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
717 "*Hook called by `java-mode'."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
718 :type 'hook
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
719 :group 'cc-mode)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
720
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
721 (defcustom c-mode-common-hook nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
722 "*Hook called by all CC Mode modes for common initializations."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
723 :type 'hook
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
724 :group 'cc-mode)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 (defvar c-mode-menu
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 '(["Comment Out Region" comment-region (mark)]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728 ["Macro Expand Region" c-macro-expand (mark)]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 ["Backslashify" c-backslash-region (mark)]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 ["Indent Expression" c-indent-exp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 (memq (following-char) '(?\( ?\[ ?\{))]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 ["Indent Line" c-indent-command t]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 ["Fill Comment Paragraph" c-fill-paragraph t]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 ["Up Conditional" c-up-conditional t]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 ["Backward Conditional" c-backward-conditional t]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 ["Forward Conditional" c-forward-conditional t]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 ["Backward Statement" c-beginning-of-statement t]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 ["Forward Statement" c-end-of-statement t]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 )
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
740 "Basic XEmacs 19 menu for C/C++/ObjC/Java modes.")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
741
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
742
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
743 ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
744 ;; NO USER DEFINABLE VARIABLES BEYOND THIS POINT
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
745
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
746 ;; imenu integration
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 (defvar cc-imenu-c++-generic-expression
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 (`
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 ((nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 (,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 (concat
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
752 "^" ; beginning of line is required
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
753 "\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
754 "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; type specs; there can be no
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
755 "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; more than 3 tokens, right?
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
757 "\\(" ; last type spec including */&
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758 "[a-zA-Z0-9_:]+"
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
759 "\\([ \t]*[*&]+[ \t]*\\|[ \t]+\\)" ; either ptr/ref sign or ws
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
760 "\\)?" ; if there is a last type spec
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
761 "\\(" ; name, take into the imenu entry
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
762 "[a-zA-Z0-9_:~]+" ; member func, ctor or dtor...
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
763 ; (may not contain * because then
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
764 ; "a::operator char*" would
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
765 ; become "char*"!)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 "\\|"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 "\\([a-zA-Z0-9_:~]*::\\)?operator"
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
768 "[^a-zA-Z1-9_][^(]*" ; ...or operator
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 " \\)"
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
770 "[ \t]*([^)]*)[ \t\n]*[^ ;]" ; require something other than
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
771 ; a `;' after the (...) to
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
772 ; avoid prototypes. Can't
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
773 ; catch cases with () inside
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
774 ; the parentheses surrounding
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
775 ; the parameters. e.g.:
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
776 ; "int foo(int a=bar()) {...}"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778 )) 6)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 ("Class"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 (, (concat
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
781 "^" ; beginning of line is required
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 "\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 "class[ \t]+"
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
784 "\\([a-zA-Z0-9_]+\\)" ; the string we want to get
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 "[ \t]*[:{]"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 )) 2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 "Imenu generic expression for C++ mode. See `imenu-generic-expression'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789 (defvar cc-imenu-c-generic-expression
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 cc-imenu-c++-generic-expression
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 "Imenu generic expression for C mode. See `imenu-generic-expression'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
793 ;(defvar cc-imenu-objc-generic-expression
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
794 ; ())
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
795 ; Please contribute one!
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
796
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
797 (defvar cc-imenu-java-generic-expression
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
798 (`
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
799 ((nil
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
800 (,
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
801 (concat
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
802 "^\\([ \t]\\)*"
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
803 "\\([A-Za-z0-9_-]+[ \t]+\\)?" ; type specs; there can be
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
804 "\\([A-Za-z0-9_-]+[ \t]+\\)?" ; more than 3 tokens, right?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
805 "\\([A-Za-z0-9_-]+[ \t]*[[]?[]]?\\)"
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
806 "\\([ \t]\\)"
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
807 "\\([A-Za-z0-9_-]+\\)" ; the string we want to get
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
808 "\\([ \t]*\\)+("
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
809 "\\([a-zA-Z,_1-9\n \t]*[[]?[]]?\\)*" ; arguments
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
810 ")[ \t]*"
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
811 "[^;(]"
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
812 "[,a-zA-Z_1-9\n \t]*{"
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
813 )) 6)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
814 "Imenu generic expression for Java mode. See `imenu-generic-expression'.")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
815
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
816
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 ;; Shut the byte-compiler up. Requires Emacs 19 or JWZ's improved
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 ;; byte-compiler. Otherwise, comment this line out and ignore
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 ;; any warnings.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 ;;(byte-compiler-options (warnings nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 ;; figure out what features this Emacs has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 (defconst c-emacs-features
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 (let ((major (and (boundp 'emacs-major-version)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 emacs-major-version))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 (minor (and (boundp 'emacs-minor-version)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 emacs-minor-version))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 (re-suite 'old-re)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
830 flavor comments infodock-p)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 ;; figure out version numbers if not already discovered
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 (and (or (not major) (not minor))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 (string-match "\\([0-9]+\\).\\([0-9]+\\)" emacs-version)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 (setq major (string-to-int (substring emacs-version
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 (match-beginning 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 (match-end 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 minor (string-to-int (substring emacs-version
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 (match-beginning 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 (match-end 2)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 (if (not (and major minor))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 (error "Cannot figure out the major and minor version numbers."))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 ;; calculate the major version
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 ((= major 18) (setq major 'v18)) ;Emacs 18
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 ((= major 4) (setq major 'v18)) ;Epoch 4
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 ((= major 19) (setq major 'v19 ;Emacs 19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 flavor (if (or (string-match "Lucid" emacs-version)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 (string-match "XEmacs" emacs-version))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
849 'XEmacs 'FSF)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
850 infodock-p (boundp 'infodock-version)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
851 ((= major 20) (setq major 'v20 ;XEmacs 20
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
852 flavor 'XEmacs))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853 ;; I don't know
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 (t (error "Cannot recognize major version number: %s" major)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 ;; Regular expression suites...
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
856 (if (or (eq major 'v20)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
857 (and (eq major 'v19)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
858 (or (and (eq flavor 'XEmacs) (>= minor 14))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
859 (and (eq flavor 'FSF) (>= minor 30)))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 (setq re-suite 'new-re))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 ;; XEmacs 19 uses 8-bit modify-syntax-entry flags, as do all
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 ;; patched Emacs 19, Emacs 18, Epoch 4's. Only Emacs 19 uses a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 ;; 1-bit flag. Let's be as smart as we can about figuring this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 ;; out.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
865 (if (or (eq major 'v20) (eq major 'v19))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 (let ((table (copy-syntax-table)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 (modify-syntax-entry ?a ". 12345678" table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 ;; XEmacs pre 20 and Emacs pre 19.30 use vectors for syntax tables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 ((vectorp table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 (if (= (logand (lsh (aref table ?a) -16) 255) 255)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 (setq comments '8-bit)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 (setq comments '1-bit)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 ;; XEmacs 20 is known to be 8-bit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 ((eq flavor 'XEmacs) (setq comments '8-bit))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 ;; Emacs 19.30 and beyond are known to be 1-bit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 ((eq flavor 'FSF) (setq comments '1-bit))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 ;; Don't know what this is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 (t (error "Couldn't figure out syntax table format."))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 ;; Emacs 18 has no support for dual comments
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 (setq comments 'no-dual-comments))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 ;; lets do some minimal sanity checking.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 (if (and (or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 ;; Lucid Emacs before 19.6 had bugs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 (and (eq major 'v19) (eq flavor 'XEmacs) (< minor 6))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 ;; Emacs 19 before 19.21 has known bugs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 (and (eq major 'v19) (eq flavor 'FSF) (< minor 21)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 (not c-inhibit-startup-warnings-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 (with-output-to-temp-buffer "*cc-mode warnings*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 (print (format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 "The version of Emacs that you are running, %s,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 has known bugs in its syntax.c parsing routines which will affect the
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
894 performance of CC Mode. You should strongly consider upgrading to the
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
895 latest available version. CC Mode may continue to work, after a
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 fashion, but strange indentation errors could be encountered."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 emacs-version))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 ;; Emacs 18, with no patch is not too good
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 (if (and (eq major 'v18) (eq comments 'no-dual-comments)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 (not c-inhibit-startup-warnings-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 (with-output-to-temp-buffer "*cc-mode warnings*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 (print (format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 "The version of Emacs 18 you are running, %s,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 has known deficiencies in its ability to handle dual C++ comments,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 i.e. C++ line style comments and C block style comments. This will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 not be much of a problem for you if you are only editing C code, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 if you are doing much C++ editing, you should strongly consider
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 upgrading to one of the latest Emacs 19's. In Emacs 18, you may also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 experience performance degradations. Emacs 19 has some new built-in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 routines which will speed things up for you.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
912 Because of these inherent problems, CC Mode is no longer being
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 actively maintained for Emacs 18, however, until you can upgrade to
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
914 Emacs 19, you may want to look at cc-mode-18.el in the CC Mode
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 distribution. THIS FILE IS COMPLETELY UNSUPPORTED! If you use it,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 you are on your own, although patch contributions will be folded into
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 the main release."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 emacs-version))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 ;; Emacs 18 with the syntax patches are no longer supported
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 (if (and (eq major 'v18) (not (eq comments 'no-dual-comments))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 (not c-inhibit-startup-warnings-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 (with-output-to-temp-buffer "*cc-mode warnings*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 (print (format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 "You are running a syntax patched Emacs 18 variant. While this should
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 work for you, you may want to consider upgrading to Emacs 19. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 syntax patches are no longer supported either for syntax.c or
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
927 CC Mode."))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
928 (if infodock-p
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
929 (list major comments re-suite 'infodock)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
930 (list major comments re-suite)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 "A list of features extant in the Emacs you are using.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 There are many flavors of Emacs out there, each with different
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
933 features supporting those needed by CC Mode. Here's the current
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 supported list, along with the values for this variable:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 Emacs 18/Epoch 4: (v18 no-dual-comments RS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 Emacs 18/Epoch 4 (patch2): (v18 8-bit RS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 XEmacs 19: (v19 8-bit RS)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
939 XEmacs 20: (v20 8-bit RS)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 Emacs 19: (v19 1-bit RS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 RS is the regular expression suite to use. XEmacs versions after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 19.13, and Emacs versions after 19.29 use the `new-re' regex suite.
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
944 All other Emacsen use the `old-re' suite.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
945
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
946 Infodock (based on XEmacs) has an additional symbol on this list:
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
947 'infodock")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 (defvar c++-mode-abbrev-table nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 "Abbrev table in use in c++-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 (define-abbrev-table 'c++-mode-abbrev-table ())
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 (defvar c-mode-abbrev-table nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 "Abbrev table in use in c-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 (define-abbrev-table 'c-mode-abbrev-table ())
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 (defvar objc-mode-abbrev-table nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 "Abbrev table in use in objc-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 (define-abbrev-table 'objc-mode-abbrev-table ())
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 (defvar java-mode-abbrev-table nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 "Abbrev table in use in java-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 (define-abbrev-table 'java-mode-abbrev-table ())
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 (defun c-mode-fsf-menu (name map)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
966 ;; Add menu to a keymap, but don't add them for XEmacs. This
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
967 ;; feature test will fail on other than Emacs 19.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 (define-key map [menu-bar] (make-sparse-keymap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 (define-key map [menu-bar c] (cons name (make-sparse-keymap name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 (define-key map [menu-bar c comment-region]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 '("Comment Out Region" . comment-region))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 (define-key map [menu-bar c c-macro-expand]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 '("Macro Expand Region" . c-macro-expand))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 (define-key map [menu-bar c c-backslash-region]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 '("Backslashify" . c-backslash-region))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 (define-key map [menu-bar c indent-exp]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 '("Indent Expression" . c-indent-exp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 (define-key map [menu-bar c indent-line]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 '("Indent Line" . c-indent-command))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 (define-key map [menu-bar c fill]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 '("Fill Comment Paragraph" . c-fill-paragraph))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
985 (define-key map [menu-bar c separator2]
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
986 '("----"))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 (define-key map [menu-bar c up]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 '("Up Conditional" . c-up-conditional))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 (define-key map [menu-bar c backward]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 '("Backward Conditional" . c-backward-conditional))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 (define-key map [menu-bar c forward]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 '("Forward Conditional" . c-forward-conditional))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 (define-key map [menu-bar c backward-stmt]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 '("Backward Statement" . c-beginning-of-statement))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 (define-key map [menu-bar c forward-stmt]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 '("Forward Statement" . c-end-of-statement))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
998 ;; RMS says: mouse-3 should not select this menu. mouse-3's
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
999 ;; global definition is useful in C mode and we should not
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
1000 ;; interfere with that. The menu is mainly for beginners, and
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
1001 ;; for them, the menubar requires less memory than a special
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
1002 ;; click.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 (error nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 (defvar c-mode-map ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 "Keymap used in c-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 (if c-mode-map
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 ;; TBD: should we even worry about naming this keymap. My vote: no,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 ;; because Emacs and XEmacs do it differently.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 (setq c-mode-map (make-sparse-keymap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 ;; put standard keybindings into MAP
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 ;; the following mappings correspond more or less directly to BOCM
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 (define-key c-mode-map "{" 'c-electric-brace)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 (define-key c-mode-map "}" 'c-electric-brace)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 (define-key c-mode-map ";" 'c-electric-semi&comma)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 (define-key c-mode-map "#" 'c-electric-pound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 (define-key c-mode-map ":" 'c-electric-colon)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 ;; Lucid Emacs 19.9 defined these two, the second of which was
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 ;; commented out...
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 ;; (define-key c-mode-map "\e{" 'c-insert-braces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 ;; Commented out electric square brackets because nobody likes them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 ;; (define-key c-mode-map "[" 'c-insert-brackets)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1025 (define-key c-mode-map "\C-c\C-m" 'c-mark-function)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 (define-key c-mode-map "\e\C-q" 'c-indent-exp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 (define-key c-mode-map "\ea" 'c-beginning-of-statement)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 (define-key c-mode-map "\ee" 'c-end-of-statement)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 ;; Emacs 19.30 introduces fill-paragraph-function, but it's not in
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1030 ;; every version of Emacs CC Mode supports.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 (if (not (boundp 'fill-paragraph-function))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 ;; I'd rather use an adaptive fill program instead of this.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 (define-key c-mode-map "\eq" 'c-fill-paragraph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 (define-key c-mode-map "\C-c\C-n" 'c-forward-conditional)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 (define-key c-mode-map "\C-c\C-p" 'c-backward-conditional)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036 (define-key c-mode-map "\C-c\C-u" 'c-up-conditional)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 (define-key c-mode-map "\t" 'c-indent-command)
153
25f70ba0133c Import from CVS: tag r20-3b3
cvs
parents: 120
diff changeset
1038 ;; GDF - don't rebind the DEL key
25f70ba0133c Import from CVS: tag r20-3b3
cvs
parents: 120
diff changeset
1039 ;; (define-key c-mode-map "\177" 'c-electric-delete)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 ;; these are new keybindings, with no counterpart to BOCM
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041 (define-key c-mode-map "," 'c-electric-semi&comma)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 (define-key c-mode-map "*" 'c-electric-star)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 (define-key c-mode-map "\C-c\C-q" 'c-indent-defun)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 (define-key c-mode-map "\C-c\C-\\" 'c-backslash-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 ;; TBD: where if anywhere, to put c-backward|forward-into-nomenclature
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 (define-key c-mode-map "\C-c\C-a" 'c-toggle-auto-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 (define-key c-mode-map "\C-c\C-b" 'c-submit-bug-report)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 (define-key c-mode-map "\C-c\C-c" 'comment-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 (define-key c-mode-map "\C-c\C-d" 'c-toggle-hungry-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 (define-key c-mode-map "\C-c\C-e" 'c-macro-expand)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 (define-key c-mode-map "\C-c\C-o" 'c-set-offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 (define-key c-mode-map "\C-c\C-s" 'c-show-syntactic-information)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 (define-key c-mode-map "\C-c\C-t" 'c-toggle-auto-hungry-state)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1054 (define-key c-mode-map "\C-c." 'c-set-style)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 ;; conflicts with OOBR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 ;;(define-key c-mode-map "\C-c\C-v" 'c-version)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 ;;
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1058 (if (and
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1059 ;; Infodock has it's own menu
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1060 (not (memq 'infodock c-emacs-features))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1061 ;; Emacs 19 defines menus in the mode map. This call will
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1062 ;; return t on Emacs 19, otherwise no-op and return nil.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1063 (not (c-mode-fsf-menu "CC Mode" c-mode-map))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1064 ;; In XEmacs 19, we want the menu to popup when the 3rd button
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1065 ;; is hit. In Lucid Emacs 19.10 and beyond this is done
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1066 ;; automatically if we put the menu on mode-popup-menu
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1067 ;; variable, see c-common-init. Emacs 19 uses C-Mouse-3 for
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1068 ;; this, and it works with no special effort.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1069 (boundp 'current-menubar)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1070 (not (boundp 'mode-popup-menu)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 (define-key c-mode-map 'button3 'c-popup-menu)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 (defvar c++-mode-map ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 "Keymap used in c++-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 (if c++-mode-map
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 ;; In Emacs 19, it makes more sense to inherit c-mode-map
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1078 (if (or
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1079 (memq 'v19 c-emacs-features)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1080 (memq 'v20 c-emacs-features))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 ;; XEmacs and Emacs 19 do this differently
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083 ;; XEmacs 19.13
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 ((fboundp 'set-keymap-parents)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 (setq c++-mode-map (make-sparse-keymap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 (set-keymap-parents c++-mode-map c-mode-map))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 ((fboundp 'set-keymap-parent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 (setq c++-mode-map (make-sparse-keymap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 (set-keymap-parent c++-mode-map c-mode-map))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 (t (setq c++-mode-map (cons 'keymap c-mode-map))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 ;; Do it the hard way for Emacs 18 -- given by JWZ
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 (setq c++-mode-map (nconc (make-sparse-keymap) c-mode-map)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 ;; add bindings which are only useful for C++
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 (define-key c++-mode-map "\C-c:" 'c-scope-operator)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 (define-key c++-mode-map "/" 'c-electric-slash)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 (define-key c++-mode-map "<" 'c-electric-lt-gt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 (define-key c++-mode-map ">" 'c-electric-lt-gt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 ;; Emacs 19 defines menus in the mode map. This call will return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 ;; t on Emacs 19, otherwise no-op and return nil.
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
1100 ; (c-mode-fsf-menu "C++" c++-mode-map)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
1101 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 (defvar objc-mode-map ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 "Keymap used in objc-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 (if objc-mode-map
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 ;; In Emacs 19, it makes more sense to inherit c-mode-map
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1108 (if (or (memq 'v19 c-emacs-features) (memq 'v20 c-emacs-features))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 ;; XEmacs and Emacs 19 do this differently
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 ;; XEmacs 19.13
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 ((fboundp 'set-keymap-parents)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 (setq objc-mode-map (make-sparse-keymap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 (set-keymap-parents objc-mode-map c-mode-map))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 ((fboundp 'set-keymap-parent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 (setq objc-mode-map (make-sparse-keymap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 (set-keymap-parent objc-mode-map c-mode-map))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 (t (setq objc-mode-map (cons 'keymap c-mode-map))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 ;; Do it the hard way for Emacs 18 -- given by JWZ
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 (setq objc-mode-map (nconc (make-sparse-keymap) c-mode-map)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 ;; add bindings which are only useful for Objective-C
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 (define-key objc-mode-map "/" 'c-electric-slash)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 ;; Emacs 19 defines menus in the mode map. This call will return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 ;; t on Emacs 19, otherwise no-op and return nil.
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
1125 ; (c-mode-fsf-menu "ObjC" objc-mode-map)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
1126 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 (defvar java-mode-map ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 "Keymap used in java-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 (if java-mode-map
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 ;; In Emacs 19, it makes more sense to inherit c-mode-map
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1133 (if (or (memq 'v19 c-emacs-features) (memq 'v20 c-emacs-features))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 ;; XEmacs and Emacs 19 do this differently
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 ;; XEmacs 19.13
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 ((fboundp 'set-keymap-parents)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 (setq java-mode-map (make-sparse-keymap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 (set-keymap-parents java-mode-map c-mode-map))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140 ((fboundp 'set-keymap-parent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 (setq java-mode-map (make-sparse-keymap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142 (set-keymap-parent java-mode-map c-mode-map))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 (t (setq java-mode-map (cons 'keymap c-mode-map)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145 ;; Do it the hard way for Emacs 18 -- given by JWZ
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 (setq java-mode-map (nconc (make-sparse-keymap) c-mode-map)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 ;; add bindings which are only useful for Java
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 (define-key java-mode-map "/" 'c-electric-slash)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 ;; Emacs 19 defines menus in the mode map. This call will return t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 ;; on Emacs 19, otherwise no-op and return nil.
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
1151 ; (c-mode-fsf-menu "Java" java-mode-map)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
1152 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 (defun c-populate-syntax-table (table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 ;; Populate the syntax TABLE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 ;; DO NOT TRY TO SET _ (UNDERSCORE) TO WORD CLASS!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 (modify-syntax-entry ?_ "_" table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 (modify-syntax-entry ?\\ "\\" table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 (modify-syntax-entry ?+ "." table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 (modify-syntax-entry ?- "." table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 (modify-syntax-entry ?= "." table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 (modify-syntax-entry ?% "." table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 (modify-syntax-entry ?< "." table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 (modify-syntax-entry ?> "." table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 (modify-syntax-entry ?& "." table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 (modify-syntax-entry ?| "." table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 (modify-syntax-entry ?\' "\"" table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 (defun c-setup-dual-comments (table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 ;; Set up TABLE to handle block and line style comments
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 ((memq '8-bit c-emacs-features)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 ;; XEmacs 19 has the best implementation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 (modify-syntax-entry ?/ ". 1456" table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 (modify-syntax-entry ?* ". 23" table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176 (modify-syntax-entry ?\n "> b" table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 ;; Give CR the same syntax as newline, for selective-display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 (modify-syntax-entry ?\^m "> b" table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179 ((memq '1-bit c-emacs-features)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 ;; Emacs 19 does things differently, but we can work with it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 (modify-syntax-entry ?/ ". 124b" table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 (modify-syntax-entry ?* ". 23" table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 (modify-syntax-entry ?\n "> b" table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 ;; Give CR the same syntax as newline, for selective-display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 (modify-syntax-entry ?\^m "> b" table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188 (defvar c-mode-syntax-table nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189 "Syntax table used in c-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 (if c-mode-syntax-table
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 (setq c-mode-syntax-table (make-syntax-table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 (c-populate-syntax-table c-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 ;; add extra comment syntax
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195 (modify-syntax-entry ?/ ". 14" c-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 (modify-syntax-entry ?* ". 23" c-mode-syntax-table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1197
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 (defvar c++-mode-syntax-table nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 "Syntax table used in c++-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 (if c++-mode-syntax-table
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 (setq c++-mode-syntax-table (make-syntax-table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 (c-populate-syntax-table c++-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204 ;; add extra comment syntax
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 (c-setup-dual-comments c++-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 ;; TBD: does it make sense for colon to be symbol class in C++?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 ;; I'm not so sure, since c-label-key is busted on lines like:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 ;; Foo::bar( i );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 ;; maybe c-label-key should be fixed instead of commenting this out,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 ;; but it also bothers me that this only seems appropriate for C++
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 ;; and not C.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 ;;(modify-syntax-entry ?: "_" c++-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 (defvar objc-mode-syntax-table nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 "Syntax table used in objc-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 (if objc-mode-syntax-table
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 (setq objc-mode-syntax-table (make-syntax-table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 (c-populate-syntax-table objc-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 ;; add extra comment syntax
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 (c-setup-dual-comments objc-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 ;; everyone gets these
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 (modify-syntax-entry ?@ "_" objc-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 (defvar java-mode-syntax-table nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 "Syntax table used in java-mode buffers.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 (if java-mode-syntax-table
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 (setq java-mode-syntax-table (make-syntax-table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232 (c-populate-syntax-table java-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 ;; add extra comment syntax
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 (c-setup-dual-comments java-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 ;; everyone gets these
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 (modify-syntax-entry ?@ "_" java-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 (defvar c-hungry-delete-key nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 "Internal state of hungry delete key feature.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 (defvar c-auto-newline nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 "Internal state of auto newline feature.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 (defvar c-auto-hungry-string nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 "Internal auto-newline/hungry-delete designation string for mode line.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 (defvar c-syntactic-context nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 "Variable containing syntactic analysis list during indentation.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247 (defvar c-comment-start-regexp nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 "Buffer local variable describing how comment are introduced.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 (defvar c-conditional-key nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 "Buffer local language-specific conditional keyword regexp.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 (defvar c-access-key nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 "Buffer local language-specific access key regexp.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 (defvar c-class-key nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 "Buffer local language-specific class key regexp.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 (defvar c-method-key nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 "Buffer local language-specific method regexp.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 (defvar c-double-slash-is-comments-p nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 "Buffer local language-specific comment style flag.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 (defconst c-protection-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 "\\<\\(public\\|protected\\|private\\)\\>"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 "Regexp describing protection keywords.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 (defconst c-symbol-key "\\(\\w\\|\\s_\\)+"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 "Regexp describing a C/C++/ObjC symbol.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 We cannot use just `word' syntax class since `_' cannot be in word
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 class. Putting underscore in word class breaks forward word movement
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 behavior that users are familiar with.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 (defconst c-baseclass-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 ":?[ \t]*\\(virtual[ \t]+\\)?\\("
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 c-protection-key "[ \t]+\\)" c-symbol-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271 "Regexp describing C++ base classes in a derived class definition.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1273 ;; defconst'd instead of defvar'd to override any old pre-loaded versions
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1274 (defconst c-recognize-knr-p t
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1275 "Non-nil means K&R style argument declarations are valid.")
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1276 (defvar c-indentation-style c-site-default-style
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1277 "Name of style installed in the current buffer.")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1278
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1279 ;; these variables should always be buffer local. they do not affect
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1280 ;; indentation styles.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1281 ;;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282 ;; minor mode variables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 (make-variable-buffer-local 'c-auto-newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 (make-variable-buffer-local 'c-hungry-delete-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285 (make-variable-buffer-local 'c-auto-hungry-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 ;; language differences
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 (make-variable-buffer-local 'c-comment-start-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288 (make-variable-buffer-local 'c-conditional-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 (make-variable-buffer-local 'c-access-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290 (make-variable-buffer-local 'c-class-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 (make-variable-buffer-local 'c-method-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 (make-variable-buffer-local 'c-double-slash-is-comments-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293 (make-variable-buffer-local 'c-baseclass-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294 (make-variable-buffer-local 'c-recognize-knr-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 ;; style variables are made buffer local at tail end of this file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1297 ;; cmacexp is lame because it uses no preprocessor symbols.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1298 ;; It isn't very extensible either -- hardcodes /lib/cpp.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1299 ;; [I add it here only because c-mode has it -- BAW]
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1300 (autoload 'c-macro-expand "cmacexp"
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1301 "Display the result of expanding all C macros occurring in the region.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1302 The expansion is entirely correct because it uses the C preprocessor."
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1303 t)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306 ;; constant regular expressions for looking at various constructs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 (defconst c-C++-class-key "\\(class\\|struct\\|union\\)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308 "Regexp describing a C++ class declaration, including templates.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 (defconst c-C-class-key "\\(struct\\|union\\)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 "Regexp describing a C struct declaration.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 (defconst c-inher-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 (concat "\\(\\<static\\>\\s +\\)?"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313 c-C++-class-key "[ \t]+" c-symbol-key
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1314 "\\([ \t]*:[ \t]*\\)\\s *[^;]")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 "Regexp describing a class inheritance declaration.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316 (defconst c-switch-label-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 "\\(\\(case[( \t]+\\S .*\\)\\|default[ \t]*\\):"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318 "Regexp describing a switch's case or default label")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 (defconst c-C++-access-key
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1320 (concat c-protection-key "[ \t]*:")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 "Regexp describing C++ access specification keywords.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322 (defconst c-label-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 (concat c-symbol-key ":\\([^:]\\|$\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 "Regexp describing any label.")
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1325 (defconst c-C-conditionals '("for" "if" "do" "else" "while" "switch")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1326 "Shared conditional keywords for C-like languages.")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327 (defconst c-C-conditional-key
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1328 (concat "\\b\\("
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1329 (mapconcat 'identity c-C-conditionals "\\|")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1330 "\\)\\b[^_]")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1331 "Regexp describing a conditional control for C.")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 (defconst c-C++-conditional-key
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1333 (concat "\\b\\(" (mapconcat 'identity
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1334 (append '("try" "catch") c-C-conditionals) "\\|")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1335 "\\)\\b[^_]")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 "Regexp describing a conditional control for C++.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337 (defconst c-C++-friend-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338 "friend[ \t]+\\|template[ \t]*<.+>[ \t]*friend[ \t]+"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 "Regexp describing friend declarations in C++ classes.")
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1340
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1341 ;; comment starter definitions for various languages. the language
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1342 ;; modes will set c-comment-start-regexp to this value.
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1343 (defconst c-C++-comment-start-regexp "/[/*]")
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1344 (defconst c-C-comment-start-regexp "/[*]")
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1345 ;; We need to match all 3 Java style comments
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1346 ;; 1) Traditional C block; 2) javadoc /** ...; 3) C++ style
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1347 (defconst c-Java-comment-start-regexp "/\\(/\\|[*][*]?\\)")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 (defconst c-ObjC-method-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 "^\\s *[+-]\\s *"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 "\\(([^)]*)\\)?" ; return type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353 ;; \\s- in objc syntax table does not include \n
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 ;; since it is considered the end of //-comments.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 "[ \t\n]*" c-symbol-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 "Regexp describing an Objective-C method intro.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 (defconst c-ObjC-access-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 (concat "@" c-protection-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 "Regexp describing access specification keywords for Objective-C.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 (defconst c-ObjC-class-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 "@\\(interface\\|implementation\\)\\s +"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 c-symbol-key ;name of the class
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364 "\\(\\s *:\\s *" c-symbol-key "\\)?" ;maybe followed by the superclass
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 "\\(\\s *<[^>]+>\\)?" ;and maybe the adopted protocols list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 "Regexp describing a class or protocol declaration for Objective-C.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 (defconst c-Java-method-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 "^\\s *[+-]\\s *"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 "\\(([^)]*)\\)?" ; return type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 ;; \\s- in java syntax table does not include \n
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 ;; since it is considered the end of //-comments.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 "[ \t\n]*" c-symbol-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 "Regexp describing a Java method intro.")
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1377 (defconst c-Java-access-key nil
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1378 "Regexp describing access labels for Java.")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 (defconst c-Java-class-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 (concat
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1381 "\\(" c-protection-key "\\s +\\)?"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 "\\(interface\\|class\\)\\s +"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 c-symbol-key ;name of the class
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 "\\(\\s *extends\\s *" c-symbol-key "\\)?" ;maybe followed by superclass
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 ;;"\\(\\s *implements *[^{]+{\\)?" ;and maybe the adopted protocols list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 "Regexp describing a class or protocol declaration for Java.")
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1388 (defconst c-Java-special-key "\\(implements\\|extends\\|throws\\)[^_]"
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1389 "Regexp describing Java inheritance and throws clauses.")
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1390 (defconst c-Java-conditional-key
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1391 (concat "\\b\\("
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1392 (mapconcat 'identity
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1393 (append '("try" "catch" "finally" "synchronized")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1394 c-C-conditionals) "\\|")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1395 "\\)\\b[^_]")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1396 "Regexp describing a conditional control for Java.")
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1397 (defconst c-Java-defun-prompt-regexp
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1398 "^[ \t]*\\(\\(\\(public\\|protected\\|private\\|const\\|abstract\\|synchronized\\|final\\|static\\|threadsafe\\|transient\\|native\\|volatile\\)\\s-+\\)*\\(\\(\\([[a-zA-Z][][_$.a-zA-Z0-9]*[][_$.a-zA-Z0-9]+\\|[[a-zA-Z]\\)\\s-*\\)\\s-+\\)\\)?\\(\\([[a-zA-Z][][_$.a-zA-Z0-9]*\\s-+\\)\\s-*\\)?\\([_a-zA-Z][^][ \t:;.,{}()=]*\\|\\([_$a-zA-Z][_$.a-zA-Z0-9]*\\)\\)\\s-*\\(([^);{}]*)\\)?\\([] \t]*\\)\\(\\s-*\\<throws\\>\\s-*\\(\\([_$a-zA-Z][_$.a-zA-Z0-9]*\\)[, \t\n\r\f]*\\)+\\)?\\s-*"
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1399 "Regexp describing the beginning of a Java top-level definition.")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 ;; KLUDGE ALERT. We default these variables to their `C' values so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402 ;; that non-cc-mode-ized modes that depend on c-mode will still work
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403 ;; out of the box. The most glaring example is awk-mode. There ought
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 ;; to be a better way.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405 (setq-default c-conditional-key c-C-conditional-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 c-class-key c-C-class-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 c-comment-start-regexp c-C-comment-start-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 ;; main entry points for the modes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411 (defconst c-list-of-mode-names nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1413 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 (defun c-mode ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415 "Major mode for editing K&R and ANSI C code.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 To submit a problem report, enter `\\[c-submit-bug-report]' from a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 c-mode buffer. This automatically sets up a mail buffer with version
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418 information already added. You just need to add a description of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 problem, including a reproducible test case and send the message.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1421 To see what version of CC Mode you are running, enter `\\[c-version]'.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 The hook variable `c-mode-hook' is run with no args, if that value is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 bound and has a non-nil value. Also the hook `c-mode-common-hook' is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425 run first.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427 Key bindings:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 \\{c-mode-map}"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430 (kill-all-local-variables)
153
25f70ba0133c Import from CVS: tag r20-3b3
cvs
parents: 120
diff changeset
1431 (make-local-hook 'backspace-or-delete-hook)
25f70ba0133c Import from CVS: tag r20-3b3
cvs
parents: 120
diff changeset
1432 (add-hook 'backspace-or-delete-hook 'c-electric-delete nil t)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 (set-syntax-table c-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434 (setq major-mode 'c-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435 mode-name "C"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 local-abbrev-table c-mode-abbrev-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 (use-local-map c-mode-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 (c-common-init)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 (setq comment-start "/* "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 comment-end " */"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 comment-multi-line t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 c-conditional-key c-C-conditional-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443 c-class-key c-C-class-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444 c-baseclass-key nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 c-comment-start-regexp c-C-comment-start-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 imenu-generic-expression cc-imenu-c-generic-expression)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 (run-hooks 'c-mode-common-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 (run-hooks 'c-mode-hook))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 (setq c-list-of-mode-names (cons "C" c-list-of-mode-names))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1451 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 (defun c++-mode ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 "Major mode for editing C++ code.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 To submit a problem report, enter `\\[c-submit-bug-report]' from a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 c++-mode buffer. This automatically sets up a mail buffer with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 version information already added. You just need to add a description
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 of the problem, including a reproducible test case, and send the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 message.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1460 To see what version of CC Mode you are running, enter `\\[c-version]'.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 The hook variable `c++-mode-hook' is run with no args, if that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463 variable is bound and has a non-nil value. Also the hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464 `c-mode-common-hook' is run first.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 Key bindings:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 \\{c++-mode-map}"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 (kill-all-local-variables)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 (set-syntax-table c++-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 (setq major-mode 'c++-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472 mode-name "C++"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473 local-abbrev-table c++-mode-abbrev-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 (use-local-map c++-mode-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475 (c-common-init)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476 (setq comment-start "// "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 comment-end ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 comment-multi-line nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 c-conditional-key c-C++-conditional-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 c-comment-start-regexp c-C++-comment-start-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 c-class-key c-C++-class-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 c-access-key c-C++-access-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 c-double-slash-is-comments-p t
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1484 c-recognize-knr-p nil
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 imenu-generic-expression cc-imenu-c++-generic-expression)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 (run-hooks 'c-mode-common-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487 (run-hooks 'c++-mode-hook))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 (setq c-list-of-mode-names (cons "C++" c-list-of-mode-names))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1490 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 (defun objc-mode ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 "Major mode for editing Objective C code.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493 To submit a problem report, enter `\\[c-submit-bug-report]' from an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 objc-mode buffer. This automatically sets up a mail buffer with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 version information already added. You just need to add a description
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 of the problem, including a reproducible test case, and send the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 message.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1499 To see what version of CC Mode you are running, enter `\\[c-version]'.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501 The hook variable `objc-mode-hook' is run with no args, if that value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 is bound and has a non-nil value. Also the hook `c-mode-common-hook'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503 is run first.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 Key bindings:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 \\{objc-mode-map}"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 (kill-all-local-variables)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 (set-syntax-table objc-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 (setq major-mode 'objc-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 mode-name "ObjC"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 local-abbrev-table objc-mode-abbrev-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 (use-local-map objc-mode-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 (c-common-init)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515 (setq comment-start "// "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 comment-end ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517 comment-multi-line nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 c-conditional-key c-C-conditional-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 c-comment-start-regexp c-C++-comment-start-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 c-class-key c-ObjC-class-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 c-baseclass-key nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 c-access-key c-ObjC-access-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 c-double-slash-is-comments-p t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 c-method-key c-ObjC-method-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525 (run-hooks 'c-mode-common-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526 (run-hooks 'objc-mode-hook))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 (setq c-list-of-mode-names (cons "ObjC" c-list-of-mode-names))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1529 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 (defun java-mode ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 "Major mode for editing Java code.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 To submit a problem report, enter `\\[c-submit-bug-report]' from an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 java-mode buffer. This automatically sets up a mail buffer with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 version information already added. You just need to add a description
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 of the problem, including a reproducible test case and send the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 message.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1538 To see what version of CC Mode you are running, enter `\\[c-version]'.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 The hook variable `java-mode-hook' is run with no args, if that value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 is bound and has a non-nil value. Also the common hook
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1542 `c-mode-common-hook' is run first. Note that this mode automatically
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1543 sets the \"java\" style before calling any hooks so be careful if you
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1544 set styles in `c-mode-common-hook'.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 Key bindings:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 \\{java-mode-map}"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 (kill-all-local-variables)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 (set-syntax-table java-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 (setq major-mode 'java-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 mode-name "Java"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 local-abbrev-table java-mode-abbrev-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 (use-local-map java-mode-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 (c-common-init)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 (setq comment-start "// "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 comment-end ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 comment-multi-line nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 c-conditional-key c-Java-conditional-key
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1560 c-comment-start-regexp c-Java-comment-start-regexp
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 c-class-key c-Java-class-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 c-method-key c-Java-method-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 c-double-slash-is-comments-p t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 c-baseclass-key nil
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1565 c-recognize-knr-p nil
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1566 c-access-key c-Java-access-key
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1567 ;defun-prompt-regexp c-Java-defun-prompt-regexp
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1568 imenu-generic-expression cc-imenu-java-generic-expression
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1569 )
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1570 (c-set-style "java")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 (run-hooks 'c-mode-common-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572 (run-hooks 'java-mode-hook))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1573 (setq c-list-of-mode-names (cons "Java" c-list-of-mode-names))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1575 (defun c-use-java-style ()
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1576 "Institutes `java' indentation style.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1577 For use with the variable `java-mode-hook'."
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1578 (c-set-style "java"))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1579
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 (defun c-common-init ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 ;; Common initializations for c++-mode and c-mode.
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1582 ;;
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1583 ;; these variables should always be buffer local; they do not affect
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1584 ;; indentation style.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 (make-local-variable 'paragraph-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586 (make-local-variable 'paragraph-separate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 (make-local-variable 'paragraph-ignore-fill-prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588 (make-local-variable 'require-final-newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 (make-local-variable 'parse-sexp-ignore-comments)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590 (make-local-variable 'indent-line-function)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 (make-local-variable 'indent-region-function)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 (make-local-variable 'comment-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593 (make-local-variable 'comment-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594 (make-local-variable 'comment-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595 (make-local-variable 'comment-start-skip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596 (make-local-variable 'comment-multi-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597 (make-local-variable 'outline-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598 (make-local-variable 'outline-level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599 (make-local-variable 'adaptive-fill-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 (make-local-variable 'imenu-generic-expression) ;set in the mode functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1601 ;; Emacs 19.30 and beyond only, AFAIK
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 (if (boundp 'fill-paragraph-function)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604 (make-local-variable 'fill-paragraph-function)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605 (setq fill-paragraph-function 'c-fill-paragraph)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 ;; now set their values
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1607 (setq paragraph-start (if (memq 'new-re c-emacs-features)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 (concat page-delimiter "\\|$")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609 (concat "^$\\|" page-delimiter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 paragraph-separate paragraph-start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611 paragraph-ignore-fill-prefix t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612 require-final-newline t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 parse-sexp-ignore-comments t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 indent-line-function 'c-indent-line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615 indent-region-function 'c-indent-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 outline-regexp "[^#\n\^M]"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 outline-level 'c-outline-level
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 comment-column 32
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 comment-start-skip "/\\*+ *\\|// *"
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1620 ;; For all but XEmacs 19.13, the default should be nil
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1621 adaptive-fill-regexp (and (memq 'v19 c-emacs-features)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1622 (= emacs-minor-version 13)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1623 "[ \t]*\\([#;>*]+ +\\)?")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1624 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625 ;; we have to do something special for c-offsets-alist so that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626 ;; buffer local value has its own alist structure.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 (setq c-offsets-alist (copy-alist c-offsets-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 ;; setup the comment indent variable in a Emacs version portable way
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 ;; ignore any byte compiler warnings you might get here
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630 (if (boundp 'comment-indent-function)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 (make-local-variable 'comment-indent-function)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 (setq comment-indent-function 'c-comment-indent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 (make-local-variable 'comment-indent-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635 (setq comment-indent-hook 'c-comment-indent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 ;; Put C menu into menubar and on popup menu for XEmacs 19. I think
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1637 ;; this happens automatically for Emacs 19. Skip it for Infodock.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1638 (if (and (not (memq 'infodock c-emacs-features))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1639 (boundp 'current-menubar)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640 current-menubar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 (not (assoc mode-name current-menubar)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642 ;; its possible that this buffer has changed modes from one of
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1643 ;; the other CC Mode modes. In that case, only the menubar
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 ;; title of the menu changes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645 (let ((modes (copy-sequence c-list-of-mode-names))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1646 changed-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647 (setq modes (delete major-mode modes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 (while modes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 (if (not (assoc (car modes) current-menubar))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1650 (setq modes (cdr modes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1651 (relabel-menu-item (list (car modes)) mode-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 (setq modes nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1653 changed-p t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654 (if (not changed-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1655 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1656 (set-buffer-menubar (copy-sequence current-menubar))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1657 (if (fboundp 'add-submenu)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1658 (add-submenu nil (c-mode-menu))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1659 (add-menu nil mode-name c-mode-menu)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1660 )))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661 (if (boundp 'mode-popup-menu)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1662 (setq mode-popup-menu (c-mode-menu)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 ;; put auto-hungry designators onto minor-mode-alist, but only once
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1664 (or (assq 'c-auto-hungry-string minor-mode-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 (setq minor-mode-alist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666 (cons '(c-auto-hungry-string c-auto-hungry-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 minor-mode-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669 (defun c-postprocess-file-styles ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1670 "Function that post processes relevant file local variables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1671 Currently, this function simply applies any style and offset settings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1672 found in the file's Local Variable list. It first applies any style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1673 setting found in `c-file-style', then it applies any offset settings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 it finds in `c-file-offsets'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 ;; apply file styles and offsets
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 (and c-file-style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677 (c-set-style c-file-style))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678 (and c-file-offsets
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 (mapcar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1680 (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1681 (lambda (langentry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1682 (let ((langelem (car langentry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683 (offset (cdr langentry)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684 (c-set-offset langelem offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1686 c-file-offsets)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688 ;; Add the postprocessing function to hack-local-variables-hook. As
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689 ;; of 28-Aug-1995, XEmacs 19.12 and Emacs 19.29 support this.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 (and (fboundp 'add-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691 (add-hook 'hack-local-variables-hook 'c-postprocess-file-styles))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1692
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1693 (defun c-enable-//-in-c-mode ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1694 "Enables // as a comment delimiter in `c-mode'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1695 ANSI C currently does *not* allow this, although many C compilers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1696 support optional C++ style comments. To use, call this function from
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697 your `.emacs' file before you visit any C files. The changes are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698 global and affect all future `c-mode' buffers."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 (c-setup-dual-comments c-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700 (setq-default c-C-comment-start-regexp c-C++-comment-start-regexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 ;; macros must be defined before first use
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1704 (defmacro c-add-syntax (symbol &optional relpos)
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1705 ;; a simple macro to append the syntax in symbol to the syntax list.
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1706 ;; try to increase performance by using this macro
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1707 (` (setq syntax (cons (cons (, symbol) (, relpos)) syntax))))
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1708
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1709 (defmacro c-point (position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1710 ;; Returns the value of point at certain commonly referenced POSITIONs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711 ;; POSITION can be one of the following symbols:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 ;; bol -- beginning of line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 ;; eol -- end of line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 ;; bod -- beginning of defun
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 ;; boi -- back to indentation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 ;; ionl -- indentation of next line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718 ;; iopl -- indentation of previous line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719 ;; bonl -- beginning of next line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 ;; bopl -- beginning of previous line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 ;; This function does not modify point or mark.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723 (or (and (eq 'quote (car-safe position))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724 (null (cdr (cdr position))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 (error "bad buffer position requested: %s" position))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 (setq position (nth 1 position))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727 (` (let ((here (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 (,@ (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729 ((eq position 'bol) '((beginning-of-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730 ((eq position 'eol) '((end-of-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 ((eq position 'bod)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732 '((beginning-of-defun)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733 ;; if defun-prompt-regexp is non-nil, b-o-d won't leave
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1734 ;; us at the open brace.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735 (and (boundp 'defun-prompt-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 defun-prompt-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737 (looking-at defun-prompt-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738 (goto-char (match-end 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740 ((eq position 'boi) '((back-to-indentation)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741 ((eq position 'bonl) '((forward-line 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742 ((eq position 'bopl) '((forward-line -1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1743 ((eq position 'iopl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1744 '((forward-line -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1745 (back-to-indentation)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746 ((eq position 'ionl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747 '((forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 (back-to-indentation)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749 (t (error "unknown buffer position requested: %s" position))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751 (prog1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753 (goto-char here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 ;; workaround for an Emacs18 bug -- blech! Well, at least it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 ;; doesn't hurt for v19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756 (,@ nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759 (defmacro c-auto-newline ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 ;; if auto-newline feature is turned on, insert a newline character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 ;; and return t, otherwise return nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762 (` (and c-auto-newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1763 (not (c-in-literal))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 (not (newline)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766 (defmacro c-safe (&rest body)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1767 ;; safely execute BODY, return nil if an error occurred
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768 (` (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1769 (progn (,@ body))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1770 (error nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1771
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1772 (defun c-insert-special-chars (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 ;; simply call self-insert-command in Emacs 19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774 (self-insert-command (prefix-numeric-value arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 (defun c-intersect-lists (list alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777 ;; return the element of ALIST that matches the first element found
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778 ;; in LIST. Uses assq.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779 (let (match)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 (while (and list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 (not (setq match (assq (car list) alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782 (setq list (cdr list)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 match))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 (defun c-lookup-lists (list alist1 alist2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786 ;; first, find the first entry from LIST that is present in ALIST1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787 ;; then find the entry in ALIST2 for that entry.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 (assq (car (c-intersect-lists list alist1)) alist2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791 ;; This is used by indent-for-comment to decide how much to indent a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 ;; comment in C code based on its context.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793 (defun c-comment-indent ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1794 (if (looking-at (concat "^\\(" c-comment-start-regexp "\\)"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795 0 ;Existing comment at bol stays there.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 (let ((opoint (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 ;; CASE 1: A comment following a solitary close-brace should
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 ;; have only one space.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 ((looking-at (concat "[ \t]*}[ \t]*\\($\\|"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 c-comment-start-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 "\\)"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 (search-forward "}")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 (1+ (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 ;; CASE 2: 2 spaces after #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 ((or (looking-at "^#[ \t]*endif[ \t]*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 (looking-at "^#[ \t]*else[ \t]*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 7)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812 ;; CASE 3: when comment-column is nil, calculate the offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813 ;; according to c-offsets-alist. E.g. identical to hitting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 ;; TAB.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815 ((and c-indent-comments-syntactically-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1816 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1817 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 (or (looking-at comment-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 (eolp))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1820 (let ((syntax (c-guess-basic-syntax)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1821 ;; BOGOSITY ALERT: if we're looking at the eol, its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822 ;; because indent-for-comment hasn't put the comment-start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1823 ;; in the buffer yet. this will screw up the syntactic
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1824 ;; analysis so we kludge in the necessary info. Another
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825 ;; kludge is that if we're at the bol, then we really want
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826 ;; to ignore any anchoring as specified by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 ;; c-comment-only-line-offset since it doesn't apply here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1828 (if (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1829 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1831 (eolp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1832 (c-add-syntax 'comment-intro))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1833 (let ((c-comment-only-line-offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834 (if (consp c-comment-only-line-offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 c-comment-only-line-offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1836 (cons c-comment-only-line-offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837 c-comment-only-line-offset))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 (apply '+ (mapcar 'c-get-offset syntax)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1839 ;; CASE 4: use comment-column if previous line is a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1840 ;; comment-only line indented to the left of comment-column
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1841 ((save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1842 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1843 (and (not (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844 (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846 (prog1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 (looking-at c-comment-start-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 (setq placeholder (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849 (goto-char placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850 (if (< (current-column) comment-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851 comment-column
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1852 (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853 ;; CASE 5: If comment-column is 0, and nothing but space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854 ;; before the comment, align it at 0 rather than 1.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855 ((progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856 (goto-char opoint)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 (and (= comment-column 0) (bolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860 ;; CASE 6: indent at comment column except leave at least one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 ;; space.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 (t (max (1+ (current-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 comment-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864 )))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 ;; used by outline-minor-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 (defun c-outline-level ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 (skip-chars-forward "\t ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872 ;; active regions, and auto-newline/hungry delete key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873 (defun c-keep-region-active ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874 ;; Do whatever is necessary to keep the region active in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875 ;; XEmacs 19. ignore byte-compiler warnings you might see
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 (and (boundp 'zmacs-region-stays)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877 (setq zmacs-region-stays t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 (defun c-update-modeline ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880 ;; set the c-auto-hungry-string for the correct designation on the modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881 (setq c-auto-hungry-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 (if c-auto-newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 (if c-hungry-delete-key "/ah" "/a")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884 (if c-hungry-delete-key "/h" nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1885 ;; updates the modeline for all Emacsen
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1886 (if (or (memq 'v19 c-emacs-features) (memq 'v20 c-emacs-features))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1887 (if (boundp 'redraw-modeline)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1888 (redraw-modeline)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
1889 (force-mode-line-update))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 (set-buffer-modified-p (buffer-modified-p))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1892 (defun c-calculate-state (arg prevstate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1893 ;; Calculate the new state of PREVSTATE, t or nil, based on arg. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894 ;; arg is nil or zero, toggle the state. If arg is negative, turn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1895 ;; the state off, and if arg is positive, turn the state on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896 (if (or (not arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1897 (zerop (setq arg (prefix-numeric-value arg))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 (not prevstate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 (> arg 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 (defun c-toggle-auto-state (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 "Toggle auto-newline feature.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 Optional numeric ARG, if supplied turns on auto-newline when positive,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 turns it off when negative, and just toggles it when zero.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1905
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1906 When the auto-newline feature is enabled (as evidenced by the `/a' or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 `/ah' on the modeline after the mode name) newlines are automatically
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908 inserted after special characters such as brace, comma, semi-colon,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1909 and colon."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 (setq c-auto-newline (c-calculate-state arg c-auto-newline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912 (c-update-modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1913 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915 (defun c-toggle-hungry-state (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916 "Toggle hungry-delete-key feature.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1917 Optional numeric ARG, if supplied turns on hungry-delete when positive,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1918 turns it off when negative, and just toggles it when zero.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1919
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920 When the hungry-delete-key feature is enabled (as evidenced by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1921 `/h' or `/ah' on the modeline after the mode name) the delete key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1922 gobbles all preceding whitespace in one fell swoop."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1924 (setq c-hungry-delete-key (c-calculate-state arg c-hungry-delete-key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1925 (c-update-modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1926 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928 (defun c-toggle-auto-hungry-state (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1929 "Toggle auto-newline and hungry-delete-key features.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1930 Optional numeric ARG, if supplied turns on auto-newline and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1931 hungry-delete when positive, turns them off when negative, and just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1932 toggles them when zero.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1933
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1934 See `c-toggle-auto-state' and `c-toggle-hungry-state' for details."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 (setq c-auto-newline (c-calculate-state arg c-auto-newline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937 (setq c-hungry-delete-key (c-calculate-state arg c-hungry-delete-key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 (c-update-modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1940
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1942 ;; COMMANDS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943 (defun c-electric-delete (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944 "Deletes preceding character or whitespace.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 If `c-hungry-delete-key' is non-nil, as evidenced by the \"/h\" or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1946 \"/ah\" string on the mode line, then all preceding whitespace is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 consumed. If however an ARG is supplied, or `c-hungry-delete-key' is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 nil, or point is inside a literal then the function in the variable
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1949 `c-delete-function' is called."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1950 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951 (if (or (not c-hungry-delete-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952 arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953 (c-in-literal))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954 (funcall c-delete-function (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 (let ((here (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 (skip-chars-backward " \t\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 (if (/= (point) here)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1958 (delete-region (point) here)
153
25f70ba0133c Import from CVS: tag r20-3b3
cvs
parents: 120
diff changeset
1959 (funcall c-delete-function 1))))
25f70ba0133c Import from CVS: tag r20-3b3
cvs
parents: 120
diff changeset
1960 t)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 (defun c-electric-pound (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 "Electric pound (`#') insertion.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964 Inserts a `#' character specially depending on the variable
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965 `c-electric-pound-behavior'. If a numeric ARG is supplied, or if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1966 point is inside a literal, nothing special happens."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1967 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1968 (if (or (c-in-literal)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 (not (memq 'alignleft c-electric-pound-behavior)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971 ;; do nothing special
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972 (self-insert-command (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1973 ;; place the pound character at the left edge
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974 (let ((pos (- (point-max) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 (bolp (bolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 (delete-horizontal-space)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978 (insert-char last-command-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979 (and (not bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1980 (goto-char (- (point-max) pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983 (defun c-electric-brace (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1984 "Insert a brace.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986 If the auto-newline feature is turned on, as evidenced by the \"/a\"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987 or \"/ah\" string on the mode line, newlines are inserted before and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988 after braces based on the value of `c-hanging-braces-alist'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990 Also, the line is re-indented unless a numeric ARG is supplied, there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1991 are non-whitespace characters present on the line after the brace, or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1992 the brace is inserted inside a literal."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1993 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994 (let* ((c-state-cache (c-parse-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995 (safepos (c-safe-position (point) c-state-cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996 (literal (c-in-literal safepos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997 ;; if we're in a literal, or we're not at the end of the line, or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 ;; a numeric arg is provided, or auto-newlining is turned off,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999 ;; then just insert the character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000 (if (or literal arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001 ; (not c-auto-newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 (not (looking-at "[ \t]*$")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 (c-insert-special-chars arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004 (let* ((syms '(class-open class-close defun-open defun-close
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 inline-open inline-close brace-list-open brace-list-close
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006 brace-list-intro brace-list-entry block-open block-close
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2007 substatement-open statement-case-open
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2008 extern-lang-open extern-lang-close))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009 ;; we want to inhibit blinking the paren since this will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2010 ;; be most disruptive. we'll blink it ourselves later on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2011 (old-blink-paren (if (boundp 'blink-paren-function)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2012 blink-paren-function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2013 blink-paren-hook))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2014 blink-paren-function ; emacs19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2015 blink-paren-hook ; emacs18
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2016 (insertion-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 delete-temp-newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018 (preserve-p (= 32 (char-syntax (preceding-char))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2019 ;; shut this up too
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2020 (c-echo-syntactic-information-p nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2021 (syntax (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2022 ;; only insert a newline if there is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2023 ;; non-whitespace behind us
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024 (if (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026 (not (bolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 (progn (newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028 (setq delete-temp-newline t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029 (self-insert-command (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030 ;; state cache doesn't change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 (c-guess-basic-syntax)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 (newlines (and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 c-auto-newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 (or (c-lookup-lists syms syntax c-hanging-braces-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035 '(ignore before after)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036 ;; If syntax is a function symbol, then call it using the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037 ;; defined semantics.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038 (if (and (not (consp (cdr newlines)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2039 (c-functionp (cdr newlines)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040 (let ((c-syntactic-context syntax))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2041 (setq newlines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2042 (funcall (cdr newlines) (car newlines) insertion-point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043 ;; does a newline go before the open brace?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 (if (memq 'before newlines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045 ;; we leave the newline we've put in there before,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2046 ;; but we need to re-indent the line above
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2047 (let ((pos (- (point-max) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048 (here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049 (c-state-cache c-state-cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050 (forward-line -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 ;; we may need to update the cache. this should still be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2052 ;; faster than recalculating the state in many cases
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2054 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2055 (narrow-to-region here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2056 (if (and (c-safe (progn (backward-up-list -1) t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057 (memq (preceding-char) '(?\) ?}))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 (progn (widen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059 (c-safe (progn (forward-sexp -1) t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 (setq c-state-cache
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061 (c-hack-state (point) 'open c-state-cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 (if (and (car c-state-cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2063 (not (consp (car c-state-cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 (<= (point) (car c-state-cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2065 (setq c-state-cache (cdr c-state-cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067 (let ((here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068 (shift (c-indent-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069 (setq c-state-cache (c-adjust-state (c-point 'bol) here
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2070 (- shift) c-state-cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2071 (goto-char (- (point-max) pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 ;; if the buffer has changed due to the indentation, we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073 ;; need to recalculate syntax for the current line, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2074 ;; we won't need to update the state cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075 (if (/= (point) here)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 (setq syntax (c-guess-basic-syntax))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 ;; must remove the newline we just stuck in (if we really did it)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2078 (and delete-temp-newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2079 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2080 ;; if there is whitespace before point, then preserve
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2081 ;; at least one space.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082 (delete-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2083 (just-one-space)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2084 (if (not preserve-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2085 (delete-char -1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2086 ;; since we're hanging the brace, we need to recalculate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2087 ;; syntax. Update the state to accurately reflect the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2088 ;; beginning of the line. We punt if we cross any open or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2089 ;; closed parens because its just too hard to modify the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090 ;; known state. This limitation will be fixed in v5.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2091 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2092 (let ((bol (c-point 'bol)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093 (if (zerop (car (parse-partial-sexp bol (1- (point)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094 (setq c-state-cache (c-whack-state bol c-state-cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2095 syntax (c-guess-basic-syntax))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 ;; gotta punt. this requires some horrible kludgery
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2097 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2098 (makunbound 'c-state-cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2099 (setq c-state-cache (c-parse-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2100 syntax nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2101 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102 ;; now adjust the line's indentation. don't update the state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2103 ;; cache since c-guess-basic-syntax isn't called when the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104 ;; syntax is passed to c-indent-line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2105 (let ((here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106 (shift (c-indent-line syntax)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2107 (setq c-state-cache (c-adjust-state (c-point 'bol) here
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108 (- shift) c-state-cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 ;; Do all appropriate clean ups
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110 (let ((here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 (pos (- (point-max) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112 mbeg mend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 ;; clean up empty defun braces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114 (if (and c-auto-newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115 (memq 'empty-defun-braces c-cleanup-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 (= last-command-char ?\})
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 (c-intersect-lists '(defun-close class-close inline-close)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118 syntax)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2120 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2121 (skip-chars-backward " \t\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2122 (= (preceding-char) ?\{))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123 ;; make sure matching open brace isn't in a comment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 (not (c-in-literal)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125 (delete-region (point) (1- here)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126 ;; clean up brace-else-brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 (if (and c-auto-newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128 (memq 'brace-else-brace c-cleanup-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129 (= last-command-char ?\{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130 (re-search-backward "}[ \t\n]*else[ \t\n]*{" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132 (setq mbeg (match-beginning 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133 mend (match-end 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2134 (= mend here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2135 (not (c-in-literal)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2136 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2137 (delete-region mbeg mend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138 (insert "} else {")))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2139 ;; clean up brace-elseif-brace
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2140 (if (and c-auto-newline
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2141 (memq 'brace-elseif-brace c-cleanup-list)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2142 (= last-command-char ?\{)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2143 (re-search-backward "}[ \t\n]*else[ \t\n]+if[ \t\n]*" nil t)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2144 (save-excursion
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2145 (goto-char (match-end 0))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2146 (c-safe (forward-sexp 1))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2147 (skip-chars-forward " \t\n")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2148 (setq mbeg (match-beginning 0)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2149 mend (match-end 0))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2150 (= here (1+ (point))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2151 (not (c-in-literal)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2152 (progn
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2153 (delete-region mbeg mend)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2154 (insert "} else if ")))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2155 (goto-char (- (point-max) pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2157 ;; does a newline go after the brace?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2158 (if (memq 'after newlines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2159 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2160 (newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2161 ;; update on c-state-cache
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2162 (let* ((bufpos (- (point) 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2163 (which (if (= (char-after bufpos) ?{) 'open 'close))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2164 (c-state-cache (c-hack-state bufpos which c-state-cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2165 (c-indent-line))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2166 ;; blink the paren
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2167 (and (= last-command-char ?\})
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2168 old-blink-paren
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2169 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2170 (c-backward-syntactic-ws safepos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2171 (if (boundp 'blink-paren-function)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2172 (funcall old-blink-paren)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2173 (run-hooks old-blink-paren))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2174 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2176 (defun c-electric-slash (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2177 "Insert a slash character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2178 If slash is second of a double-slash C++ style comment introducing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2179 construct, and we are on a comment-only-line, indent line as comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2180 If numeric ARG is supplied or point is inside a literal, indentation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2181 is inhibited."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2182 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2183 (let ((indentp (and (not arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2184 (= (preceding-char) ?/)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2185 (= last-command-char ?/)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2186 (not (c-in-literal))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2187 ;; shut this up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2188 (c-echo-syntactic-information-p nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2189 (self-insert-command (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2190 (if indentp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2191 (c-indent-line))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2193 (defun c-electric-star (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2194 "Insert a star character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2195 If the star is the second character of a C style comment introducing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2196 construct, and we are on a comment-only-line, indent line as comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2197 If numeric ARG is supplied or point is inside a literal, indentation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2198 is inhibited."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2199 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2200 (self-insert-command (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2201 ;; if we are in a literal, or if arg is given do not re-indent the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2202 ;; current line, unless this star introduces a comment-only line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2203 (if (and (not arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2204 (memq (c-in-literal) '(c))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2205 (= (preceding-char) ?*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2206 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2207 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2208 (skip-chars-backward "*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2209 (if (= (preceding-char) ?/)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2210 (forward-char -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2211 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2212 (bolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2213 ;; shut this up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2214 (let (c-echo-syntactic-information-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2215 (c-indent-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2216 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2217
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2218 (defun c-electric-semi&comma (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2219 "Insert a comma or semicolon.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2220 When the auto-newline feature is turned on, as evidenced by the \"/a\"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2221 or \"/ah\" string on the mode line, a newline might be inserted. See
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2222 the variable `c-hanging-semi&comma-criteria' for how newline insertion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2223 is determined.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2225 When semicolon is inserted, the line is re-indented unless a numeric
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2226 arg is supplied, point is inside a literal, or there are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2227 non-whitespace characters on the line following the semicolon."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2228 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2229 (let* ((lim (c-most-enclosing-brace (c-parse-state)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2230 (literal (c-in-literal lim))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2231 (here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2232 ;; shut this up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2233 (c-echo-syntactic-information-p nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2234 (if (or literal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2235 arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2236 (not (looking-at "[ \t]*$")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2237 (c-insert-special-chars arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2238 ;; do some special stuff with the character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2239 (self-insert-command (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2240 ;; do all cleanups, reindentations, and newline insertions, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2241 ;; only if c-auto-newline is turned on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2242 (if (not c-auto-newline) nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2243 ;; clean ups
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2244 (let ((pos (- (point-max) (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2245 (if (and (or (and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2246 (= last-command-char ?,)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2247 (memq 'list-close-comma c-cleanup-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2248 (and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2249 (= last-command-char ?\;)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2250 (memq 'defun-close-semi c-cleanup-list)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2251 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2252 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2253 (skip-chars-backward " \t\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2254 (= (preceding-char) ?}))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2255 ;; make sure matching open brace isn't in a comment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2256 (not (c-in-literal lim)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2257 (delete-region (point) here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2258 (goto-char (- (point-max) pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2259 ;; re-indent line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2260 (c-indent-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2261 ;; check to see if a newline should be added
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2262 (let ((criteria c-hanging-semi&comma-criteria)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2263 answer add-newline-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2264 (while criteria
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2265 (setq answer (funcall (car criteria)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2266 ;; only nil value means continue checking
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2267 (if (not answer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2268 (setq criteria (cdr criteria))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2269 (setq criteria nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2270 ;; only 'stop specifically says do not add a newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2271 (setq add-newline-p (not (eq answer 'stop)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2272 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2273 (if add-newline-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2274 (progn (newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2275 (c-indent-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2276 )))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2278 (defun c-semi&comma-inside-parenlist ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2279 "Determine if a newline should be added after a semicolon.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2280 If a comma was inserted, no determination is made. If a semicolon was
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2281 inserted inside a parenthesis list, no newline is added otherwise a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2282 newline is added. In either case, checking is stopped. This supports
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2283 exactly the old newline insertion behavior."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2284 ;; newline only after semicolon, but only if that semicolon is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2285 ;; inside a parenthesis list (e.g. a for loop statement)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2286 (if (/= last-command-char ?\;)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2287 nil ; continue checking
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2288 (if (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2289 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2290 (up-list -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2291 (/= (following-char) ?\())
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2292 (error t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2293 t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2294 'stop)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2295
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2296 (defun c-electric-colon (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2297 "Insert a colon.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2298
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2299 If the auto-newline feature is turned on, as evidenced by the \"/a\"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2300 or \"/ah\" string on the mode line, newlines are inserted before and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2301 after colons based on the value of `c-hanging-colons-alist'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2302
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2303 Also, the line is re-indented unless a numeric ARG is supplied, there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2304 are non-whitespace characters present on the line after the colon, or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2305 the colon is inserted inside a literal.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2307 This function cleans up double colon scope operators based on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2308 value of `c-cleanup-list'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2309 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2310 (let* ((bod (c-point 'bod))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2311 (literal (c-in-literal bod))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2312 syntax newlines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2313 ;; shut this up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2314 (c-echo-syntactic-information-p nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2315 (if (or literal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2316 arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2317 (not (looking-at "[ \t]*$")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2318 (c-insert-special-chars arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2319 ;; insert the colon, then do any specified cleanups
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2320 (self-insert-command (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2321 (let ((pos (- (point-max) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2322 (here (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2323 (if (and c-auto-newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2324 (memq 'scope-operator c-cleanup-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2325 (= (preceding-char) ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2326 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2327 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2328 (skip-chars-backward " \t\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2329 (= (preceding-char) ?:))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2330 (not (c-in-literal))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2331 (not (= (char-after (- (point) 2)) ?:)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2332 (delete-region (point) (1- here)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2333 (goto-char (- (point-max) pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2334 ;; lets do some special stuff with the colon character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2335 (setq syntax (c-guess-basic-syntax)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2336 ;; some language elements can only be determined by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2337 ;; checking the following line. Lets first look for ones
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2338 ;; that can be found when looking on the line with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2339 ;; colon
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2340 newlines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2341 (and c-auto-newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2342 (or (c-lookup-lists '(case-label label access-label)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2343 syntax c-hanging-colons-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2344 (c-lookup-lists '(member-init-intro inher-intro)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2345 (prog2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2346 (insert "\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2347 (c-guess-basic-syntax)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2348 (delete-char -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2349 c-hanging-colons-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2350 ;; indent the current line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2351 (c-indent-line syntax)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2352 ;; does a newline go before the colon? Watch out for already
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2353 ;; non-hung colons. However, we don't unhang them because that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2354 ;; would be a cleanup (and anti-social).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2355 (if (and (memq 'before newlines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2356 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2357 (skip-chars-backward ": \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2358 (not (bolp))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2359 (let ((pos (- (point-max) (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2360 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2361 (newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2362 (c-indent-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2363 (goto-char (- (point-max) pos))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2364 ;; does a newline go after the colon?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2365 (if (memq 'after (cdr-safe newlines))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2366 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2367 (newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2368 (c-indent-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2369 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2370
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2371 (defun c-electric-lt-gt (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2372 "Insert a less-than, or greater-than character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2373 When the auto-newline feature is turned on, as evidenced by the \"/a\"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2374 or \"/ah\" string on the mode line, the line will be re-indented if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2375 the character inserted is the second of a C++ style stream operator
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2376 and the buffer is in C++ mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2378 The line will also not be re-indented if a numeric argument is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2379 supplied, or point is inside a literal."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2380 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2381 (let ((indentp (and (not arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2382 (= (preceding-char) last-command-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2383 (not (c-in-literal))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2384 ;; shut this up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2385 (c-echo-syntactic-information-p nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2386 (self-insert-command (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2387 (if indentp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2388 (c-indent-line))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2390 ;; set up electric character functions to work with pending-del,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2391 ;; (a.k.a. delsel) mode. All symbols get the t value except
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2392 ;; c-electric-delete which gets 'supersede.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2393 (mapcar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2394 (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2395 (lambda (sym)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2396 (put sym 'delete-selection t) ; for delsel (Emacs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2397 (put sym 'pending-delete t))) ; for pending-del (XEmacs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2398 '(c-electric-pound
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2399 c-electric-brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2400 c-electric-slash
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2401 c-electric-star
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2402 c-electric-semi&comma
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2403 c-electric-lt-gt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2404 c-electric-colon))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2405 (put 'c-electric-delete 'delete-selection 'supersede) ; delsel
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2406 (put 'c-electric-delete 'pending-delete 'supersede) ; pending-del
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2407
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2409
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2410 (defvar c-read-offset-history nil)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2411
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2412 (defun c-read-offset (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2413 ;; read new offset value for LANGELEM from minibuffer. return a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2414 ;; legal value only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2415 (let* ((oldoff (cdr-safe (assq langelem c-offsets-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2416 (defstr (format "(default %s): " oldoff))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2417 (errmsg (concat "Offset must be int, func, var, "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2418 "or in [+,-,++,--,*,/] "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2419 defstr))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2420 (prompt (concat "Offset " defstr))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2421 offset input interned raw)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2422 (while (not offset)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2423 (setq input (completing-read prompt obarray 'fboundp nil nil
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2424 'c-read-offset-history)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2425 offset (cond ((string-equal "" input) oldoff) ; default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2426 ((string-equal "+" input) '+)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2427 ((string-equal "-" input) '-)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2428 ((string-equal "++" input) '++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2429 ((string-equal "--" input) '--)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2430 ((string-equal "*" input) '*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2431 ((string-equal "/" input) '/)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2432 ((string-match "^-?[0-9]+$" input)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2433 (string-to-int input))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2434 ;; a symbol with a function binding
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2435 ((fboundp (setq interned (intern input)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2436 interned)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2437 ;; a lambda function
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2438 ((condition-case nil
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2439 (c-functionp (setq raw (read input)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2440 (error nil))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2441 raw)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2442 ;; a symbol with variable binding
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2443 ((boundp interned) interned)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2444 ;; error, but don't signal one, keep trying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2445 ;; to read an input value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2446 (t (ding)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2447 (setq prompt errmsg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2448 nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2449 offset))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2450
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2451 (defun c-set-offset (symbol offset &optional add-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2452 "Change the value of a syntactic element symbol in `c-offsets-alist'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2453 SYMBOL is the syntactic element symbol to change and OFFSET is the new
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2454 offset for that syntactic element. Optional ADD says to add SYMBOL to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2455 `c-offsets-alist' if it doesn't already appear there."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2456 (interactive
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2457 (let* ((langelem
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2458 (intern (completing-read
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2459 (concat "Syntactic symbol to change"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2460 (if current-prefix-arg " or add" "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2461 ": ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2462 (mapcar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2463 (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2464 (lambda (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2465 (cons (format "%s" (car langelem)) nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2466 c-offsets-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2467 nil (not current-prefix-arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2468 ;; initial contents tries to be the last element
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2469 ;; on the syntactic analysis list for the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2470 ;; line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2471 (let* ((syntax (c-guess-basic-syntax))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2472 (len (length syntax))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2473 (ic (format "%s" (car (nth (1- len) syntax)))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2474 (if (or (memq 'v19 c-emacs-features)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2475 (memq 'v20 c-emacs-features))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2476 (cons ic 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2477 ic))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2478 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2479 (offset (c-read-offset langelem)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2480 (list langelem offset current-prefix-arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2481 ;; sanity check offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2482 (or (eq offset '+)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2483 (eq offset '-)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2484 (eq offset '++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2485 (eq offset '--)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2486 (eq offset '*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2487 (eq offset '/)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2488 (integerp offset)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2489 (c-functionp offset)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2490 (boundp offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2491 (error "Offset must be int, func, var, or in [+,-,++,--,*,/]: %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2492 offset))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2493 (let ((entry (assq symbol c-offsets-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2494 (if entry
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2495 (setcdr entry offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2496 (if add-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2497 (setq c-offsets-alist (cons (cons symbol offset) c-offsets-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2498 (error "%s is not a valid syntactic symbol." symbol))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2499 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2500
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2501 (defun c-set-style-1 (stylevars)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2502 ;; given a style's variable alist, institute the style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2503 (mapcar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2504 (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2505 (lambda (conscell)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2506 (let ((attr (car conscell))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2507 (val (cdr conscell)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2508 (cond
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2509 ((eq attr 'c-offsets-alist)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2510 (mapcar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2511 (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2512 (lambda (langentry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2513 (let ((langelem (car langentry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2514 (offset (cdr langentry)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2515 (c-set-offset langelem offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2516 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2517 val))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2518 ((eq attr 'c-special-indent-hook)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2519 (if (listp val)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2520 (while val
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2521 (add-hook 'c-special-indent-hook (car val))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2522 (setq val (cdr val)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2523 (add-hook 'c-special-indent-hook val)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2524 (t (set attr val)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2525 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2526 stylevars))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2527
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2528 (defvar c-set-style-history nil)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2529
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
2530 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2531 (defun c-set-style (stylename)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2532 "Set CC Mode variables to use one of several different indentation styles.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2533 STYLENAME is a string representing the desired style from the list of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2534 styles described in the variable `c-style-alist'. See that variable
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2535 for details of setting up styles.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2536
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2537 The variable `c-indentation-style' always contains the buffer's current
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2538 style name."
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2539 (interactive (list (let ((completion-ignore-case t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2540 (prompt (format "Which %s indentation style? "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2541 mode-name)))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2542 (completing-read prompt c-style-alist nil t
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2543 (cons c-indentation-style 0)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2544 'c-set-style-history))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2545 (let ((vars (cdr (or (assoc (downcase stylename) c-style-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2546 (assoc (upcase stylename) c-style-alist)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2547 (assoc stylename c-style-alist)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2548 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2549 (default (cdr (assoc "cc-mode" c-style-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2550 (or vars (error "Invalid indentation style `%s'" stylename))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2551 (or default (error "No `cc-mode' style found!"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2552 ;; first reset the style to `cc-mode' to give every style a common
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2553 ;; base. Then institute the new style.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2554 (c-set-style-1 default)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2555 (setq c-indentation-style stylename)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2556 (if (not (string= stylename "cc-mode"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2557 (c-set-style-1 vars)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2558 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2559
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2560 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2561 (defun c-add-style (style descrip &optional set-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2562 "Adds a style to `c-style-alist', or updates an existing one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2563 STYLE is a string identifying the style to add or update. DESCRIP is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2564 an association list describing the style and must be of the form:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2566 ((VARIABLE . VALUE) [(VARIABLE . VALUE) ...])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2567
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2568 See the variable `c-style-alist' for the semantics of VARIABLE and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2569 VALUE. This function also sets the current style to STYLE using
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2570 `c-set-style' if the optional SET-P flag is non-nil."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2571 (interactive
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2572 (let ((stylename (completing-read "Style to add: " c-style-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2573 (description (eval-minibuffer "Style description: ")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2574 (list stylename description
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2575 (y-or-n-p "Set the style too? "))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2576 (setq style (downcase style))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2577 (let ((s (assoc style c-style-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2578 (if s
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2579 (setcdr s (copy-alist descrip)) ; replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2580 (setq c-style-alist (cons (cons style descrip) c-style-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2581 (and set-p (c-set-style style)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2582
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
2583
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2584 (defun c-fill-paragraph (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2585 "Like \\[fill-paragraph] but handles C and C++ style comments.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2586 If any of the current line is a comment or within a comment,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2587 fill the comment or the paragraph of it that point is in,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2588 preserving the comment indentation or line-starting decorations.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2589
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2590 Optional prefix ARG means justify paragraph as well."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2591 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2592 (let* (comment-start-place
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2593 (first-line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2594 ;; Check for obvious entry to comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2595 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2596 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2597 (skip-chars-forward " \t\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2598 (and (looking-at comment-start-skip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2599 (setq comment-start-place (point)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2600 (re1 (if (memq 'new-re c-emacs-features)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2601 "\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2602 "\\|^[ \t]*/\\*[ \t]*$\\|^[ \t]*\\*/[ \t]*$\\|^[ \t/*]*$"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2603 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2604 (if (and c-double-slash-is-comments-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2605 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2606 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2607 (looking-at ".*//")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2608 (let (fill-prefix
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2609 ;; Lines containing just a comment start or just an end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2610 ;; should not be filled into paragraphs they are next
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2611 ;; to.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2612 (paragraph-start (concat paragraph-start re1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2613 (paragraph-separate (concat paragraph-separate re1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2614 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2615 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2616 ;; Move up to first line of this comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2617 (while (and (not (bobp))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2618 (looking-at "[ \t]*//[ \t]*[^ \t\n]"))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2619 (forward-line -1))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2620 (if (not (looking-at ".*//[ \t]*[^ \t\n]"))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2621 (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2622 ;; Find the comment start in this line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2623 (re-search-forward "[ \t]*//[ \t]*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2624 ;; Set the fill-prefix to be what all lines except the first
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2625 ;; should start with.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2626 (setq fill-prefix (buffer-substring (match-beginning 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2627 (match-end 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2628 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2629 ;; Narrow down to just the lines of this comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2630 (narrow-to-region (c-point 'bol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2631 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2632 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2633 (while (looking-at fill-prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2634 (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2635 (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2636 (fill-paragraph arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2637 t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2638 ;; else C style comments
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2639 (if (or first-line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2640 ;; t if we enter a comment between start of function and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2641 ;; this line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2642 (eq (c-in-literal) 'c)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2643 ;; t if this line contains a comment starter.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2644 (setq first-line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2645 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2646 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2647 (prog1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2648 (re-search-forward comment-start-skip
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2649 (save-excursion (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2650 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2651 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2652 (setq comment-start-place (point))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2653 ;; Inside a comment: fill one comment paragraph.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2654 (let ((fill-prefix
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2655 ;; The prefix for each line of this paragraph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2656 ;; is the appropriate part of the start of this line,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2657 ;; up to the column at which text should be indented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2658 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2659 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2660 (if (looking-at "[ \t]*/\\*.*\\*/")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2661 (progn (re-search-forward comment-start-skip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2662 (make-string (current-column) ?\ ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2663 (if first-line (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2664
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2665 (let ((line-width (progn (end-of-line) (current-column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2666 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2667 (prog1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2668 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2669 (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2670
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2671 ;; How shall we decide where the end of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2672 ;; fill-prefix is?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2673 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2674 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2675 (skip-chars-forward " \t*" (c-point 'eol))
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
2676 ;; kludge alert, watch out for */, in
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
2677 ;; which case fill-prefix should *not*
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
2678 ;; be "*"!
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
2679 (if (and (= (following-char) ?/)
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
2680 (= (preceding-char) ?*))
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
2681 (forward-char -1))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2682 (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2683
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2684 ;; If the comment is only one line followed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2685 ;; by a blank line, calling move-to-column
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2686 ;; above may have added some spaces and tabs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2687 ;; to the end of the line; the fill-paragraph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2688 ;; function will then delete it and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2689 ;; newline following it, so we'll lose a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2690 ;; blank line when we shouldn't. So delete
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2691 ;; anything move-to-column added to the end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2692 ;; of the line. We record the line width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2693 ;; instead of the position of the old line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2694 ;; end because move-to-column might break a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2695 ;; tab into spaces, and the new characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2696 ;; introduced there shouldn't be deleted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2697
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2698 ;; If you can see a better way to do this,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2699 ;; please make the change. This seems very
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2700 ;; messy to me.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2701 (delete-region (progn (move-to-column line-width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2702 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2703 (progn (end-of-line) (point))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2704
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2705 ;; Lines containing just a comment start or just an end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2706 ;; should not be filled into paragraphs they are next
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2707 ;; to.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2708 (paragraph-start (concat paragraph-start re1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2709 (paragraph-separate (concat paragraph-separate re1))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2710 (chars-to-delete 0)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2711 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2712 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2713 ;; Don't fill the comment together with the code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2714 ;; following it. So temporarily exclude everything
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2715 ;; before the comment start, and everything after the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2716 ;; line where the comment ends. If comment-start-place
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2717 ;; is non-nil, the comment starter is there. Otherwise,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2718 ;; point is inside the comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2719 (narrow-to-region (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2720 (if comment-start-place
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2721 (goto-char comment-start-place)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2722 (search-backward "/*"))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2723 (if (and (not c-hanging-comment-starter-p)
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
2724 (looking-at
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
2725 (concat c-comment-start-regexp
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
2726 "[ \t]*$")))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2727 (forward-line 1))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2728 ;; Protect text before the comment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2729 ;; start by excluding it. Add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2730 ;; spaces to bring back proper
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2731 ;; indentation of that point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2732 (let ((column (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2733 (prog1 (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2734 (setq chars-to-delete column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2735 (insert-char ?\ column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2736 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2737 (if comment-start-place
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2738 (goto-char (+ comment-start-place 2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2739 (search-forward "*/" nil 'move)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2740 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2741 (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2742 (fill-paragraph arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2743 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2744 ;; Delete the chars we inserted to avoid clobbering
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2745 ;; the stuff before the comment start.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2746 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2747 (if (> chars-to-delete 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2748 (delete-region (point) (+ (point) chars-to-delete)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2749 ;; Find the comment ender (should be on last line of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2750 ;; buffer, given the narrowing) and don't leave it on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2751 ;; its own line, unless that's the style that's desired.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2752 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2753 (forward-line -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2754 (search-forward "*/" nil 'move)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2755 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2756 (if (and c-hanging-comment-ender-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2757 (looking-at "[ \t]*\\*/"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2758 ;(delete-indentation)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2759 (let ((fill-column (+ fill-column 9999)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2760 (forward-line -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2761 (fill-region-as-paragraph (point) (point-max))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2762 t)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2763
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2764
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2765 ;; better movement routines for ThisStyleOfVariablesCommonInCPlusPlus
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2766 ;; originally contributed by Terry_Glanfield.Southern@rxuk.xerox.com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2767 (defun c-forward-into-nomenclature (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2768 "Move forward to end of a nomenclature section or word.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2769 With arg, to it arg times."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2770 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2771 (let ((case-fold-search nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2772 (if (> arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2773 (re-search-forward "\\W*\\([A-Z]*[a-z0-9]*\\)" (point-max) t arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2774 (while (and (< arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2775 (re-search-backward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2776 "\\(\\(\\W\\|[a-z0-9]\\)[A-Z]+\\|\\W\\w+\\)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2777 (point-min) 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2778 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2779 (setq arg (1+ arg)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2780 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2781
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2782 (defun c-backward-into-nomenclature (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2783 "Move backward to beginning of a nomenclature section or word.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2784 With optional ARG, move that many times. If ARG is negative, move
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2785 forward."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2786 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2787 (c-forward-into-nomenclature (- arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2788 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2790 (defun c-scope-operator ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2791 "Insert a double colon scope operator at point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2792 No indentation or other \"electric\" behavior is performed."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2793 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2794 (insert "::"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2795
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2796
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2797 (defun c-beginning-of-statement (&optional count lim sentence-flag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2798 "Go to the beginning of the innermost C statement.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2799 With prefix arg, go back N - 1 statements. If already at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2800 beginning of a statement then go to the beginning of the preceding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2801 one. If within a string or comment, or next to a comment (only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2802 whitespace between), move by sentences instead of statements.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2803
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2804 When called from a program, this function takes 3 optional args: the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2805 repetition count, a buffer position limit which is the farthest back
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2806 to search, and a flag saying whether to do sentence motion when in a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2807 comment."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2808 (interactive (list (prefix-numeric-value current-prefix-arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2809 nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2810 (let ((here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2811 (count (or count 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2812 (lim (or lim (c-point 'bod)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2813 state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2814 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2815 (goto-char lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2816 (setq state (parse-partial-sexp (point) here nil nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2817 (if (and sentence-flag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2818 (or (nth 3 state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2819 (nth 4 state)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2820 ; (looking-at (concat "[ \t]*" comment-start-skip))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2821 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2822 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2823 (goto-char (- (point) 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2824 (looking-at "\\*/"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2825 (forward-sentence (- count))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2826 (while (> count 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2827 (c-beginning-of-statement-1 lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2828 (setq count (1- count)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2829 (while (< count 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2830 (c-end-of-statement-1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2831 (setq count (1+ count))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2832 ;; its possible we've been left up-buf of lim
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2833 (goto-char (max (point) lim))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2834 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2835 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2836
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2837 (defun c-end-of-statement (&optional count lim sentence-flag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2838 "Go to the end of the innermost C statement.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2839
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2840 With prefix arg, go forward N - 1 statements. Move forward to end of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2841 the next statement if already at end. If within a string or comment,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2842 move by sentences instead of statements.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2843
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2844 When called from a program, this function takes 3 optional args: the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2845 repetition count, a buffer position limit which is the farthest back
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2846 to search, and a flag saying whether to do sentence motion when in a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2847 comment."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2848 (interactive (list (prefix-numeric-value current-prefix-arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2849 nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2850 (c-beginning-of-statement (- (or count 1)) lim sentence-flag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2851 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2852
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2853 ;; WARNING: Be *exceptionally* careful about modifications to this
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2854 ;; function! Much of CC Mode depends on this Doing The Right Thing.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
2855 ;; If you break it you will be sorry.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2856 (defun c-beginning-of-statement-1 (&optional lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2857 ;; move to the start of the current statement, or the previous
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2858 ;; statement if already at the beginning of one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2859 (let ((firstp t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2860 (substmt-p t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2861 donep c-in-literal-cache
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2862 ;; KLUDGE ALERT: maybe-labelp is used to pass information
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2863 ;; between c-crosses-statement-barrier-p and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2864 ;; c-beginning-of-statement-1. A better way should be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2865 ;; implemented.
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2866 maybe-labelp saved
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2867 (last-begin (point)))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2868 ;; first check for bare semicolon
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2869 (if (and (progn (c-backward-syntactic-ws lim)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2870 (= (preceding-char) ?\;))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2871 (c-safe (progn (forward-char -1)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2872 (setq saved (point))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2873 t))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2874 (progn (c-backward-syntactic-ws lim)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2875 (memq (preceding-char) '(?\; ?{ ?} ?:)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2876 )
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2877 (setq last-begin saved)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2878 (goto-char last-begin)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2879 (while (not donep)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2880 ;; stop at beginning of buffer
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2881 (if (bobp) (setq donep t)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2882 ;; go backwards one balanced expression, but be careful of
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2883 ;; unbalanced paren being reached
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2884 (if (not (c-safe (progn (backward-sexp 1) t)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2885 (progn
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2886 (if firstp
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2887 (backward-up-list 1)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2888 (goto-char last-begin))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2889 ;; skip over any unary operators, or other special
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2890 ;; characters appearing at front of identifier
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2891 (save-excursion
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2892 (c-backward-syntactic-ws lim)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2893 (skip-chars-backward "-+!*&:.~ \t\n")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2894 (if (= (preceding-char) ?\()
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2895 (setq last-begin (point))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2896 (goto-char last-begin)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2897 (setq last-begin (point)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2898 donep t)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2899
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2900 (setq maybe-labelp nil)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2901 ;; see if we're in a literal. if not, then this bufpos may be
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2902 ;; a candidate for stopping
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2903 (cond
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2904 ;; CASE 0: did we hit the error condition above?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2905 (donep)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2906 ;; CASE 1: are we in a literal?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2907 ((eq (c-in-literal lim) 'pound)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2908 (beginning-of-line))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2909 ;; CASE 2: some other kind of literal?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2910 ((c-in-literal lim))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2911 ;; CASE 3: are we looking at a conditional keyword?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2912 ((or (looking-at c-conditional-key)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2913 (and (= (following-char) ?\()
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2914 (save-excursion
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2915 (forward-sexp 1)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2916 (c-forward-syntactic-ws)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2917 (/= (following-char) ?\;))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2918 (let ((here (point))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2919 (foundp (progn
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2920 (c-backward-syntactic-ws lim)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2921 (forward-word -1)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2922 (and lim
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2923 (<= lim (point))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2924 (not (c-in-literal lim))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2925 (looking-at c-conditional-key)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2926 ))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2927 ;; did we find a conditional?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2928 (if (not foundp)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2929 (goto-char here))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2930 foundp)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2931 ;; are we in the middle of an else-if clause?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2932 (if (save-excursion
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2933 (and (not substmt-p)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2934 (c-safe (progn (forward-sexp -1) t))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2935 (looking-at "\\<else\\>[ \t\n]+\\<if\\>")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2936 (not (c-in-literal lim))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2937 (progn
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2938 (forward-sexp -1)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2939 (c-backward-to-start-of-if lim)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2940 ;; are we sitting at an else clause, that we are not a
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2941 ;; substatement of?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2942 (if (and (not substmt-p)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2943 (looking-at "\\<else\\>[^_]"))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2944 (c-backward-to-start-of-if lim))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2945 ;; are we sitting at the while of a do-while?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2946 (if (and (looking-at "\\<while\\>[^_]")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2947 (c-backward-to-start-of-do lim))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2948 (setq substmt-p nil))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2949 (setq last-begin (point)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2950 donep substmt-p))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2951 ;; CASE 4: are we looking at a label?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2952 ((looking-at c-label-key))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2953 ;; CASE 5: is this the first time we're checking?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2954 (firstp (setq firstp nil
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2955 substmt-p (not (c-crosses-statement-barrier-p
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2956 (point) last-begin))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2957 last-begin (point)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2958 ;; CASE 6: have we crossed a statement barrier?
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2959 ((c-crosses-statement-barrier-p (point) last-begin)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2960 (setq donep t))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2961 ;; CASE 7: ignore labels
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2962 ((and maybe-labelp
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2963 (or (and c-access-key (looking-at c-access-key))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2964 ;; with switch labels, we have to go back further
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2965 ;; to try to pick up the case or default
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2966 ;; keyword. Potential bogosity alert: we assume
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2967 ;; `case' or `default' is first thing on line
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2968 (let ((here (point)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2969 (beginning-of-line)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2970 (c-forward-syntactic-ws)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2971 (if (looking-at c-switch-label-key)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2972 t
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2973 (goto-char here)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2974 nil))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2975 (looking-at c-label-key))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2976 ;; CASE 8: ObjC or Java method def
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2977 ((and c-method-key
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2978 (setq last-begin (c-in-method-def-p)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2979 (setq donep t))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2980 ;; CASE 9: nothing special
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2981 (t (setq last-begin (point)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
2982 ))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2983 (goto-char last-begin)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2984 ;; we always do want to skip over non-whitespace modifier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2985 ;; characters that didn't get skipped above
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2986 (skip-chars-backward "-+!*&:.~" (c-point 'boi))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2988 (defun c-end-of-statement-1 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2989 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2990 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2991 (while (and (not (eobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2992 (let ((beg (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2993 (forward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2994 (let ((end (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2995 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2996 (goto-char beg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2997 (not (re-search-forward "[;{}]" end t)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2998 (re-search-backward "[;}]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2999 (forward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3000 (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3001 (let ((beg (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3002 (backward-up-list -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3003 (let ((end (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3004 (goto-char beg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3005 (search-forward ";" end 'move))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3006
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3007 (defun c-crosses-statement-barrier-p (from to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3008 ;; Does buffer positions FROM to TO cross a C statement boundary?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3009 (let ((here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3010 (lim from)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3011 crossedp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3012 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3013 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3014 (goto-char from)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3015 (while (and (not crossedp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3016 (< (point) to))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3017 (skip-chars-forward "^;{}:" to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3018 (if (not (c-in-literal lim))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3019 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3020 (if (memq (following-char) '(?\; ?{ ?}))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3021 (setq crossedp t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3022 (if (= (following-char) ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3023 (setq maybe-labelp t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3024 (forward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3025 (setq lim (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3026 (forward-char 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3027 (error (setq crossedp nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3028 (goto-char here)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3029 crossedp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3030
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3031
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3032 (defun c-up-conditional (count)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3033 "Move back to the containing preprocessor conditional, leaving mark behind.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3034 A prefix argument acts as a repeat count. With a negative argument,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3035 move forward to the end of the containing preprocessor conditional.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3036 When going backwards, `#elif' is treated like `#else' followed by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3037 `#if'. When going forwards, `#elif' is ignored."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3038 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3039 (c-forward-conditional (- count) t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3040 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3041
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3042 (defun c-backward-conditional (count &optional up-flag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3043 "Move back across a preprocessor conditional, leaving mark behind.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3044 A prefix argument acts as a repeat count. With a negative argument,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3045 move forward across a preprocessor conditional."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3046 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3047 (c-forward-conditional (- count) up-flag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3048 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3049
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3050 (defun c-forward-conditional (count &optional up-flag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3051 "Move forward across a preprocessor conditional, leaving mark behind.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3052 A prefix argument acts as a repeat count. With a negative argument,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3053 move backward across a preprocessor conditional."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3054 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3055 (let* ((forward (> count 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3056 (increment (if forward -1 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3057 (search-function (if forward 're-search-forward 're-search-backward))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3058 (new))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3059 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3060 (while (/= count 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3061 (let ((depth (if up-flag 0 -1)) found)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3062 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3063 ;; Find the "next" significant line in the proper direction.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3064 (while (and (not found)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3065 ;; Rather than searching for a # sign that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3066 ;; comes at the beginning of a line aside from
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3067 ;; whitespace, search first for a string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3068 ;; starting with # sign. Then verify what
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3069 ;; precedes it. This is faster on account of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3070 ;; the fastmap feature of the regexp matcher.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3071 (funcall search-function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3072 "#[ \t]*\\(if\\|elif\\|endif\\)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3073 nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3074 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3075 ;; Now verify it is really a preproc line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3076 (if (looking-at "^[ \t]*#[ \t]*\\(if\\|elif\\|endif\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3077 (let ((prev depth))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3078 ;; Update depth according to what we found.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3079 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3080 (cond ((looking-at "[ \t]*#[ \t]*endif")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3081 (setq depth (+ depth increment)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3082 ((looking-at "[ \t]*#[ \t]*elif")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3083 (if (and forward (= depth 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3084 (setq found (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3085 (t (setq depth (- depth increment))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3086 ;; If we are trying to move across, and we find an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3087 ;; end before we find a beginning, get an error.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3088 (if (and (< prev 0) (< depth prev))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3089 (error (if forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3090 "No following conditional at this level"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3091 "No previous conditional at this level")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3092 ;; When searching forward, start from next line so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3093 ;; that we don't find the same line again.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3094 (if forward (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3095 ;; If this line exits a level of conditional, exit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3096 ;; inner loop.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3097 (if (< depth 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3098 (setq found (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3099 ;; else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3100 (if forward (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3101 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3102 (or found
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3103 (error "No containing preprocessor conditional"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3104 (goto-char (setq new found)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3105 (setq count (+ count increment))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3106 (push-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3107 (goto-char new))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3108 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3109
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3111 ;; commands to indent lines, regions, defuns, and expressions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3112 (defun c-indent-command (&optional whole-exp)
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3113 "Indent current line as C code, and/or insert some whitespace.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3114
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3115 If `c-tab-always-indent' is t, always just indent the current line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3116 If nil, indent the current line only if point is at the left margin or
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3117 in the line's indentation; otherwise insert some whitespace[*]. If
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3118 other than nil or t, then some whitespace[*] is inserted only within
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3119 literals (comments and strings) and inside preprocessor directives,
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3120 but the line is always reindented.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3121
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3122 A numeric argument, regardless of its value, means indent rigidly all
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3123 the lines of the expression starting after point so that this line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3124 becomes properly indented. The relative indentation among the lines
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3125 of the expression are preserved.
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3126
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3127 [*] The amount and kind of whitespace inserted is controlled by the
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3128 variable `c-insert-tab-function', which is called to do the actual
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3129 insertion of whitespace. Normally the function in this variable
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3130 just inserts a tab character, or the equivalent number of spaces,
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3131 depending on the variable `indent-tabs-mode'."
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
3132
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3133 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3134 (let ((bod (c-point 'bod)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3135 (if whole-exp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3136 ;; If arg, always indent this line as C
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3137 ;; and shift remaining lines of expression the same amount.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3138 (let ((shift-amt (c-indent-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3139 beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3140 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3141 (if (eq c-tab-always-indent t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3142 (beginning-of-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3143 (setq beg (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3144 (forward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3145 (setq end (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3146 (goto-char beg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3147 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3148 (setq beg (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3149 (if (> end beg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3150 (indent-code-rigidly beg end (- shift-amt) "#")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3151 ;; No arg supplied, use c-tab-always-indent to determine
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3152 ;; behavior
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3153 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3154 ;; CASE 1: indent when at column zero or in lines indentation,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3155 ;; otherwise insert a tab
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3156 ((not c-tab-always-indent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3157 (if (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3158 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3159 (not (bolp)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3160 (funcall c-insert-tab-function)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3161 (c-indent-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3162 ;; CASE 2: just indent the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3163 ((eq c-tab-always-indent t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3164 (c-indent-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3165 ;; CASE 3: if in a literal, insert a tab, but always indent the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3166 ;; line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3167 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3168 (if (c-in-literal bod)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3169 (funcall c-insert-tab-function))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3170 (c-indent-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3171 )))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3172
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3173 (defun c-indent-exp (&optional shutup-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3174 "Indent each line in balanced expression following point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3175 Optional SHUTUP-P if non-nil, inhibits message printing and error checking."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3176 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3177 (let ((here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3178 end progress-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3179 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3180 (let ((c-echo-syntactic-information-p nil) ;keep quiet for speed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3181 (start (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3182 ;; try to be smarter about finding the range of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3183 ;; lines to indent. skip all following
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3184 ;; whitespace. failing that, try to find any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3185 ;; opening brace on the current line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3186 (skip-chars-forward " \t\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3187 (if (memq (following-char) '(?\( ?\[ ?\{))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3188 (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3189 (let ((state (parse-partial-sexp (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3190 (c-point 'eol))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3191 (and (nth 1 state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3192 (goto-char (nth 1 state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3193 (memq (following-char) '(?\( ?\[ ?\{))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3194 (point)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3195 ;; find balanced expression end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3196 (setq end (and (c-safe (progn (forward-sexp 1) t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3197 (point-marker)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3198 ;; sanity check
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3199 (and (not start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3200 (not shutup-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3201 (error "Cannot find start of balanced expression to indent."))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3202 (and (not end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3203 (not shutup-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3204 (error "Cannot find end of balanced expression to indent."))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3205 (c-progress-init start end 'c-indent-exp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3206 (setq progress-p t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3207 (goto-char start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3208 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3209 (while (< (point) end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3210 (if (not (looking-at "[ \t]*$"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3211 (c-indent-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3212 (c-progress-update)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3213 (forward-line 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3214 ;; make sure marker is deleted
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3215 (and end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3216 (set-marker end nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3217 (and progress-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3218 (c-progress-fini 'c-indent-exp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3219 (goto-char here))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3221 (defun c-indent-defun ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3222 "Re-indents the current top-level function def, struct or class declaration."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3223 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3224 (let ((here (point-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3225 (c-echo-syntactic-information-p nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3226 (brace (c-least-enclosing-brace (c-parse-state))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3227 (if brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3228 (goto-char brace)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3229 (beginning-of-defun))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3230 ;; if we're sitting at b-o-b, it might be because there was no
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3231 ;; least enclosing brace and we were sitting on the defun's open
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3232 ;; brace.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3233 (if (and (bobp) (not (= (following-char) ?\{)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3234 (goto-char here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3235 ;; if defun-prompt-regexp is non-nil, b-o-d might not leave us at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3236 ;; the open brace. I consider this an Emacs bug.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3237 (and (boundp 'defun-prompt-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3238 defun-prompt-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3239 (looking-at defun-prompt-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3240 (goto-char (match-end 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3241 ;; catch all errors in c-indent-exp so we can 1. give more
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3242 ;; meaningful error message, and 2. restore point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3243 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3244 (c-indent-exp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3245 (goto-char here)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3246 (set-marker here nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3248 (defun c-indent-region (start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3249 ;; Indent every line whose first char is between START and END inclusive.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3250 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3251 (goto-char start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3252 ;; Advance to first nonblank line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3253 (skip-chars-forward " \t\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3254 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3255 (let (endmark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3256 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3257 (let ((c-tab-always-indent t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3258 ;; shut up any echo msgs on indiv lines
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
3259 (c-echo-syntactic-information-p nil)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
3260 fence)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3261 (c-progress-init start end 'c-indent-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3262 (setq endmark (copy-marker end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3263 (while (and (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3264 (not (eobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3265 (< (point) endmark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3266 ;; update progress
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3267 (c-progress-update)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3268 ;; Indent one line as with TAB.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3269 (let (nextline sexpend sexpbeg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3270 ;; skip blank lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3271 (skip-chars-forward " \t\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3272 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3273 ;; indent the current line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3274 (c-indent-line)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
3275 (setq fence (point))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3276 (if (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3277 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3278 (looking-at "[ \t]*#"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3279 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3280 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3281 ;; Find beginning of following line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3282 (setq nextline (c-point 'bonl))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3283 ;; Find first beginning-of-sexp for sexp extending past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3284 ;; this line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3285 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3286 (while (< (point) nextline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3287 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3288 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3289 (forward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3290 (setq sexpend (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3291 (error (setq sexpend nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3292 (goto-char nextline)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3293 (c-forward-syntactic-ws))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3294 (if sexpend
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3295 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3296 ;; make sure the sexp we found really starts on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3297 ;; current line and extends past it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3298 (goto-char sexpend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3299 (setq sexpend (point-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3300 (c-safe (backward-sexp 1))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
3301 (setq sexpbeg (point))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
3302 (if (and sexpbeg (< sexpbeg fence))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
3303 (setq sexpbeg fence)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3304 ;; check to see if the next line starts a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3305 ;; comment-only line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3306 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3307 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3308 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3309 (if (looking-at c-comment-start-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3310 (setq sexpbeg (c-point 'bol))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3311 ;; If that sexp ends within the region, indent it all at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3312 ;; once, fast.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3313 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3314 (if (and sexpend
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3315 (> sexpend nextline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3316 (<= sexpend endmark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3317 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3318 (goto-char sexpbeg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3319 (c-indent-exp 'shutup)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3320 (c-progress-update)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3321 (goto-char sexpend)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3322 (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3323 (goto-char sexpbeg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3324 (c-indent-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3325 ;; Move to following line and try again.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3326 (and sexpend
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3327 (markerp sexpend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3328 (set-marker sexpend nil))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
3329 (forward-line 1)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
3330 (setq fence (point))))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3331 (set-marker endmark nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3332 (c-progress-fini 'c-indent-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3333 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3334
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3335 (defun c-mark-function ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3336 "Put mark at end of a C, C++, or Objective-C defun, point at beginning."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3337 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3338 (let ((here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3339 ;; there should be a c-point position for 'eod
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3340 (eod (save-excursion (end-of-defun) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3341 (state (c-parse-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3342 brace)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3343 (while state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3344 (setq brace (car state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3345 (if (consp brace)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3346 (goto-char (cdr brace))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3347 (goto-char brace))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3348 (setq state (cdr state)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3349 (if (= (following-char) ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3350 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3351 (forward-line -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3352 (while (not (or (bobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3353 (looking-at "[ \t]*$")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3354 (forward-line -1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3355 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3356 (skip-chars-forward " \t\n"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3357 (push-mark here)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3358 (push-mark eod nil t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3360
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3361 ;; for progress reporting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3362 (defvar c-progress-info nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3363
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3364 (defun c-progress-init (start end context)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3365 ;; start the progress update messages. if this emacs doesn't have a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3366 ;; built-in timer, just be dumb about it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3367 (if (not (fboundp 'current-time))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3368 (message "indenting region... (this may take a while)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3369 ;; if progress has already been initialized, do nothing. otherwise
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3370 ;; initialize the counter with a vector of:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3371 ;; [start end lastsec context]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3372 (if c-progress-info
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3373 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3374 (setq c-progress-info (vector start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3375 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3376 (goto-char end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3377 (point-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3378 (nth 1 (current-time))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3379 context))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3380 (message "indenting region..."))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3381
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3382 (defun c-progress-update ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3383 ;; update progress
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3384 (if (not (and c-progress-info c-progress-interval))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3385 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3386 (let ((now (nth 1 (current-time)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3387 (start (aref c-progress-info 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3388 (end (aref c-progress-info 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3389 (lastsecs (aref c-progress-info 2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3390 ;; should we update? currently, update happens every 2 seconds,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3391 ;; what's the right value?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3392 (if (< c-progress-interval (- now lastsecs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3393 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3394 (message "indenting region... (%d%% complete)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3395 (/ (* 100 (- (point) start)) (- end start)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3396 (aset c-progress-info 2 now)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3397 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3398
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3399 (defun c-progress-fini (context)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3400 ;; finished
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3401 (if (or (eq context (aref c-progress-info 3))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3402 (eq context t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3403 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3404 (set-marker (aref c-progress-info 1) nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3405 (setq c-progress-info nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3406 (message "indenting region...done"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3407
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3409 ;; Skipping of "syntactic whitespace" for Emacs 19. Syntactic
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3410 ;; whitespace is defined as lexical whitespace, C and C++ style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3411 ;; comments, and preprocessor directives. Search no farther back or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3412 ;; forward than optional LIM. If LIM is omitted, `beginning-of-defun'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3413 ;; is used for backward skipping, point-max is used for forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3414 ;; skipping. Note that Emacs 18 support has been moved to cc-mode-18.el.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3415
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3416 (defun c-forward-syntactic-ws (&optional lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3417 ;; Forward skip of syntactic whitespace for Emacs 19.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3418 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3419 (let* ((lim (or lim (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3420 (here lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3421 (hugenum (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3422 (narrow-to-region lim (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3423 (while (/= here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3424 (setq here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3425 (forward-comment hugenum)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3426 ;; skip preprocessor directives
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3427 (if (and (= (following-char) ?#)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3428 (= (c-point 'boi) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3429 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3430 )))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3431
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3432 (defun c-backward-syntactic-ws (&optional lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3433 ;; Backward skip over syntactic whitespace for Emacs 19.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3434 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3435 (let* ((lim (or lim (c-point 'bod)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3436 (here lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3437 (hugenum (- (point-max))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3438 (if (< lim (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3439 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3440 (narrow-to-region lim (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3441 (while (/= here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3442 (setq here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3443 (forward-comment hugenum)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3444 (if (eq (c-in-literal lim) 'pound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3445 (beginning-of-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3446 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3447 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3450 ;; Return `c' if in a C-style comment, `c++' if in a C++ style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3451 ;; comment, `string' if in a string literal, `pound' if on a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3452 ;; preprocessor line, or nil if not in a comment at all. Optional LIM
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3453 ;; is used as the backward limit of the search. If omitted, or nil,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3454 ;; `beginning-of-defun' is used."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3455
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3456 ;; This is for all v19 Emacsen supporting either 1-bit or 8-bit syntax
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3457 (defun c-in-literal (&optional lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3458 ;; Determine if point is in a C++ literal. we cache the last point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3459 ;; calculated if the cache is enabled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3460 (if (and (boundp 'c-in-literal-cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3461 c-in-literal-cache
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3462 (= (point) (aref c-in-literal-cache 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3463 (aref c-in-literal-cache 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3464 (let ((rtn (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3465 (let* ((lim (or lim (c-point 'bod)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3466 (here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3467 (state (parse-partial-sexp lim (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3468 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3469 ((nth 3 state) 'string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3470 ((nth 4 state) (if (nth 7 state) 'c++ 'c))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3471 ((progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3472 (goto-char here)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3473 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3474 (looking-at "[ \t]*#"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3475 'pound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3476 (t nil))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3477 ;; cache this result if the cache is enabled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3478 (and (boundp 'c-in-literal-cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3479 (setq c-in-literal-cache (vector (point) rtn)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3480 rtn)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3481
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3482
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3483 ;; utilities for moving and querying around syntactic elements
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3484 (defun c-parse-state ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3485 ;; Finds and records all open parens between some important point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3486 ;; earlier in the file and point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3487 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3488 ;; if there's a state cache, return it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3489 (if (boundp 'c-state-cache) c-state-cache
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3490 (let* (at-bob
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3491 (pos (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3492 ;; go back 2 bods, but ignore any bogus positions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3493 ;; returned by beginning-of-defun (i.e. open paren
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3494 ;; in column zero)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3495 (let ((cnt 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3496 (while (not (or at-bob (zerop cnt)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3497 (beginning-of-defun)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3498 (if (= (following-char) ?\{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3499 (setq cnt (1- cnt)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3500 (if (bobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3501 (setq at-bob t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3502 (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3503 (here (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3504 ;;(skip-chars-forward " \t}")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3505 (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3506 (last-bod pos) (last-pos pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3507 placeholder state sexp-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3508 ;; cache last bod position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3509 (while (catch 'backup-bod
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3510 (setq state nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3511 (while (and pos (< pos here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3512 (setq last-pos pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3513 (if (and (setq pos (c-safe (scan-lists pos 1 -1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3514 (<= pos here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3515 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3516 (setq sexp-end (c-safe (scan-sexps (1- pos) 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3517 (if (and sexp-end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3518 (<= sexp-end here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3519 ;; we want to record both the start and end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3520 ;; of this sexp, but we only want to record
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3521 ;; the last-most of any of them before here
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3522 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3523 (if (= (char-after (1- pos)) ?\{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3524 (setq state (cons (cons (1- pos) sexp-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3525 (if (consp (car state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3526 (cdr state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3527 state))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3528 (setq pos sexp-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3529 ;; we're contained in this sexp so put pos on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3530 ;; front of list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3531 (setq state (cons (1- pos) state))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3532 ;; something bad happened. check to see if we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3533 ;; crossed an unbalanced close brace. if so, we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3534 ;; didn't really find the right `important bufpos'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3535 ;; so lets back up and try again
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3536 (if (and (not pos) (not at-bob)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3537 (setq placeholder
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3538 (c-safe (scan-lists last-pos 1 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3539 ;;(char-after (1- placeholder))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3540 (<= placeholder here)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3541 (= (char-after (1- placeholder)) ?\}))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3542 (while t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3543 (setq last-bod (c-safe (scan-lists last-bod -1 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3544 (if (not last-bod)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3545 (error "unbalanced close brace at position %d"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3546 (1- placeholder))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3547 (setq at-bob (= last-bod (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3548 pos last-bod)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3549 (if (= (char-after last-bod) ?\{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3550 (throw 'backup-bod t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3551 )) ;end-if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3552 )) ;end-while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3553 nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3554 state)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3555
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3556 (defun c-whack-state (bufpos state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3557 ;; whack off any state information that appears on STATE which lies
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3558 ;; after the bounds of BUFPOS.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3559 (let (newstate car)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3560 (while state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3561 (setq car (car state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3562 state (cdr state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3563 (if (consp car)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3564 ;; just check the car, because in a balanced brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3565 ;; expression, it must be impossible for the corresponding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3566 ;; close brace to be before point, but the open brace to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3567 ;; after.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3568 (if (<= bufpos (car car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3569 nil ; whack it off
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3570 ;; its possible that the open brace is before bufpos, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3571 ;; the close brace is after. In that case, convert this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3572 ;; to a non-cons element.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3573 (if (<= bufpos (cdr car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3574 (setq newstate (append newstate (list (car car))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3575 ;; we know that both the open and close braces are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3576 ;; before bufpos, so we also know that everything else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3577 ;; on state is before bufpos, so we can glom up the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3578 ;; whole thing and exit.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3579 (setq newstate (append newstate (list car) state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3580 state nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3581 (if (<= bufpos car)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3582 nil ; whack it off
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3583 ;; it's before bufpos, so everything else should too
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3584 (setq newstate (append newstate (list car) state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3585 state nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3586 newstate))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3587
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3588 (defun c-hack-state (bufpos which state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3589 ;; Using BUFPOS buffer position, and WHICH (must be 'open or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3590 ;; 'close), hack the c-parse-state STATE and return the results.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3591 (if (eq which 'open)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3592 (let ((car (car state)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3593 (if (or (null car)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3594 (consp car)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3595 (/= bufpos car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3596 (cons bufpos state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3597 state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3598 (if (not (eq which 'close))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3599 (error "c-hack-state, bad argument: %s" which))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3600 ;; 'close brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3601 (let ((car (car state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3602 (cdr (cdr state)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3603 (if (consp car)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3604 (setq car (car cdr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3605 cdr (cdr cdr)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3606 ;; TBD: is this test relevant???
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3607 (if (consp car)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3608 state ;on error, don't change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3609 ;; watch out for balanced expr already on cdr of list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3610 (cons (cons car bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3611 (if (consp (car cdr))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3612 (cdr cdr) cdr))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3613 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3614
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3615 (defun c-adjust-state (from to shift state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3616 ;; Adjust all points in state that lie in the region FROM..TO by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3617 ;; SHIFT amount (as would be returned by c-indent-line).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3618 (mapcar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3619 (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3620 (lambda (e)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3621 (if (consp e)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3622 (let ((car (car e))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3623 (cdr (cdr e)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3624 (if (and (<= from car) (< car to))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3625 (setcar e (+ shift car)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3626 (if (and (<= from cdr) (< cdr to))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3627 (setcdr e (+ shift cdr))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3628 (if (and (<= from e) (< e to))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3629 (setq e (+ shift e))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3630 e))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3631 state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3632
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3633
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3634 (defun c-beginning-of-inheritance-list (&optional lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3635 ;; Go to the first non-whitespace after the colon that starts a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3636 ;; multiple inheritance introduction. Optional LIM is the farthest
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3637 ;; back we should search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3638 (let ((lim (or lim (c-point 'bod)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3639 (placeholder (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3640 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3641 (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3642 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3643 (while (and (> (point) lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3644 (memq (preceding-char) '(?, ?:))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3645 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3646 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3647 (setq placeholder (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3648 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3649 (not (looking-at c-class-key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3650 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3651 (c-backward-syntactic-ws lim))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3652 (goto-char placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3653 (skip-chars-forward "^:" (c-point 'eol))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3654
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3655 (defun c-beginning-of-macro (&optional lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3656 ;; Go to the beginning of the macro. Right now we don't support
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3657 ;; multi-line macros too well
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3658 (back-to-indentation))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3659
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3660 (defun c-in-method-def-p ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3661 ;; Return nil if we aren't in a method definition, otherwise the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3662 ;; position of the initial [+-].
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3663 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3664 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3665 (and c-method-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3666 (looking-at c-method-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3667 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3668 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3669
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3670 (defun c-just-after-func-arglist-p (&optional containing)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3671 ;; Return t if we are between a function's argument list closing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3672 ;; paren and its opening brace. Note that the list close brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3673 ;; could be followed by a "const" specifier or a member init hanging
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3674 ;; colon. Optional CONTAINING is position of containing s-exp open
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3675 ;; brace. If not supplied, point is used as search start.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3676 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3677 (c-backward-syntactic-ws)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3678 (let ((checkpoint (or containing (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3679 (goto-char checkpoint)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3680 ;; could be looking at const specifier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3681 (if (and (= (preceding-char) ?t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3682 (forward-word -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3683 (looking-at "\\<const\\>"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3684 (c-backward-syntactic-ws)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3685 ;; otherwise, we could be looking at a hanging member init
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3686 ;; colon
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3687 (goto-char checkpoint)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3688 (if (and (= (preceding-char) ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3689 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3690 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3691 (c-backward-syntactic-ws)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3692 (looking-at "[ \t\n]*:\\([^:]+\\|$\\)")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3693 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3694 (goto-char checkpoint))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3695 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3696 (and (= (preceding-char) ?\))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3697 ;; check if we are looking at a method def
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3698 (or (not c-method-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3699 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3700 (forward-sexp -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3701 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3702 (c-backward-syntactic-ws)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3703 (not (or (= (preceding-char) ?-)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3704 (= (preceding-char) ?+)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3705 ;; or a class category
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3706 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3707 (forward-sexp -2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3708 (looking-at c-class-key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3709 )))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3710 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3711
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3712 ;; defuns to look backwards for things
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3713 (defun c-backward-to-start-of-do (&optional lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3714 ;; Move to the start of the last "unbalanced" do expression.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3715 ;; Optional LIM is the farthest back to search. If none is found,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3716 ;; nil is returned and point is left unchanged, otherwise t is returned.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3717 (let ((do-level 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3718 (case-fold-search nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3719 (lim (or lim (c-point 'bod)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3720 (here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3721 foundp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3722 (while (not (zerop do-level))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3723 ;; we protect this call because trying to execute this when the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3724 ;; while is not associated with a do will throw an error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3725 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3726 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3727 (backward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3728 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3729 ((memq (c-in-literal lim) '(c c++)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3730 ((looking-at "while\\b[^_]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3731 (setq do-level (1+ do-level)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3732 ((looking-at "do\\b[^_]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3733 (if (zerop (setq do-level (1- do-level)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3734 (setq foundp t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3735 ((<= (point) lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3736 (setq do-level 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3737 (goto-char lim))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3738 (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3739 (goto-char lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3740 (setq do-level 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3741 (if (not foundp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3742 (goto-char here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3743 foundp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3745 (defun c-backward-to-start-of-if (&optional lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3746 ;; Move to the start of the last "unbalanced" if and return t. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3747 ;; none is found, and we are looking at an if clause, nil is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3748 ;; returned. If none is found and we are looking at an else clause,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3749 ;; an error is thrown.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3750 (let ((if-level 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3751 (here (c-point 'bol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3752 (case-fold-search nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3753 (lim (or lim (c-point 'bod)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3754 (at-if (looking-at "if\\b[^_]")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3755 (catch 'orphan-if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3756 (while (and (not (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3757 (not (zerop if-level)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3758 (c-backward-syntactic-ws)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3759 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3760 (backward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3761 (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3762 (if at-if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3763 (throw 'orphan-if nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3764 (error "No matching `if' found for `else' on line %d."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3765 (1+ (count-lines 1 here))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3766 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3767 ((looking-at "else\\b[^_]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3768 (setq if-level (1+ if-level)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3769 ((looking-at "if\\b[^_]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3770 ;; check for else if... skip over
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3771 (let ((here (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3772 (c-safe (forward-sexp -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3773 (if (looking-at "\\<else\\>[ \t]+\\<if\\>")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3774 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3775 (setq if-level (1- if-level))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3776 (goto-char here))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3777 ((< (point) lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3778 (setq if-level 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3779 (goto-char lim))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3780 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3781 t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3782
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3783 (defun c-skip-conditional ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3784 ;; skip forward over conditional at point, including any predicate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3785 ;; statements in parentheses. No error checking is performed.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3786 (forward-sexp (cond
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3787 ;; else if()
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3788 ((looking-at "\\<else\\>[ \t]+\\<if\\>") 3)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3789 ;; do, else, try, finally
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3790 ((looking-at "\\<\\(do\\|else\\|try\\|finally\\)\\>") 1)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3791 ;; for, if, while, switch, catch, synchronized
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3792 (t 2))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3794 (defun c-skip-case-statement-forward (state &optional lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3795 ;; skip forward over case/default bodies, with optional maximal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3796 ;; limit. if no next case body is found, nil is returned and point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3797 ;; is not moved
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3798 (let ((lim (or lim (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3799 (here (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3800 donep foundp bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3801 (safepos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3802 (balanced (car state)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3803 ;; search until we've passed the limit, or we've found our match
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3804 (while (and (< (point) lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3805 (not donep))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3806 (setq safepos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3807 ;; see if we can find a case statement, not in a literal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3808 (if (and (re-search-forward c-switch-label-key lim 'move)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3809 (setq bufpos (match-beginning 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3810 (not (c-in-literal safepos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3811 (/= bufpos here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3812 ;; if we crossed into a balanced sexp, we know the case is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3813 ;; not part of our switch statement, so just bound over the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3814 ;; sexp and keep looking.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3815 (if (and (consp balanced)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3816 (> bufpos (car balanced))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3817 (< bufpos (cdr balanced)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3818 (goto-char (cdr balanced))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3819 (goto-char bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3820 (setq donep t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3821 foundp t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3822 (if (not foundp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3823 (goto-char here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3824 foundp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3825
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3826 (defun c-search-uplist-for-classkey (brace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3827 ;; search for the containing class, returning a 2 element vector if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3828 ;; found. aref 0 contains the bufpos of the class key, and aref 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3829 ;; contains the bufpos of the open brace.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3830 (if (null brace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3831 ;; no brace-state means we cannot be inside a class
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3832 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3833 (let ((carcache (car brace-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3834 search-start search-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3835 (if (consp carcache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3836 ;; a cons cell in the first element means that there is some
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3837 ;; balanced sexp before the current bufpos. this we can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3838 ;; ignore. the nth 1 and nth 2 elements define for us the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3839 ;; search boundaries
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3840 (setq search-start (nth 2 brace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3841 search-end (nth 1 brace-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3842 ;; if the car was not a cons cell then nth 0 and nth 1 define
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3843 ;; for us the search boundaries
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3844 (setq search-start (nth 1 brace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3845 search-end (nth 0 brace-state)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3846 ;; search-end cannot be a cons cell
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3847 (and (consp search-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3848 (error "consp search-end: %s" search-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3849 ;; if search-end is nil, or if the search-end character isn't an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3850 ;; open brace, we are definitely not in a class
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3851 (if (or (not search-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3852 (< search-end (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3853 (/= (char-after search-end) ?{))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3854 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3855 ;; now, we need to look more closely at search-start. if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3856 ;; search-start is nil, then our start boundary is really
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3857 ;; point-min.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3858 (if (not search-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3859 (setq search-start (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3860 ;; if search-start is a cons cell, then we can start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3861 ;; searching from the end of the balanced sexp just ahead of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3862 ;; us
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3863 (if (consp search-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3864 (setq search-start (cdr search-start))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3865 ;; now we can do a quick regexp search from search-start to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3866 ;; search-end and see if we can find a class key. watch for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3867 ;; class like strings in literals
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3868 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3869 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3870 (goto-char search-start)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3871 (let ((search-key (concat c-class-key "\\|extern[^_]"))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3872 foundp class match-end)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3873 (while (and (not foundp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3874 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3875 (c-forward-syntactic-ws)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3876 (> search-end (point)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
3877 (re-search-forward search-key search-end t))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3878 (setq class (match-beginning 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3879 match-end (match-end 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3880 (if (c-in-literal search-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3881 nil ; its in a comment or string, ignore
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3882 (goto-char class)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3883 (skip-chars-forward " \t\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3884 (setq foundp (vector (c-point 'boi) search-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3885 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3886 ;; check for embedded keywords
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3887 ((let ((char (char-after (1- class))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3888 (and char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3889 (memq (char-syntax char) '(?w ?_))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3890 (goto-char match-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3891 (setq foundp nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3892 ;; make sure we're really looking at the start of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3893 ;; class definition, and not a forward decl, return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3894 ;; arg, template arg list, or an ObjC or Java method.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3895 ((and c-method-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3896 (re-search-forward c-method-key search-end t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3897 (setq foundp nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3898 ;; Its impossible to define a regexp for this, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3899 ;; nearly so to do it programmatically.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3900 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3901 ;; ; picks up forward decls
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3902 ;; = picks up init lists
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3903 ;; ) picks up return types
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3904 ;; > picks up templates, but remember that we can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3905 ;; inherit from templates!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3906 ((let ((skipchars "^;=)"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3907 ;; try to see if we found the `class' keyword
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3908 ;; inside a template arg list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3909 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3910 (skip-chars-backward "^<>" search-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3911 (if (= (preceding-char) ?<)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3912 (setq skipchars (concat skipchars ">"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3913 (skip-chars-forward skipchars search-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3914 (/= (point) search-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3915 (setq foundp nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3916 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3917 foundp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3918 )))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3919
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3920 (defun c-inside-bracelist-p (containing-sexp brace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3921 ;; return the buffer position of the beginning of the brace list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3922 ;; statement if we're inside a brace list, otherwise return nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3923 ;; CONTAINING-SEXP is the buffer pos of the innermost containing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3924 ;; paren. BRACE-STATE is the remainder of the state of enclosing braces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3925 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3926 ;; N.B.: This algorithm can potentially get confused by cpp macros
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3927 ;; places in inconvenient locations. Its a trade-off we make for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3928 ;; speed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3929 (or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3930 ;; this will pick up enum lists
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3931 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3932 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3933 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3934 (forward-sexp -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3935 (if (or (looking-at "enum[\t\n ]+")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3936 (progn (forward-sexp -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3937 (looking-at "enum[\t\n ]+")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3938 (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3939 (error nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3940 ;; this will pick up array/aggregate init lists, even if they are nested.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3941 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3942 (let (bufpos failedp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3943 (while (and (not bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3944 containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3945 (if (consp containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3946 (setq containing-sexp (car brace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3947 brace-state (cdr brace-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3948 ;; see if significant character just before brace is an equal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3949 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3950 (setq failedp nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3951 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3952 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3953 (forward-sexp -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3954 (forward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3955 (c-forward-syntactic-ws containing-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3956 (error (setq failedp t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3957 (if (or failedp (/= (following-char) ?=))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3958 ;; lets see if we're nested. find the most nested
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3959 ;; containing brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3960 (setq containing-sexp (car brace-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3961 brace-state (cdr brace-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3962 ;; we've hit the beginning of the aggregate list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3963 (c-beginning-of-statement-1 (c-most-enclosing-brace brace-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3964 (setq bufpos (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3965 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3966 bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3967 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3968
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3969
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3970 ;; defuns for calculating the syntactic state and indenting a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3971 ;; line of C/C++/ObjC code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3972 (defun c-most-enclosing-brace (state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3973 ;; return the bufpos of the most enclosing brace that hasn't been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3974 ;; narrowed out by any enclosing class, or nil if none was found
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3975 (let (enclosingp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3976 (while (and state (not enclosingp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3977 (setq enclosingp (car state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3978 state (cdr state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3979 (if (consp enclosingp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3980 (setq enclosingp nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3981 (if (> (point-min) enclosingp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3982 (setq enclosingp nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3983 (setq state nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3984 enclosingp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3986 (defun c-least-enclosing-brace (state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3987 ;; return the bufpos of the least (highest) enclosing brace that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3988 ;; hasn't been narrowed out by any enclosing class, or nil if none
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3989 ;; was found.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3990 (c-most-enclosing-brace (nreverse state)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3992 (defun c-safe-position (bufpos state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3993 ;; return the closest known safe position higher up than point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3994 (let ((safepos nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3995 (while state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3996 (setq safepos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3997 (if (consp (car state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3998 (cdr (car state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3999 (car state)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4000 (if (< safepos bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4001 (setq state nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4002 (setq state (cdr state))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4003 safepos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4004
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4005 (defun c-narrow-out-enclosing-class (state lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4006 ;; narrow the buffer so that the enclosing class is hidden
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4007 (let (inclass-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4008 (and state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4009 (setq inclass-p (c-search-uplist-for-classkey state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4010 (narrow-to-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4011 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4012 (goto-char (1+ (aref inclass-p 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4013 (skip-chars-forward " \t\n" lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4014 ;; if point is now left of the class opening brace, we're
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4015 ;; hosed, so try a different tact
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4016 (if (<= (point) (aref inclass-p 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4017 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4018 (goto-char (1+ (aref inclass-p 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4019 (c-forward-syntactic-ws lim)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4020 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4021 ;; end point is the end of the current line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4022 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4023 (goto-char lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4024 (c-point 'eol))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4025 ;; return the class vector
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4026 inclass-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4027
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4028 (defun c-guess-basic-syntax ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4029 ;; guess the syntactic description of the current line of C++ code.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4030 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4031 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4032 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4033 (let* ((indent-point (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4034 (case-fold-search nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4035 (fullstate (c-parse-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4036 (state fullstate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4037 (in-method-intro-p (and c-method-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4038 (looking-at c-method-key)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4039 literal containing-sexp char-before-ip char-after-ip lim
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4040 syntax placeholder c-in-literal-cache inswitch-p
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4041 injava-inher
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4042 ;; narrow out any enclosing class or extern "C" block
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4043 (inclass-p (c-narrow-out-enclosing-class state indent-point))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4044 (inextern-p (and inclass-p
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4045 (save-excursion
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4046 (save-restriction
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4047 (widen)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4048 (goto-char (aref inclass-p 0))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4049 (looking-at "extern[^_]")))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4050 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4051
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4052 ;; get the buffer position of the most nested opening brace,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4053 ;; if there is one, and it hasn't been narrowed out
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4054 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4055 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4056 (skip-chars-forward " \t}")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4057 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4058 (while (and state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4059 (not in-method-intro-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4060 (not containing-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4061 (setq containing-sexp (car state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4062 state (cdr state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4063 (if (consp containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4064 ;; if cdr == point, then containing sexp is the brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4065 ;; that opens the sexp we close
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4066 (if (= (cdr containing-sexp) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4067 (setq containing-sexp (car containing-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4068 ;; otherwise, ignore this element
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4069 (setq containing-sexp nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4070 ;; ignore the bufpos if its been narrowed out by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4071 ;; containing class
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4072 (if (<= containing-sexp (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4073 (setq containing-sexp nil)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4074
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4075 ;; set the limit on the farthest back we need to search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4076 (setq lim (or containing-sexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4077 (if (consp (car fullstate))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4078 (cdr (car fullstate))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4079 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4080 (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4081
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4082 ;; cache char before and after indent point, and move point to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4083 ;; the most likely position to perform the majority of tests
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4084 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4085 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4086 (setq char-after-ip (following-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4087 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4088 (setq char-before-ip (preceding-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4089 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4090 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4091
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4092 ;; are we in a literal?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4093 (setq literal (c-in-literal lim))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4094
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4095 ;; now figure out syntactic qualities of the current line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4096 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4097 ;; CASE 1: in a string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4098 ((memq literal '(string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4099 (c-add-syntax 'string (c-point 'bopl)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4100 ;; CASE 2: in a C or C++ style comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4101 ((memq literal '(c c++))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4102 ;; we need to catch multi-paragraph C comments
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4103 (while (and (zerop (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4104 (looking-at "^[ \t]*$")))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4105 (c-add-syntax literal (c-point 'boi)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4106 ;; CASE 3: in a cpp preprocessor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4107 ((eq literal 'pound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4108 (c-beginning-of-macro lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4109 (c-add-syntax 'cpp-macro (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4110 ;; CASE 4: in an objective-c method intro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4111 (in-method-intro-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4112 (c-add-syntax 'objc-method-intro (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4113 ;; CASE 5: Line is at top level.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4114 ((null containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4115 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4116 ;; CASE 5A: we are looking at a defun, class, or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4117 ;; inline-inclass method opening brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4118 ((= char-after-ip ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4119 (cond
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4120 ;; CASE 5A.1: extern declaration
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4121 ((save-excursion
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4122 (goto-char indent-point)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4123 (skip-chars-forward " \t")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4124 (and (c-safe (progn (backward-sexp 2) t))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4125 (looking-at "extern[^_]")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4126 (progn
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4127 (setq placeholder (point))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4128 (forward-sexp 1)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4129 (c-forward-syntactic-ws)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4130 (= (following-char) ?\"))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4131 (goto-char placeholder)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4132 (c-add-syntax 'extern-lang-open (c-point 'boi)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4133 ;; CASE 5A.2: we are looking at a class opening brace
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4134 ((save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4135 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4136 (skip-chars-forward " \t{")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4137 ;; TBD: watch out! there could be a bogus
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4138 ;; c-state-cache in place when we get here. we have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4139 ;; to go through much chicanery to ignore the cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4140 ;; But of course, there may not be! BLECH! BOGUS!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4141 (let ((decl
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4142 (if (boundp 'c-state-cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4143 (let ((old-cache c-state-cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4144 (prog2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4145 (makunbound 'c-state-cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4146 (c-search-uplist-for-classkey (c-parse-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4147 (setq c-state-cache old-cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4148 (c-search-uplist-for-classkey (c-parse-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4149 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4150 (and decl
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4151 (setq placeholder (aref decl 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4152 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4153 (c-add-syntax 'class-open placeholder))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4154 ;; CASE 5A.3: brace list open
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4155 ((save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4156 (c-beginning-of-statement-1 lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4157 ;; c-b-o-s could have left us at point-min
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4158 (and (bobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4159 (c-forward-syntactic-ws indent-point))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4160 (if (looking-at "typedef[^_]")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4161 (progn (forward-sexp 1)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4162 (c-forward-syntactic-ws indent-point)))
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 114
diff changeset
4163 (setq placeholder (c-point 'boi))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4164 (and (or (looking-at "enum[ \t\n]+")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4165 (= char-before-ip ?=))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4166 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4167 (skip-chars-forward "^;(" indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4168 (not (memq (following-char) '(?\; ?\()))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4169 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4170 (c-add-syntax 'brace-list-open placeholder))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4171 ;; CASE 5A.4: inline defun open
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4172 ((and inclass-p (not inextern-p))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4173 (c-add-syntax 'inline-open)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4174 (c-add-syntax 'inclass (aref inclass-p 0)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4175 ;; CASE 5A.5: ordinary defun open
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4176 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4177 (goto-char placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4178 (c-add-syntax 'defun-open (c-point 'bol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4179 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4180 ;; CASE 5B: first K&R arg decl or member init
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4181 ((c-just-after-func-arglist-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4182 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4183 ;; CASE 5B.1: a member init
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4184 ((or (= char-before-ip ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4185 (= char-after-ip ?:))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4186 ;; this line should be indented relative to the beginning
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4187 ;; of indentation for the topmost-intro line that contains
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4188 ;; the prototype's open paren
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4189 ;; TBD: is the following redundant?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4190 (if (= char-before-ip ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4191 (forward-char -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4192 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4193 ;; TBD: is the preceding redundant?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4194 (if (= (preceding-char) ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4195 (progn (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4196 (c-backward-syntactic-ws lim)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4197 (if (= (preceding-char) ?\))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4198 (backward-sexp 1))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4199 (setq placeholder (point))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4200 (save-excursion
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4201 (and (c-safe (backward-sexp 1) t)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4202 (looking-at "throw[^_]")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4203 (c-safe (backward-sexp 1) t)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4204 (setq placeholder (point))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4205 (goto-char placeholder)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4206 (c-add-syntax 'member-init-intro (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4207 ;; we don't need to add any class offset since this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4208 ;; should be relative to the ctor's indentation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4209 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4210 ;; CASE 5B.2: K&R arg decl intro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4211 (c-recognize-knr-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4212 (c-add-syntax 'knr-argdecl-intro (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4213 (and inclass-p (c-add-syntax 'inclass (aref inclass-p 0))))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4214 ;; CASE 5B.3: Nether region after a C++ or Java func
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4215 ;; decl, which could include a `throws' declaration.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4216 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4217 (c-beginning-of-statement-1 lim)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4218 (c-add-syntax 'func-decl-cont (c-point 'boi))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4219 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4220 ;; CASE 5C: inheritance line. could be first inheritance
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4221 ;; line, or continuation of a multiple inheritance
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4222 ((or (and c-baseclass-key (looking-at c-baseclass-key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4223 (and (or (= char-before-ip ?:)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4224 ;; watch out for scope operator
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4225 (save-excursion
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4226 (and (= char-after-ip ?:)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4227 (c-safe (progn (forward-char 1) t))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4228 (/= (following-char) ?:)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4229 )))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4230 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4231 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4232 (if (= char-before-ip ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4233 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4234 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4235 (c-backward-syntactic-ws lim)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4236 (back-to-indentation)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4237 (looking-at c-class-key)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4238 ;; for Java
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4239 (and (eq major-mode 'java-mode)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4240 (let ((fence (save-excursion
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4241 (c-beginning-of-statement-1 lim)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4242 (point)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4243 cont done)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4244 (save-excursion
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4245 (while (not done)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4246 (cond ((looking-at c-Java-special-key)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4247 (setq injava-inher (cons cont (point))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4248 done t))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4249 ((or (not (c-safe (forward-sexp -1) t))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4250 (<= (point) fence))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4251 (setq done t))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4252 )
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4253 (setq cont t)))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
4254 injava-inher)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
4255 (not (c-crosses-statement-barrier-p (cdr injava-inher)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
4256 (point)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
4257 ))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4258 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4259 ;; CASE 5C.1: non-hanging colon on an inher intro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4260 ((= char-after-ip ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4261 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4262 (c-add-syntax 'inher-intro (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4263 ;; don't add inclass symbol since relative point already
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4264 ;; contains any class offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4265 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4266 ;; CASE 5C.2: hanging colon on an inher intro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4267 ((= char-before-ip ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4268 (c-add-syntax 'inher-intro (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4269 (and inclass-p (c-add-syntax 'inclass (aref inclass-p 0))))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4270 ;; CASE 5C.3: in a Java implements/extends
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4271 (injava-inher
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4272 (let ((where (cdr injava-inher))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4273 (cont (car injava-inher))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4274 (here (point)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4275 (goto-char where)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4276 (cond ((looking-at "throws[^_]")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4277 (c-add-syntax 'func-decl-cont
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4278 (progn (c-beginning-of-statement-1 lim)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4279 (c-point 'boi))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4280 (cont (c-add-syntax 'inher-cont where))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4281 (t (c-add-syntax 'inher-intro
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4282 (progn (goto-char (cdr injava-inher))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4283 (c-beginning-of-statement-1 lim)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4284 (point))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4285 )))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4286 ;; CASE 5C.4: a continued inheritance line
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4287 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4288 (c-beginning-of-inheritance-list lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4289 (c-add-syntax 'inher-cont (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4290 ;; don't add inclass symbol since relative point already
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4291 ;; contains any class offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4292 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4293 ;; CASE 5D: this could be a top-level compound statement or a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4294 ;; member init list continuation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4295 ((= char-before-ip ?,)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4296 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4297 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4298 (while (and (< lim (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4299 (= (preceding-char) ?,))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4300 ;; this will catch member inits with multiple
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4301 ;; line arglists
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4302 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4303 (c-backward-syntactic-ws (c-point 'bol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4304 (if (= (preceding-char) ?\))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4305 (backward-sexp 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4306 ;; now continue checking
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4307 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4308 (c-backward-syntactic-ws lim))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4309 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4310 ;; CASE 5D.1: hanging member init colon, but watch out
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4311 ;; for bogus matches on access specifiers inside classes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4312 ((and (= (preceding-char) ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4313 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4314 (forward-word -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4315 (not (looking-at c-access-key))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4316 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4317 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4318 (c-safe (backward-sexp 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4319 (c-add-syntax 'member-init-cont (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4320 ;; we do not need to add class offset since relative
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4321 ;; point is the member init above us
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4322 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4323 ;; CASE 5D.2: non-hanging member init colon
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4324 ((progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4325 (c-forward-syntactic-ws indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4326 (= (following-char) ?:))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4327 (skip-chars-forward " \t:")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4328 (c-add-syntax 'member-init-cont (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4329 ;; CASE 5D.3: perhaps a multiple inheritance line?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4330 ((looking-at c-inher-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4331 (c-add-syntax 'inher-cont (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4332 ;; CASE 5D.4: perhaps a template list continuation?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4333 ((save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4334 (skip-chars-backward "^<" lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4335 ;; not sure if this is the right test, but it should
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4336 ;; be fast and mostly accurate.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4337 (and (= (preceding-char) ?<)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4338 (not (c-in-literal lim))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4339 ;; we can probably indent it just like and arglist-cont
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4340 (c-add-syntax 'arglist-cont (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4341 ;; CASE 5D.5: perhaps a top-level statement-cont
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4342 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4343 (c-beginning-of-statement-1 lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4344 ;; skip over any access-specifiers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4345 (and inclass-p c-access-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4346 (while (looking-at c-access-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4347 (forward-line 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4348 ;; skip over comments, whitespace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4349 (c-forward-syntactic-ws indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4350 (c-add-syntax 'statement-cont (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4351 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4352 ;; CASE 5E: we are looking at a access specifier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4353 ((and inclass-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4354 c-access-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4355 (looking-at c-access-key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4356 (c-add-syntax 'access-label (c-point 'bonl))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4357 (c-add-syntax 'inclass (aref inclass-p 0)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4358 ;; CASE 5F: extern-lang-close?
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4359 ((and inextern-p
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4360 (= char-after-ip ?}))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4361 (c-add-syntax 'extern-lang-close (aref inclass-p 1)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4362 ;; CASE 5G: we are looking at the brace which closes the
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4363 ;; enclosing nested class decl
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4364 ((and inclass-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4365 (= char-after-ip ?})
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4366 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4367 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4368 (widen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4369 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4370 (and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4371 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4372 (progn (backward-sexp 1) t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4373 (error nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4374 (= (point) (aref inclass-p 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4375 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4376 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4377 (widen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4378 (goto-char (aref inclass-p 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4379 (c-add-syntax 'class-close (c-point 'boi))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4380 ;; CASE 5H: we could be looking at subsequent knr-argdecls
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4381 ((and c-recognize-knr-p
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4382 ;; here we essentially use the hack that is used in
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4383 ;; Emacs' c-mode.el to limit how far back we should
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4384 ;; look. The assumption is made that argdecls are
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4385 ;; indented at least one space and that function
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4386 ;; headers are not indented.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4387 (let ((limit (save-excursion
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4388 (re-search-backward "^[^ \^L\t\n#]" nil 'move)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4389 (point))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4390 (save-excursion
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4391 (c-backward-syntactic-ws limit)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4392 (setq placeholder (point))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4393 (while (and (memq (preceding-char) '(?\; ?,))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4394 (> (point) limit))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4395 (beginning-of-line)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4396 (setq placeholder (point))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4397 (c-backward-syntactic-ws limit))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4398 (and (= (preceding-char) ?\))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4399 (or (not c-method-key)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4400 (progn
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4401 (forward-sexp -1)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4402 (forward-char -1)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4403 (c-backward-syntactic-ws)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4404 (not (or (= (preceding-char) ?-)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4405 (= (preceding-char) ?+)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4406 ;; or a class category
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4407 (progn
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4408 (forward-sexp -2)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4409 (looking-at c-class-key))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4410 )))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4411 ))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4412 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4413 (c-beginning-of-statement-1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4414 (not (looking-at "typedef[ \t\n]+"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4415 (goto-char placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4416 (c-add-syntax 'knr-argdecl (c-point 'boi)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4417 ;; CASE 5I: we are at the topmost level, make sure we skip
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4418 ;; back past any access specifiers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4419 ((progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4420 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4421 (while (and inclass-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4422 c-access-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4423 (not (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4424 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4425 (c-safe (progn (backward-sexp 1) t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4426 (looking-at c-access-key)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4427 (backward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4428 (c-backward-syntactic-ws lim))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4429 (or (bobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4430 (memq (preceding-char) '(?\; ?\}))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4431 ;; real beginning-of-line could be narrowed out due to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4432 ;; enclosure in a class block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4433 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4434 (widen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4435 (c-add-syntax 'topmost-intro (c-point 'bol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4436 (if inclass-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4437 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4438 (goto-char (aref inclass-p 1))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4439 (if inextern-p
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4440 (c-add-syntax 'inextern-lang)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4441 (c-add-syntax 'inclass (c-point 'boi)))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4442 ))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4443 ;; CASE 5J: we are at an ObjC or Java method definition
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4444 ;; continuation line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4445 ((and c-method-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4446 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4447 (c-beginning-of-statement-1 lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4448 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4449 (looking-at c-method-key)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4450 (c-add-syntax 'objc-method-args-cont (point)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4451 ;; CASE 5K: we are at a topmost continuation line
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4452 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4453 (c-beginning-of-statement-1 lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4454 (c-forward-syntactic-ws)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4455 (c-add-syntax 'topmost-intro-cont (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4456 )) ; end CASE 5
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4457 ;; CASE 6: line is an expression, not a statement. Most
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4458 ;; likely we are either in a function prototype or a function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4459 ;; call argument list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4460 ((/= (char-after containing-sexp) ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4461 (c-backward-syntactic-ws containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4462 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4463 ;; CASE 6A: we are looking at the arglist closing paren or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4464 ;; at an Objective-C or Java method call closing bracket.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4465 ((and (/= char-before-ip ?,)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4466 (memq char-after-ip '(?\) ?\])))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4467 (if (and c-method-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4468 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4469 (goto-char (1- containing-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4470 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4471 (not (looking-at c-symbol-key))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4472 (c-add-syntax 'statement-cont containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4473 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4474 (c-add-syntax 'arglist-close (c-point 'boi))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4475 ;; CASE 6B: we are looking at the first argument in an empty
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4476 ;; argument list. Use arglist-close if we're actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4477 ;; looking at a close paren or bracket.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4478 ((memq char-before-ip '(?\( ?\[))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4479 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4480 (c-add-syntax 'arglist-intro (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4481 ;; CASE 6C: we are inside a conditional test clause. treat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4482 ;; these things as statements
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4483 ((save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4484 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4485 (and (c-safe (progn (forward-sexp -1) t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4486 (looking-at "\\<for\\>")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4487 (goto-char (1+ containing-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4488 (c-forward-syntactic-ws indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4489 (c-beginning-of-statement-1 containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4490 (if (= char-before-ip ?\;)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4491 (c-add-syntax 'statement (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4492 (c-add-syntax 'statement-cont (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4493 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4494 ;; CASE 6D: maybe a continued method call. This is the case
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4495 ;; when we are inside a [] bracketed exp, and what precede
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4496 ;; the opening bracket is not an identifier.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4497 ((and c-method-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4498 (= (char-after containing-sexp) ?\[)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4499 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4500 (goto-char (1- containing-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4501 (c-backward-syntactic-ws (c-point 'bod))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4502 (if (not (looking-at c-symbol-key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4503 (c-add-syntax 'objc-method-call-cont containing-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4504 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4505 ;; CASE 6E: we are looking at an arglist continuation line,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4506 ;; but the preceding argument is on the same line as the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4507 ;; opening paren. This case includes multi-line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4508 ;; mathematical paren groupings, but we could be on a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4509 ;; for-list continuation line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4510 ((and (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4511 (goto-char (1+ containing-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4512 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4513 (not (eolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4514 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4515 (c-beginning-of-statement-1 lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4516 (skip-chars-backward " \t([")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4517 (<= (point) containing-sexp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4518 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4519 (c-add-syntax 'arglist-cont-nonempty (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4520 ;; CASE 6F: we are looking at just a normal arglist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4521 ;; continuation line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4522 (t (c-beginning-of-statement-1 containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4523 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4524 (c-forward-syntactic-ws indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4525 (c-add-syntax 'arglist-cont (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4526 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4527 ;; CASE 7: func-local multi-inheritance line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4528 ((and c-baseclass-key
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4529 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4530 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4531 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4532 (looking-at c-baseclass-key)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4533 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4534 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4535 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4536 ;; CASE 7A: non-hanging colon on an inher intro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4537 ((= char-after-ip ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4538 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4539 (c-add-syntax 'inher-intro (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4540 ;; CASE 7B: hanging colon on an inher intro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4541 ((= char-before-ip ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4542 (c-add-syntax 'inher-intro (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4543 ;; CASE 7C: a continued inheritance line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4544 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4545 (c-beginning-of-inheritance-list lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4546 (c-add-syntax 'inher-cont (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4547 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4548 ;; CASE 8: we are inside a brace-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4549 ((setq placeholder (c-inside-bracelist-p containing-sexp state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4550 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4551 ;; CASE 8A: brace-list-close brace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4552 ((and (= char-after-ip ?})
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4553 (c-safe (progn (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4554 (backward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4555 t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4556 (= (point) containing-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4557 (c-add-syntax 'brace-list-close (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4558 ;; CASE 8B: we're looking at the first line in a brace-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4559 ((save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4560 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4561 (c-backward-syntactic-ws containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4562 (= (point) (1+ containing-sexp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4563 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4564 ;;(if (= char-after-ip ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4565 ;;(c-add-syntax 'brace-list-open (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4566 (c-add-syntax 'brace-list-intro (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4567 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4568 ;;)) ; end CASE 8B
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4569 ;; CASE 8C: this is just a later brace-list-entry
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4570 (t (goto-char (1+ containing-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4571 (c-forward-syntactic-ws indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4572 (if (= char-after-ip ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4573 (c-add-syntax 'brace-list-open (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4574 (c-add-syntax 'brace-list-entry (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4575 )) ; end CASE 8C
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4576 )) ; end CASE 8
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4577 ;; CASE 9: A continued statement
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4578 ((and (not (memq char-before-ip '(?\; ?} ?:)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4579 (> (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4580 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4581 (c-beginning-of-statement-1 containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4582 (setq placeholder (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4583 (/= placeholder containing-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4584 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4585 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4586 (let ((after-cond-placeholder
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4587 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4588 (goto-char placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4589 (if (looking-at c-conditional-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4590 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4591 (c-safe (c-skip-conditional))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4592 (c-forward-syntactic-ws)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4593 (if (memq (following-char) '(?\;))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4594 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4595 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4596 (c-forward-syntactic-ws)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4597 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4598 nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4599 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4600 ;; CASE 9A: substatement
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4601 ((and after-cond-placeholder
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4602 (>= after-cond-placeholder indent-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4603 (goto-char placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4604 (if (= char-after-ip ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4605 (c-add-syntax 'substatement-open (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4606 (c-add-syntax 'substatement (c-point 'boi))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4607 ;; CASE 9B: open braces for class or brace-lists
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4608 ((= char-after-ip ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4609 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4610 ;; CASE 9B.1: class-open
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4611 ((save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4612 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4613 (skip-chars-forward " \t{")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4614 (let ((decl (c-search-uplist-for-classkey (c-parse-state))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4615 (and decl
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4616 (setq placeholder (aref decl 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4617 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4618 (c-add-syntax 'class-open placeholder))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4619 ;; CASE 9B.2: brace-list-open
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4620 ((or (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4621 (goto-char placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4622 (looking-at "\\<enum\\>"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4623 (= char-before-ip ?=))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4624 (c-add-syntax 'brace-list-open placeholder))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4625 ;; CASE 9B.3: catch-all for unknown construct.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4626 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4627 ;; Can and should I add an extensibility hook here?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4628 ;; Something like c-recognize-hook so support for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4629 ;; unknown constructs could be added. It's probably a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4630 ;; losing proposition, so I dunno.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4631 (goto-char placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4632 (c-add-syntax 'statement-cont (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4633 (c-add-syntax 'block-open))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4634 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4635 ;; CASE 9C: iostream insertion or extraction operator
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4636 ((looking-at "<<\\|>>")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4637 (goto-char placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4638 (and after-cond-placeholder
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4639 (goto-char after-cond-placeholder))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4640 (while (and (re-search-forward "<<\\|>>" indent-point 'move)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4641 (c-in-literal placeholder)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4642 ;; if we ended up at indent-point, then the first
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4643 ;; streamop is on a separate line. Indent the line like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4644 ;; a statement-cont instead
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4645 (if (/= (point) indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4646 (c-add-syntax 'stream-op (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4647 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4648 (c-add-syntax 'statement-cont (c-point 'boi))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4649 ;; CASE 9D: continued statement. find the accurate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4650 ;; beginning of statement or substatement
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4651 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4652 (c-beginning-of-statement-1 after-cond-placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4653 ;; KLUDGE ALERT! c-beginning-of-statement-1 can leave
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4654 ;; us before the lim we're passing in. It should be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4655 ;; fixed, but I'm worried about side-effects at this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4656 ;; late date. Fix for v5.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4657 (goto-char (or (and after-cond-placeholder
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4658 (max after-cond-placeholder (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4659 (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4660 (c-add-syntax 'statement-cont (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4661 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4662 ;; CASE 10: an else clause?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4663 ((looking-at "\\<else\\>[^_]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4664 (c-backward-to-start-of-if containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4665 (c-add-syntax 'else-clause (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4666 ;; CASE 11: Statement. But what kind? Lets see if its a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4667 ;; while closure of a do/while construct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4668 ((progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4669 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4670 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4671 (and (looking-at "while\\b[^_]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4672 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4673 (c-backward-to-start-of-do containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4674 (setq placeholder (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4675 (looking-at "do\\b[^_]"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4676 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4677 (c-add-syntax 'do-while-closure placeholder))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4678 ;; CASE 12: A case or default label
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4679 ((looking-at c-switch-label-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4680 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4681 ;; check for hanging braces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4682 (if (/= (point) (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4683 (forward-sexp -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4684 (c-add-syntax 'case-label (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4685 ;; CASE 13: any other label
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4686 ((looking-at c-label-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4687 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4688 (c-add-syntax 'label (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4689 ;; CASE 14: block close brace, possibly closing the defun or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4690 ;; the class
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4691 ((= char-after-ip ?})
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4692 (let* ((lim (c-safe-position containing-sexp fullstate))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4693 (relpos (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4694 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4695 (if (/= (point) (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4696 (c-beginning-of-statement-1 lim))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4697 (c-point 'boi))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4698 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4699 ;; CASE 14A: does this close an inline?
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4700 ((let ((inclass-p (progn
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4701 (goto-char containing-sexp)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4702 (c-search-uplist-for-classkey state))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4703 ;; inextern-p in higher level let*
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4704 (setq inextern-p (and inclass-p
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4705 (progn
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4706 (goto-char (aref inclass-p 0))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4707 (looking-at "extern[^_]"))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4708 (and inclass-p (not inextern-p)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4709 (c-add-syntax 'inline-close relpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4710 ;; CASE 14B: if there an enclosing brace that hasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4711 ;; been narrowed out by a class, then this is a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4712 ;; block-close
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4713 ((and (not inextern-p)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4714 (c-most-enclosing-brace state))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4715 (c-add-syntax 'block-close relpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4716 ;; CASE 14C: find out whether we're closing a top-level
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4717 ;; class or a defun
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4718 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4719 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4720 (narrow-to-region (point-min) indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4721 (let ((decl (c-search-uplist-for-classkey (c-parse-state))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4722 (if decl
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4723 (c-add-syntax 'class-close (aref decl 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4724 (c-add-syntax 'defun-close relpos)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4725 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4726 ;; CASE 15: statement catchall
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4727 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4728 ;; we know its a statement, but we need to find out if it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4729 ;; the first statement in a block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4730 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4731 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4732 (c-forward-syntactic-ws indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4733 ;; now skip forward past any case/default clauses we might find.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4734 (while (or (c-skip-case-statement-forward fullstate indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4735 (and (looking-at c-switch-label-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4736 (not inswitch-p)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4737 (setq inswitch-p t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4738 ;; we want to ignore non-case labels when skipping forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4739 (while (and (looking-at c-label-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4740 (goto-char (match-end 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4741 (c-forward-syntactic-ws indent-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4742 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4743 ;; CASE 15A: we are inside a case/default clause inside a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4744 ;; switch statement. find out if we are at the statement
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4745 ;; just after the case/default label.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4746 ((and inswitch-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4747 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4748 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4749 (c-backward-syntactic-ws containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4750 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4751 (setq placeholder (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4752 (looking-at c-switch-label-key)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4753 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4754 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4755 (if (= (following-char) ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4756 (c-add-syntax 'statement-case-open placeholder)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4757 (c-add-syntax 'statement-case-intro placeholder)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4758 ;; CASE 15B: continued statement
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4759 ((= char-before-ip ?,)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4760 (c-add-syntax 'statement-cont (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4761 ;; CASE 15C: a question/colon construct? But make sure
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4762 ;; what came before was not a label, and what comes after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4763 ;; is not a globally scoped function call!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4764 ((or (and (memq char-before-ip '(?: ??))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4765 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4766 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4767 (c-backward-syntactic-ws lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4768 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4769 (not (looking-at c-label-key))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4770 (and (memq char-after-ip '(?: ??))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4771 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4772 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4773 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4774 ;; watch out for scope operator
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4775 (not (looking-at "::")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4776 (c-add-syntax 'statement-cont (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4777 ;; CASE 15D: any old statement
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4778 ((< (point) indent-point)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4779 (let ((safepos (c-most-enclosing-brace fullstate))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4780 relpos done)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4781 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4782 (c-beginning-of-statement-1 safepos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4783 ;; It is possible we're on the brace that opens a nested
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4784 ;; function.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4785 (if (and (= (following-char) ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4786 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4787 (c-backward-syntactic-ws safepos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4788 (/= (preceding-char) ?\;)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4789 (c-beginning-of-statement-1 safepos))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4790 (if (and inswitch-p
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4791 (looking-at c-switch-label-key))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4792 (progn
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4793 (goto-char placeholder)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4794 (end-of-line)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4795 (forward-sexp -1)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4796 (setq relpos (c-point 'boi))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4797 (while (and (not done)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4798 (<= safepos (point))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4799 (/= relpos (point)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4800 (c-beginning-of-statement-1 safepos)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4801 (if (= relpos (c-point 'boi))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4802 (setq done t))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4803 (setq relpos (c-point 'boi)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
4804 (c-add-syntax 'statement relpos)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4805 (if (= char-after-ip ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4806 (c-add-syntax 'block-open))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4807 ;; CASE 15E: first statement in an inline, or first
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4808 ;; statement in a top-level defun. we can tell this is it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4809 ;; if there are no enclosing braces that haven't been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4810 ;; narrowed out by a class (i.e. don't use bod here!)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4811 ((save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4812 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4813 (widen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4814 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4815 (c-narrow-out-enclosing-class state containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4816 (not (c-most-enclosing-brace state))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4817 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4818 ;; if not at boi, then defun-opening braces are hung on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4819 ;; right side, so we need a different relpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4820 (if (/= (point) (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4821 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4822 (c-backward-syntactic-ws)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4823 (c-safe (forward-sexp (if (= (preceding-char) ?\))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4824 -1 -2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4825 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4826 (c-add-syntax 'defun-block-intro (c-point 'boi)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4827 ;; CASE 15F: first statement in a block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4828 (t (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4829 (if (/= (point) (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4830 (c-beginning-of-statement-1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4831 (if (= (point) lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4832 (c-safe-position (point) state) lim)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4833 (c-add-syntax 'statement-block-intro (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4834 (if (= char-after-ip ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4835 (c-add-syntax 'block-open)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4836 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4837 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4838
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4839 ;; now we need to look at any modifiers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4840 (goto-char indent-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4841 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4842 ;; are we looking at a comment only line?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4843 (if (looking-at c-comment-start-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4844 (c-add-syntax 'comment-intro))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4845 ;; we might want to give additional offset to friends (in C++).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4846 (if (and (eq major-mode 'c++-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4847 (looking-at c-C++-friend-key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4848 (c-add-syntax 'friend))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4849 ;; return the syntax
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4850 syntax))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4851
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4852
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4853 ;; indent via syntactic language elements
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4854 (defun c-get-offset (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4855 ;; Get offset from LANGELEM which is a cons cell of the form:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4856 ;; (SYMBOL . RELPOS). The symbol is matched against
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4857 ;; c-offsets-alist and the offset found there is either returned,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4858 ;; or added to the indentation at RELPOS. If RELPOS is nil, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4859 ;; the offset is simply returned.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4860 (let* ((symbol (car langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4861 (relpos (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4862 (match (assq symbol c-offsets-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4863 (offset (cdr-safe match)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4864 ;; offset can be a number, a function, a variable, or one of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4865 ;; symbols + or -
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4866 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4867 ((not match)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4868 (if c-strict-syntax-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4869 (error "don't know how to indent a %s" symbol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4870 (setq offset 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4871 relpos 0)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4872 ((eq offset '+) (setq offset c-basic-offset))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4873 ((eq offset '-) (setq offset (- c-basic-offset)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4874 ((eq offset '++) (setq offset (* 2 c-basic-offset)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4875 ((eq offset '--) (setq offset (* 2 (- c-basic-offset))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4876 ((eq offset '*) (setq offset (/ c-basic-offset 2)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4877 ((eq offset '/) (setq offset (/ (- c-basic-offset) 2)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4878 ((c-functionp offset) (setq offset (funcall offset langelem)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4879 ((not (numberp offset)) (setq offset (symbol-value offset)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4880 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4881 (+ (if (and relpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4882 (< relpos (c-point 'bol)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4883 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4884 (goto-char relpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4885 (current-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4886 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4887 offset)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4888
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4889 (defun c-indent-line (&optional syntax)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4890 ;; indent the current line as C/C++/ObjC code. Optional SYNTAX is the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4891 ;; syntactic information for the current line. Returns the amount of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4892 ;; indentation change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4893 (let* ((c-syntactic-context (or syntax (c-guess-basic-syntax)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4894 (pos (- (point-max) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4895 (indent (apply '+ (mapcar 'c-get-offset c-syntactic-context)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4896 (shift-amt (- (current-indentation) indent)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4897 (and c-echo-syntactic-information-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4898 (message "syntax: %s, indent= %d" c-syntactic-context indent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4899 (if (zerop shift-amt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4900 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4901 (delete-region (c-point 'bol) (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4902 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4903 (indent-to indent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4904 (if (< (point) (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4905 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4906 ;; If initial point was within line's indentation, position after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4907 ;; the indentation. Else stay at same point in text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4908 (if (> (- (point-max) pos) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4909 (goto-char (- (point-max) pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4910 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4911 (run-hooks 'c-special-indent-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4912 shift-amt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4913
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4914 (defun c-show-syntactic-information (arg)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4915 "Show syntactic information for current line.
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4916 With universal argument, inserts the analysis as a comment on that line."
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4917 (interactive "P")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4918 (let ((syntax (c-guess-basic-syntax)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4919 (if (not (consp arg))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4920 (message "syntactic analysis: %s" (c-guess-basic-syntax))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4921 (indent-for-comment)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4922 (insert (format "%s" syntax))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4923 ))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4924 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4925
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4926
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4927 ;; Standard indentation line-ups
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4928 (defun c-lineup-arglist (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4929 ;; lineup the current arglist line with the arglist appearing just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4930 ;; after the containing paren which starts the arglist.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4931 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4932 (let* ((containing-sexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4933 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4934 ;; arglist-cont-nonempty gives relpos ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4935 ;; to boi of containing-sexp paren. This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4936 ;; is good when offset is +, but bad
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4937 ;; when it is c-lineup-arglist, so we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4938 ;; have to special case a kludge here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4939 (if (memq (car langelem) '(arglist-intro arglist-cont-nonempty))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4940 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4941 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4942 (backward-up-list 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4943 (skip-chars-forward " \t" (c-point 'eol)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4944 (goto-char (cdr langelem)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4945 (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4946 (cs-curcol (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4947 (goto-char (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4948 (current-column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4949 (if (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4950 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4951 (looking-at "[ \t]*)"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4952 (progn (goto-char (match-end 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4953 (forward-sexp -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4954 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4955 (c-forward-syntactic-ws)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4956 (- (current-column) cs-curcol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4957 (goto-char containing-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4958 (or (eolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4959 (not (memq (following-char) '(?{ ?\( )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4960 (let ((eol (c-point 'eol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4961 (here (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4962 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4963 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4964 (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4965 (c-forward-syntactic-ws)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4966 (if (< (point) eol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4967 (goto-char here))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4968 (- (current-column) cs-curcol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4969 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4970
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4971 (defun c-lineup-arglist-intro-after-paren (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4972 ;; lineup an arglist-intro line to just after the open paren
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4973 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4974 (let ((cs-curcol (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4975 (goto-char (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4976 (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4977 (ce-curcol (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4978 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4979 (backward-up-list 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4980 (skip-chars-forward " \t" (c-point 'eol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4981 (current-column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4982 (- ce-curcol cs-curcol -1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4983
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4984 (defun c-lineup-arglist-close-under-paren (langelem)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4985 ;; lineup an arglist-intro line to just after the open paren
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4986 (save-excursion
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4987 (let ((cs-curcol (save-excursion
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4988 (goto-char (cdr langelem))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4989 (current-column)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4990 (ce-curcol (save-excursion
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4991 (beginning-of-line)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4992 (backward-up-list 1)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4993 (current-column))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4994 (- ce-curcol cs-curcol))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4995
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4996 (defun c-lineup-streamop (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4997 ;; lineup stream operators
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4998 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4999 (let* ((relpos (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5000 (curcol (progn (goto-char relpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5001 (current-column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5002 (re-search-forward "<<\\|>>" (c-point 'eol) 'move)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5003 (goto-char (match-beginning 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5004 (- (current-column) curcol))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5005
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5006 (defun c-lineup-multi-inher (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5007 ;; line up multiple inheritance lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5008 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5009 (let (cs-curcol
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5010 (eol (c-point 'eol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5011 (here (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5012 (goto-char (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5013 (setq cs-curcol (current-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5014 (skip-chars-forward "^:" eol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5015 (skip-chars-forward " \t:" eol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5016 (if (or (eolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5017 (looking-at c-comment-start-regexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5018 (c-forward-syntactic-ws here))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5019 (- (current-column) cs-curcol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5020 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5021
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5022 (defun c-lineup-java-inher (langelem)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5023 ;; line up Java implements and extends continuations
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5024 (save-excursion
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5025 (let ((cs-curcol (progn (goto-char (cdr langelem))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5026 (current-column))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5027 (forward-word 1)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5028 (if (looking-at "[ \t]*$")
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5029 cs-curcol
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5030 (c-forward-syntactic-ws)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5031 (- (current-column) cs-curcol)))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5032
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5033 (defun c-lineup-C-comments (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5034 ;; line up C block comment continuation lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5035 (save-excursion
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5036 (let ((here (point))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5037 (stars (progn (back-to-indentation)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5038 (skip-chars-forward "*")))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5039 (cs-curcol (progn (goto-char (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5040 (current-column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5041 (back-to-indentation)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5042 (if (not (re-search-forward "/[*]+" (c-point 'eol) t))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5043 (progn
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5044 (if (not (looking-at "[*]+"))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5045 (progn
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5046 ;; we now have to figure out where this comment begins.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5047 (goto-char here)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5048 (back-to-indentation)
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5049 (if (looking-at "[*]+/")
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5050 (progn (goto-char (match-end 0))
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5051 (forward-comment -1))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5052 (goto-char (cdr langelem))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5053 (back-to-indentation))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5054 (- (current-column) cs-curcol))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5055 (if (zerop stars)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5056 (skip-chars-forward " \t"))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5057 (- (current-column) stars cs-curcol))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5058 )))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5059
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5060 (defun c-lineup-comment (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5061 ;; support old behavior for comment indentation. we look at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5062 ;; c-comment-only-line-offset to decide how to indent comment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5063 ;; only-lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5064 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5065 (back-to-indentation)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5066 ;; this highly kludgiforous flag prevents the mapcar over
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5067 ;; c-syntactic-context from entering an infinite loop
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5068 (let ((recurse-prevention-flag (boundp 'recurse-prevention-flag)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5069 (cond
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5070 ;; CASE 1: preserve comment-column
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5071 (recurse-prevention-flag 0)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5072 ((= (current-column) comment-column)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5073 ;; we have to subtract out all other indentation
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5074 (- comment-column (apply '+ (mapcar 'c-get-offset
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5075 c-syntactic-context))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5076 ;; indent as specified by c-comment-only-line-offset
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5077 ((not (bolp))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5078 (or (car-safe c-comment-only-line-offset)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5079 c-comment-only-line-offset))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5080 (t
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5081 (or (cdr-safe c-comment-only-line-offset)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5082 (car-safe c-comment-only-line-offset)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5083 -1000)) ;jam it against the left side
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5084 ))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5085
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5086 (defun c-lineup-runin-statements (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5087 ;; line up statements in coding standards which place the first
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5088 ;; statement on the same line as the block opening brace.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5089 (if (= (char-after (cdr langelem)) ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5090 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5091 (let ((curcol (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5092 (goto-char (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5093 (current-column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5094 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5095 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5096 (- (current-column) curcol)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5097 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5098
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5099 (defun c-lineup-math (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5100 ;; line up math statement-cont after the equals
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5101 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5102 (let* ((relpos (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5103 (equalp (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5104 (goto-char (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5105 (skip-chars-forward "^=" (c-point 'eol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5106 (and (= (following-char) ?=)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5107 (- (point) (c-point 'boi)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5108 (curcol (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5109 (goto-char relpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5110 (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5111 donep)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5112 (while (and (not donep)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5113 (< (point) (c-point 'eol)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5114 (skip-chars-forward "^=" (c-point 'eol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5115 (if (c-in-literal (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5116 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5117 (setq donep t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5118 (if (/= (following-char) ?=)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5119 ;; there's no equal sign on the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5120 c-basic-offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5121 ;; calculate indentation column after equals and ws, unless
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5122 ;; our line contains an equals sign
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5123 (if (not equalp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5124 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5125 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5126 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5127 (setq equalp 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5128 (- (current-column) equalp curcol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5129 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5130
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5131 (defun c-lineup-ObjC-method-call (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5132 ;; Line up methods args as elisp-mode does with function args: go to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5133 ;; the position right after the message receiver, and if you are at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5134 ;; (eolp) indent the current line by a constant offset from the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5135 ;; opening bracket; otherwise we are looking at the first character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5136 ;; of the first method call argument, so lineup the current line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5137 ;; with it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5138 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5139 (let* ((extra (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5140 (back-to-indentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5141 (c-backward-syntactic-ws (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5142 (if (= (preceding-char) ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5143 (- c-basic-offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5144 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5145 (open-bracket-pos (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5146 (open-bracket-col (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5147 (goto-char open-bracket-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5148 (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5149 (target-col (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5150 (forward-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5151 (forward-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5152 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5153 (if (eolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5154 (+ open-bracket-col c-basic-offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5155 (current-column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5156 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5157 (- target-col open-bracket-col extra))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5159 (defun c-lineup-ObjC-method-args (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5160 ;; Line up the colons that separate args. This is done trying to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5161 ;; align colons vertically.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5162 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5163 (let* ((here (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5164 (curcol (progn (goto-char here) (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5165 (eol (c-point 'eol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5166 (relpos (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5167 (first-col-column (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5168 (goto-char relpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5169 (skip-chars-forward "^:" eol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5170 (and (= (following-char) ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5171 (current-column)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5172 (if (not first-col-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5173 c-basic-offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5174 (goto-char here)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5175 (skip-chars-forward "^:" eol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5176 (if (= (following-char) ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5177 (+ curcol (- first-col-column (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5178 c-basic-offset)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5180 (defun c-lineup-ObjC-method-args-2 (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5181 ;; Line up the colons that separate args. This is done trying to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5182 ;; align the colon on the current line with the previous one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5183 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5184 (let* ((here (c-point 'boi))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5185 (curcol (progn (goto-char here) (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5186 (eol (c-point 'eol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5187 (relpos (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5188 (prev-col-column (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5189 (skip-chars-backward "^:" relpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5190 (and (= (preceding-char) ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5191 (- (current-column) 1)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5192 (if (not prev-col-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5193 c-basic-offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5194 (goto-char here)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5195 (skip-chars-forward "^:" eol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5196 (if (= (following-char) ?:)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5197 (+ curcol (- prev-col-column (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5198 c-basic-offset)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5200 (defun c-snug-do-while (syntax pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5201 "Dynamically calculate brace hanginess for do-while statements.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5202 Using this function, `while' clauses that end a `do-while' block will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5203 remain on the same line as the brace that closes that block.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5204
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5205 See `c-hanging-braces-alist' for how to utilize this function as an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5206 ACTION associated with `block-close' syntax."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5207 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5208 (let (langelem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5209 (if (and (eq syntax 'block-close)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5210 (setq langelem (assq 'block-close c-syntactic-context))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5211 (progn (goto-char (cdr langelem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5212 (if (= (following-char) ?{)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5213 (c-safe (forward-sexp -1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5214 (looking-at "\\<do\\>[^_]")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5215 '(before)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5216 '(before after)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5217
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5218 (defun c-gnu-impose-minimum ()
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5219 "Imposes a minimum indentation for lines inside a top-level construct.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5220 The variable `c-label-minimum-indentation' specifies the minimum
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5221 indentation amount."
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5222 (let ((non-top-levels '(defun-block-intro statement statement-cont
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5223 statement-block-intro statement-case-intro
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5224 statement-case-open substatement substatement-open
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5225 case-label label do-while-closure else-clause
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5226 ))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5227 (syntax c-syntactic-context)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5228 langelem)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5229 (while syntax
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5230 (setq langelem (car (car syntax))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5231 syntax (cdr syntax))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5232 ;; don't adjust comment-only lines
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5233 (cond ((eq langelem 'comment-intro)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5234 (setq syntax nil))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5235 ((memq langelem non-top-levels)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5236 (save-excursion
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5237 (setq syntax nil)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5238 (back-to-indentation)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5239 (if (zerop (current-column))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5240 (insert (make-string c-label-minimum-indentation 32)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5241 ))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5242 ))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5243
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5244
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5245 ;;; This page handles insertion and removal of backslashes for C macros.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5246
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5247 (defun c-backslash-region (from to delete-flag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5248 "Insert, align, or delete end-of-line backslashes on the lines in the region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5249 With no argument, inserts backslashes and aligns existing backslashes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5250 With an argument, deletes the backslashes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5251
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5252 This function does not modify blank lines at the start of the region.
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5253 If the region ends at the start of a line, it always deletes the
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5254 backslash (if any) at the end of the previous line.
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5255
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5256 You can put the region around an entire macro definition and use this
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5257 command to conveniently insert and align the necessary backslashes."
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5258 (interactive "r\nP")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5259 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5260 (goto-char from)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5261 (let ((column c-backslash-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5262 (endmark (make-marker)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5263 (move-marker endmark to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5264 ;; Compute the smallest column number past the ends of all the lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5265 (if (not delete-flag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5266 (while (< (point) to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5267 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5268 (if (= (preceding-char) ?\\)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5269 (progn (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5270 (skip-chars-backward " \t")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5271 (setq column (max column (1+ (current-column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5272 (forward-line 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5273 ;; Adjust upward to a tab column, if that doesn't push past the margin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5274 (if (> (% column tab-width) 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5275 (let ((adjusted (* (/ (+ column tab-width -1) tab-width) tab-width)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5276 (if (< adjusted (window-width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5277 (setq column adjusted))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5278 ;; Don't modify blank lines at start of region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5279 (goto-char from)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5280 (while (and (< (point) endmark) (eolp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5281 (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5282 ;; Add or remove backslashes on all the lines.
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5283 (while (< (point) endmark)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5284 (if (and (not delete-flag)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5285 ;; Un-backslashify the last line
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5286 ;; if the region ends right at the start of the next line.
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5287 (save-excursion
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5288 (forward-line 1)
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5289 (< (point) endmark)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5290 (c-append-backslash column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5291 (c-delete-backslash))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5292 (forward-line 1))
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5293 (move-marker endmark nil)))
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5294 (c-keep-region-active))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5295
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5296 (defun c-append-backslash (column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5297 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5298 ;; Note that "\\\\" is needed to get one backslash.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5299 (if (= (preceding-char) ?\\)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5300 (progn (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5301 (delete-horizontal-space)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5302 (indent-to column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5303 (indent-to column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5304 (insert "\\")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5305
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5306 (defun c-delete-backslash ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5307 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5308 (or (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5309 (progn
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5310 (forward-char -1)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5311 (if (looking-at "\\\\")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5312 (delete-region (1+ (point))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5313 (progn (skip-chars-backward " \t") (point)))))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5314
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5315
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5316 ;; defuns for submitting bug reports
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5317
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
5318 (defconst c-version "4.390"
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5319 "CC Mode version number.")
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5320 (defconst c-mode-help-address
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5321 "bug-gnu-emacs@prep.ai.mit.edu, cc-mode-help@python.org"
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5322 "Address for CC Mode bug reports.")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5323
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5324 (defun c-version ()
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5325 "Echo the current version of CC Mode in the minibuffer."
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5326 (interactive)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5327 (message "Using CC Mode version %s" c-version)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5328 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5330 ;; get reporter-submit-bug-report when byte-compiling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5331 (eval-when-compile
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5332 (require 'reporter))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5333
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5334 (defun c-submit-bug-report ()
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5335 "Submit via mail a bug report on CC Mode."
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5336 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5337 ;; load in reporter
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5338 (let ((reporter-prompt-for-summary-p t)
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5339 (reporter-dont-compact-list '(c-offsets-alist))
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5340 (style c-indentation-style)
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5341 (hook c-special-indent-hook)
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5342 (c-features c-emacs-features))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5343 (and
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5344 (if (y-or-n-p "Do you want to submit a report on CC Mode? ")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5345 t (message "") nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5346 (require 'reporter)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5347 (reporter-submit-bug-report
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5348 c-mode-help-address
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5349 (concat "CC Mode " c-version " ("
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5350 (cond ((eq major-mode 'c++-mode) "C++")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5351 ((eq major-mode 'c-mode) "C")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5352 ((eq major-mode 'objc-mode) "ObjC")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5353 ((eq major-mode 'java-mode) "Java")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5354 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5355 ")")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5356 (let ((vars (list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5357 ;; report only the vars that affect indentation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5358 'c-basic-offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5359 'c-offsets-alist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5360 'c-cleanup-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5361 'c-comment-only-line-offset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5362 'c-backslash-column
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5363 'c-delete-function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5364 'c-electric-pound-behavior
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5365 'c-hanging-braces-alist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5366 'c-hanging-colons-alist
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5367 'c-hanging-comment-starter-p
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5368 'c-hanging-comment-ender-p
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5369 'c-indent-comments-syntactically-p
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5370 'c-tab-always-indent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5371 'c-recognize-knr-p
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5372 'c-label-minimum-indentation
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5373 'defun-prompt-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5374 'tab-width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5375 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5376 (if (not (boundp 'defun-prompt-regexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5377 (delq 'defun-prompt-regexp vars)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5378 vars))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5379 (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5380 (lambda ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5381 (insert
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5382 "Buffer Style: " style "\n\n"
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5383 (if hook
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5384 (concat "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5385 "c-special-indent-hook is set to '"
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5386 (format "%s" hook)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5387 ".\nPerhaps this is your problem?\n"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5388 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5389 "\n")
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
5390 (format "c-emacs-features: %s\n" c-features)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5391 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5392 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5393 "Dear Barry,"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5394 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5395
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5396
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5397 ;; menus for XEmacs 19
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5398 (defun c-mode-menu ()
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5399 (cons (concat mode-name " Mode Commands") c-mode-menu))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5400
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5401 (defun c-popup-menu (e)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5402 "Pops up the C/C++/ObjC menu."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5403 (interactive "@e")
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5404 (popup-menu (c-mode-menu))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5405 (c-keep-region-active))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5406
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5407
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5408 ;; Emacs/XEmacs Compatibility
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5409 ;; XEmacs has these, Emacs does not
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5410
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5411 (if (fboundp 'functionp)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5412 (defalias 'c-functionp 'functionp)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5413 ;; Lift XEmacs 19.13's functionp from subr.el
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5414 (defun c-functionp (obj)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5415 "Returns t if OBJ is a function, nil otherwise."
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5416 (cond
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5417 ((symbolp obj) (fboundp obj))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5418 ((subrp obj))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5419 ((compiled-function-p obj))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5420 ((consp obj)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5421 (if (eq (car obj) 'lambda) (listp (car (cdr obj)))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5422 (t nil))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5423
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5424 (if (fboundp 'copy-tree)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5425 (defalias 'c-copy-tree 'copy-tree)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5426 ;; Lift XEmacs 19.12's copy-tree
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5427 (defun c-copy-tree (tree)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5428 (if (consp tree)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5429 (cons (c-copy-tree (car tree))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5430 (c-copy-tree (cdr tree)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5431 (if (vectorp tree)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5432 (let* ((new (copy-sequence tree))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5433 (i (1- (length new))))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5434 (while (>= i 0)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5435 (aset new i (c-copy-tree (aref new i)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5436 (setq i (1- i)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5437 new)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5438 tree))))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5439
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5440
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5441 ;; Dynamically append the default value of most variables. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5442 ;; crucial because future c-set-style calls will always reset the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5443 ;; variables first to the `cc-mode' style before instituting the new
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5444 ;; style. Only do this once!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5445 (or (assoc "cc-mode" c-style-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5446 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5447 (c-add-style "cc-mode"
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5448 (mapcar
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5449 (function
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5450 (lambda (var)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5451 (let ((val (symbol-value var)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5452 (cons var (if (atom val) val
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5453 (c-copy-tree val)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5454 ))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5455 )))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5456 '(c-backslash-column
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5457 c-basic-offset
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5458 c-cleanup-list
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5459 c-comment-only-line-offset
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5460 c-electric-pound-behavior
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5461 c-hanging-braces-alist
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5462 c-hanging-colons-alist
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5463 c-hanging-comment-starter-p
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5464 c-hanging-comment-ender-p
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5465 c-offsets-alist
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5466 )))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5467 ;; the default style is now GNU. This can be overridden in
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5468 ;; c-mode-common-hook or {c,c++,objc,java}-mode-hook.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5469 (c-set-style c-site-default-style)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5470
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5471 (if c-style-variables-are-local-p
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5472 (progn
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5473 ;; style variables
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5474 (make-variable-buffer-local 'c-offsets-alist)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5475 (make-variable-buffer-local 'c-basic-offset)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5476 (make-variable-buffer-local 'c-file-style)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5477 (make-variable-buffer-local 'c-file-offsets)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5478 (make-variable-buffer-local 'c-comment-only-line-offset)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5479 (make-variable-buffer-local 'c-cleanup-list)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5480 (make-variable-buffer-local 'c-hanging-braces-alist)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5481 (make-variable-buffer-local 'c-hanging-colons-alist)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5482 (make-variable-buffer-local 'c-hanging-comment-starter-p)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5483 (make-variable-buffer-local 'c-hanging-comment-ender-p)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5484 (make-variable-buffer-local 'c-backslash-column)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5485 (make-variable-buffer-local 'c-label-minimum-indentation)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5486 (make-variable-buffer-local 'c-special-indent-hook)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5487 (make-variable-buffer-local 'c-indentation-style)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5488
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5489
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5490 ;; fsets for compatibility with BOCM
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5491 (fset 'electric-c-brace 'c-electric-brace)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5492 (fset 'electric-c-semi 'c-electric-semi&comma)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5493 (fset 'electric-c-sharp-sign 'c-electric-pound)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5494 ;; there is no CC Mode equivalent for electric-c-terminator
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5495 (fset 'mark-c-function 'c-mark-function)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5496 (fset 'indent-c-exp 'c-indent-exp)
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5497 ;;;###autoload (fset 'set-c-style 'c-set-style)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5498 ;; Lucid Emacs 19.9 + font-lock + CC Mode - c++-mode lossage
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5499 (fset 'c++-beginning-of-defun 'beginning-of-defun)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5500 (fset 'c++-end-of-defun 'end-of-defun)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5502 ;; set up bc warnings for obsolete variables, but for now lets not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5503 ;; worry about obsolete functions. maybe later some will be important
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5504 ;; to flag
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
5505 (and (or (memq 'v19 c-emacs-features) (memq 'v20 c-emacs-features))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5506 (let* ((na "Nothing appropriate.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5507 (vars
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5508 (list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5509 (cons 'c++-c-mode-syntax-table 'c-mode-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5510 (cons 'c++-tab-always-indent 'c-tab-always-indent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5511 (cons 'c++-always-arglist-indent-p na)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5512 (cons 'c++-block-close-brace-offset 'c-offsets-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5513 (cons 'c++-paren-as-block-close-p na)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5514 (cons 'c++-continued-member-init-offset 'c-offsets-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5515 (cons 'c++-member-init-indent 'c-offsets-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5516 (cons 'c++-friend-offset na)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5517 (cons 'c++-access-specifier-offset 'c-offsets-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5518 (cons 'c++-empty-arglist-indent 'c-offsets-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5519 (cons 'c++-comment-only-line-offset 'c-comment-only-line-offset)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5520 (cons 'c++-C-block-comments-indent-p na)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5521 (cons 'c++-cleanup-list 'c-cleanup-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5522 (cons 'c++-hanging-braces 'c-hanging-braces-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5523 (cons 'c++-hanging-member-init-colon 'c-hanging-colons-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5524 (cons 'c++-auto-hungry-initial-state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5525 "Use `c-auto-newline' and `c-hungry-delete-key' instead.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5526 (cons 'c++-auto-hungry-toggle na)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5527 (cons 'c++-relative-offset-p na)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5528 (cons 'c++-special-indent-hook 'c-special-indent-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5529 (cons 'c++-delete-function 'c-delete-function)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5530 (cons 'c++-electric-pound-behavior 'c-electric-pound-behavior)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5531 (cons 'c++-hungry-delete-key 'c-hungry-delete-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5532 (cons 'c++-auto-newline 'c-auto-newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5533 (cons 'c++-match-header-strongly na)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5534 (cons 'c++-defun-header-strong-struct-equivs na)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5535 (cons 'c++-version 'c-version)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5536 (cons 'c++-mode-help-address 'c-mode-help-address)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5537 (cons 'c-indent-level 'c-basic-offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5538 (cons 'c-brace-imaginary-offset na)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5539 (cons 'c-brace-offset 'c-offsets-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5540 (cons 'c-argdecl-indent 'c-offsets-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5541 (cons 'c-label-offset 'c-offsets-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5542 (cons 'c-continued-statement-offset 'c-offsets-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5543 (cons 'c-continued-brace-offset 'c-offsets-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5544 (cons 'c-default-macroize-column 'c-backslash-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5545 (cons 'c++-default-macroize-column 'c-backslash-column)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 78
diff changeset
5546 (cons 'c-block-comments-indent-p na)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5547 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5548 (mapcar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5549 (function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5550 (lambda (elt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5551 (make-obsolete-variable (car elt) (cdr elt))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5552 vars)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5553
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5554 (provide 'cc-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5555 ;;; cc-mode.el ends here