Packqage Problem with 21.4.3
22 years, 10 months
Jake Colman
Jake Colman
I 've been installing my own (that is, not root) versions of XEmacs for
quite some time. I configure with --prefix=$HOME and install it for personal
use withput a hitch. I've just upgraded from 21.1.12 to 21.4.3 and have a
problem with package updates.
With 21.1.12, if I updated the packages list and/or packages, the update
would be applied to the XEmacs distribution as whole, i.e.,
$PREFIX/lib/xemacs. When I do the same think with 21.4.3, it wants to apply
the update to $~/.xemacs. This would only update my personal copy of XEmacs
but not the installed copy. Since I've installed this copy personally, the
end result won't matter except for:
1) Anyone that points to my XEmacs binary. They won't see those updates
since they've not been applied to $PREFIX/lib/xemacs
2) How would my SA who installs this as root in /usr/local update the
official installation and not root's private packages?
Thanks!
--
Jake Colman
Principia Partners LLC Phone: (201) 946-0300
Harborside Financial Center Fax: (201) 946-0320
902 Plaza II Beeper: (800) 928-4640
Jersey City, NJ 07311 E-mail: colman(a)ppllc.com
E-mail: jcolman(a)jnc.com
web: http://www.ppllc.com
- 3 participants
- 5 comments
[PATCH] infloop workaround for Windows procedure called during GC
22 years, 10 months
Paul Krause
Paul Krause
Apparently, it is no longer safe (if it ever was) to use stderr to
report "Windows procedure called during GC???????". This workaround
prevents a crash, without hiding the underlying GC problem.
src/ChangeLog addition:
2001-06-05 Paul Krause <pkrause(a)soundbite.com>
* event-msw.c: replace unsafe call to stderr_out with
mswindows_output_console_string
XEmacs Patch (cvs -q diff -u ):
Index: src/event-msw.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/event-msw.c,v
retrieving revision 1.59
diff -u -u -r1.59 event-msw.c
--- src/event-msw.c 2001/06/02 05:40:53 1.59
+++ src/event-msw.c 2001/06/05 11:13:15
＠＠ -2065,7 +2065,7 ＠＠
behavior here. */
if (gc_in_progress)
{
- stderr_out ("Window procedure called during GC???????\n");
+ mswindows_output_console_string ("Window procedure called during GC???????\n", 41);
goto defproc;
}
- 2 participants
- 1 comments
[comp.emacs.xemacs] `vc-register' fails with SCCS
22 years, 10 months
Steve Youngs
Steve Youngs
I don't know anything about SCCS, could somebody please look into
this.
Thanks.
--
|---<Steve Youngs>---------------<GnuPG KeyID: 9E7E2820>---|
| XEmacs - It's not just an editor. |
| It's a way of life. |
|------------------------------------<youngs(a)xemacs.org>---|
- 1 participants
- 0 comments
[PATCH] Mule (and fonts) corrections to the manual
22 years, 10 months
Alexey Mahotkin
Alexey Mahotkin
Hello,
below is a set of patches describing how Mule deals with fonts (that's
what I promised to write during "Re: some MULE inconsistencies [with
patch]" discussion that happened at the end of April.
First, a patch to lisp/mule/cyrillic.el that uncomments the definition
of needed ccl-program and slightly renames it:
--- cyrillic.el 2001/06/05 20:16:35 1.1
+++ cyrillic.el 2001/06/05 20:16:44
＠＠ -137,11 +137,11 ＠＠
;; `iso-8-1' is not correct, but XEmacs doesn't have a `ccl' category
(coding-system-put 'koi8-r 'category 'iso-8-1)
-;; (define-ccl-program ccl-encode-koi8-font
-;; `(0
-;; ((r1 |= 128)
-;; (r1 = r1 ,cyrillic-koi8-r-encode-table)))
-;; "CCL program to encode Cyrillic chars to KOI font.")
+(define-ccl-program ccl-encode-koi8-r-font
+ `(0
+ ((r1 |= 128)
+ (r1 = r1 ,cyrillic-koi8-r-encode-table)))
+ "CCL program to encode Cyrillic chars to koi8-r font.")
;; (setq font-ccl-encoder-alist
;; (cons (cons "koi8" ccl-encode-koi8-font) font-ccl-encoder-alist))
Second, a patch to man/xemacs/mule.texi that adds a new section called
"Mule and fonts". Please feel free to edit it wrt English or
functionality. I'm not sure if it adequately describes the situation,
but at least something should be said about fonts.
This patch is supposed to apply to what I think is current beta
mule.texi (from 21.4.1 + patches from Martin):
[ look below for third]
--- mule.texi 2001/06/05 19:23:59 1.3
+++ mule.texi 2001/06/05 20:44:45
＠＠ -30,6 +30,7 ＠＠
* Language Environments:: Setting things up for the language you use.
* Input Methods:: Entering text characters not on your keyboard.
* Select Input Method:: Specifying your choice of input methods.
+* Mule and Fonts:: Additional font-related issues
* Coding Systems:: Character set conversion when you read and
write files, and so on.
* Recognize Coding:: How XEmacs figures out which conversion to use.
＠＠ -71,7 +72,7 ＠＠
＠cindex language environments
All supported character sets are supported in XEmacs buffers if it is
-compile with mule; there is no need to select a particular language in
+compiled with Mule; there is no need to select a particular language in
order to display its characters in an XEmacs buffer. However, it is
important to select a ＠dfn{language environment} in order to set various
defaults. The language environment really represents a choice of
＠＠ -190,7 +191,7 ＠＠
characters to type next is displayed in the echo area (but not when you
are in the minibuffer).
-＠node Select Input Method, Coding Systems, Input Methods, Mule
+＠node Select Input Method, Mule and Fonts, Input Methods, Mule
＠section Selecting an Input Method
＠table ＠kbd
＠＠ -252,7 +253,71 ＠＠
list-input-methods}. The list gives information about each input
method, including the string that stands for it in the mode line.
-＠node Coding Systems, Recognize Coding, Select Input Method, Mule
+＠node Mule and Fonts, Coding Systems, Select Input Method, Mule
+＠section Mule and Fonts
+＠cindex fonts
+＠cindex font registry
+＠cindex font encoding
+＠cindex CCL programs
+
+(This section is X11-specific.)
+
+Text in XEmacs buffers is displayed using various faces. In addition to
+specifying properties of a face, such as font and color, there are some
+additional properties of Mule charsets that are used in text.
+
+There is currently two properties of a charset that could be adjusted by
+user: font registry and so called ＠dfn{ccl-program}.
+
+Font registry is a regular expression matching the font registry field
+for this character set. For example, both the ＠code{ascii} and
+＠w{＠code{latin-iso8859-1}} charsets use the registry ＠code{"ISO8859-1"}.
+This field is used to choose an appropriate font when the user gives a
+general font specification such as ＠w{＠samp{-*-courier-medium-r-*-140-*}},
+i.e. a 14-point upright medium-weight Courier font.
+
+You can set font registry for a charset using
+＠samp{set-charset-registry} function in one of your startup files. This
+function takes two arguments: character set (as a symbol) and font
+registry (as a string).
+
+E.＠w{ }g., for Cyrillic texts Mule uses ＠w{＠code{cyrillic-iso8859-5}}
+charset with ＠samp{"ISO8859-5"} as a default registry, and we want to
+use ＠samp{"koi8-r"} instead, because fonts in that encoding are
+installed on our system. Use:
+
+＠example
+(set-charset-registry 'cyrillic-iso8859-5 "koi8-r")
+＠end example
+
+(Please note that you probably also want to set font registry for
+＠samp{ascii} charset so that mixed English/Cyrillic texts be displayed
+using the same font.)
+
+"CCL-programs" are a little special-purpose scripts defined within
+XEmacs or in some package. Those scripts allow XEmacs to use fonts that
+are in different encoding from the encoding that is used by Mule for
+text in buffer. Returning to the above example, we need to somehow tell
+XEmacs that we have different encodings of fonts and text and so it
+needs to convert characters between those encodings when displaying.
+That's what ＠samp{set-charset-ccl-program} function is used for. There
+are quite a few various CCL programs defined within XEmacs, and there is
+no comprehensive list of them, so you currently have to consult sources.
+＠c FIXME: there must be a list of CCL programs
+
+We know that there is a CCL program called ＠samp{ccl-encode-koi8-r-font}
+that is used exactly for needed purpose: to convert characters between
+＠samp{ISO8859-5} encoding and ＠samp{koi8-r}. Use:
+
+＠example
+(set-charset-ccl-program 'cyrillic-iso8859-5 'ccl-encode-koi8-r-font)
+＠end example
+
+There are several more uses for CCL programs, not related to fonts, but
+those uses are not described here.
+
+
+＠node Coding Systems, Recognize Coding, Mule and Fonts, Mule
＠section Coding Systems
＠cindex coding systems
Third, an obvious patch to man/lispref/mule.texi, to catch up with
reality:
--- mule.texi 2001/06/03 19:27:35 1.1
+++ mule.texi 2001/06/03 19:56:48
＠＠ -442,14 +442,19 ＠＠
position codes of characters in ＠var{charset} into font indices.
＠end defun
- The only property of a charset that can currently be set after
-the charset has been created is the CCL program.
+ The two properties of a charset that can currently be set after the
+charset has been created are the CCL program and the font registry.
＠defun set-charset-ccl-program charset ccl-program
This function sets the ＠code{ccl-program} property of ＠var{charset} to
＠var{ccl-program}.
＠end defun
+＠defun set-charset-registry charset registry
+This function sets the ＠code{registry} property of ＠var{charset} to
+＠var{registry}.
+＠end defun
+
＠node Predefined Charsets, , Charset Property Functions, Charsets
＠subsection Predefined Charsets
＠＠ -501,8 +506,8 ＠＠
ethiopic 94x94 2 0 l2r Ethio
ascii-r2l 94 B 0 r2l ISO8859-1
ipa 96 0 1 l2r MuleIPA
-vietnamese-lower 96 1 1 l2r VISCII1.1
-vietnamese-upper 96 2 1 l2r VISCII1.1
+vietnamese-viscii-lower 96 1 1 l2r VISCII1.1
+vietnamese-viscii-upper 96 2 1 l2r VISCII1.1
＠end example
For all of the above charsets, the dimension and number of columns are
--alexm
- 1 participants
- 0 comments
binary files
22 years, 10 months
Jeff Mincy
Jeff Mincy
Two issues with opening binary files.
1) when I (accidentally?) open a binary executable file it often
kills my w98 X server. I get X errors like this just before the demise:
xemacs: X Error of failed request: BadDrawable (invalid Pixmap or Window paramete
r)
Major opcode of failed request: 64 (X_PolyPoint)
Resource id in failed request: 0x4c010005
Serial number of failed request: 36624
Current serial number in output stream: 38278
xemacs: X Error of failed request: BadLength (poly request too large or internal
Xlib length error)
Major opcode of failed request: 92 (X_LookupColor)
Serial number of failed request: 36625
Current serial number in output stream: 38278
So, opening binary files is bad, so I decided to write an
advice type thing to open the executable in hexl mode.
;; Open files that begin with 'ELF' in some other mode.
(defvar executable-pattern (concat "^" (regexp-opt (mapcar 'regexp-quote '("\177ELF")) t)))
(defadvice set-auto-mode (around look-for-executables first activate)
(if (save-excursion
(goto-char (point-min))
(looking-at executable-pattern))
(hexl-mode)
ad-do-it))
This seemed to work fine until tar mode came along:
(defun tar-set-auto-mode ()
(interactive)
(if (and buffer-file-name
(string-match tar-regexp buffer-file-name))
(tar-mode)
(tar-real-set-auto-mode)))
(if (not (fboundp 'tar-real-normal-mode))
(fset 'tar-real-normal-mode (symbol-function 'normal-mode)))
(fset 'normal-mode 'tar-normal-mode)
(if (not (fboundp 'tar-real-set-auto-mode))
(fset 'tar-real-set-auto-mode (symbol-function 'set-auto-mode)))
(fset 'set-auto-mode 'tar-set-auto-mode)
Tar mode redefines set-auto-mode with different arguments
and was completely antisocial with my advice.
So, the questions are
1) Is there/Shouldn't there be a hook for catching binary files
and displaying them in a default 'binary' mode, like hexl.
2) shouldn't set-auto-mode have some sort of pre hook that
lets arbitrary hooks be tried until one of them returns true
eg 'run-hook-with-args-until-success'. Tar mode
would be a hook that intercepts files that end with .tar
-jeff
- 1 participants
- 0 comments
Re: [21.4,21.5] configure.in (have_dl): Add modules to MAKE_SUBDIR ...
22 years, 10 months
Alexey Mahotkin
Alexey Mahotkin
>>>>> "Hrvoje" == Hrvoje Niksic <hniksic(a)arsdigita.com> writes:
>> Are there any plans to turn on back caching in configure.in? Maybe it's
>> adequate to turn caching back on by default in beta and try to shake out
>> "surprises" that'll appear?
Hrvoje> I wouldn't like to deal with these surprises in a program like
Hrvoje> XEmacs. Autoconf caching is a serious pain even in a small program
Hrvoje> like Wget where I sometimes had to break its legs just so that some
Hrvoje> tests in a loop work.
Humm... Could you describe the nature of the problems? I just don't
understand how it turns out that almost no other program except XEmacs
disables autoconf caching...
--alexm
- 5 participants
- 7 comments
Re: [21.4,21.5] configure.in (have_dl): Add modules to MAKE_SUBDIR and INSTALL_ARCH_DEP_SUBDIR
22 years, 10 months
Alexey Mahotkin
Alexey Mahotkin
>>>>> "MB" == Martin Buchholz <martin(a)xemacs.org> writes:
MB> autoconf-2.50 is a major change from 2.13. Upgrading _properly_ will
MB> be a lot of work. In particular, a lot of the redefinitions in
MB> configure.in are to change the behavior of configure in a way that's no
MB> longer necessary in the new autoconf. New macros introduced in
MB> autoconf 2.50 should also be used.
Are there any plans to turn on back caching in configure.in? Maybe it's
adequate to turn caching back on by default in beta and try to shake out
"surprises" that'll appear?
It's sometimes very annoying without cache...
--alexm
- 3 participants
- 2 comments
adding to glyphs-shared.c
22 years, 10 months
William M. Perry
William M. Perry
Anybody mind this being applied to the 21.5 branch? This moves
read_bitmap_data_from_file into glyphs-shared.c. This definition is used
even if Xmu is present on the system, so everybody reads .xbm files the
same way.
This code was duplicated in xmu.c if !HAVE_XMU, glyphs-gtk.c and
glyphs-msw.c.
I'm taking the hint ben. :)
-bp
--
Ceterum censeo vi esse delendam
- 3 participants
- 7 comments
new package: old c mode
22 years, 10 months
Ben Wing
Ben Wing
this may be heretical, but recently i got completely sick of how incredibly slow
cc-mode is [and on a 700 mhz pentium iii!!!], so i ported old-c-mode, which is
still in fsf emacs. [in fact, i made the same complaints about cc-mode's
slowness to barry about 8 years ago, but it looks little has happened since then
except some perfunctory attempts like "c-recognize-knr-p" and "cc-lobotomy",
neither of which makes much difference on a big file like redisplay.c.]
please add the attached file. i use it all xemacs work and i haven't yet seen
any indentation problems -- and it just zips along. there are no autoloads, and
custom stuff is in its own group, which is not attached anywhere, so it will not
interfere with cc-mode. [you have to load it explicitly in your init file.]
--
ben
I'm sometimes slow in getting around to reading my mail, so if you
want to reach me faster, call 520-661-6661.
See http://www.666.com/ben/chronic-pain/ for the hell I've been
through.
;;; old-c-mode.el --- Old and fast mode for C code in XEmacs
;; Copyright (C) 1985, 86, 87, 92, 94, 95 Free Software Foundation, Inc.
;; Maintainer: Ben Wing <ben(a)xemacs.org>
;; Keywords: c
;; This file is part of GNU Emacs.
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;;; Commentary:
;; Ported from GNU Emacs 20.7.
;; cc-mode is dog-slow on large files, even on my 700 MHz Pentium III.
;; This version works with no problems on the XEmacs source code and is
;; very very fast.
;;; Original commentary:
;; [[A smart editing mode for C code. It knows a lot about C syntax and tries
;; to position the cursor according to C layout conventions. You can
;; change the details of the layout style with option variables. Load it
;; and do M-x describe-mode for details.]]
;;; Code:
(defgroup old-c nil
"Old C code editing commands for Emacs."
;; This group should have no parent.
;; We don't want it to be loaded except on explicit request.
:prefix "c-")
(defvar c-mode-abbrev-table nil
"Abbrev table in use in C mode.")
(define-abbrev-table 'c-mode-abbrev-table ())
(defvar c-mode-map (make-sparse-keymap)
"Keymap used in C mode.")
(define-key c-mode-map "{" 'electric-c-brace)
(define-key c-mode-map "}" 'electric-c-brace)
(define-key c-mode-map ";" 'electric-c-semi)
(define-key c-mode-map "#" 'electric-c-sharp-sign)
(define-key c-mode-map ":" 'electric-c-terminator)
(define-key c-mode-map "\e\C-h" 'mark-c-function)
(define-key c-mode-map "\e\C-q" 'indent-c-exp)
(define-key c-mode-map "\ea" 'c-beginning-of-statement)
(define-key c-mode-map "\ee" 'c-end-of-statement)
(define-key c-mode-map "\C-c\C-n" 'c-forward-conditional)
(define-key c-mode-map "\C-c\C-p" 'c-backward-conditional)
(define-key c-mode-map "\C-c\C-u" 'c-up-conditional)
(define-key c-mode-map "\t" 'c-indent-command)
(define-key c-mode-map "\C-c\C-q" 'c-indent-defun)
(define-key c-mode-map "\C-c\C-\\" 'c-backslash-region)
(define-key c-mode-map "\C-c\C-c" 'comment-region)
(autoload 'c-macro-expand "cmacexp"
"Display the result of expanding all C macros occurring in the region.
The expansion is entirely correct because it uses the C preprocessor."
t)
;;; begin stuff from cc-mode
(defun c-mode-menu (modestr)
(let ((m
'(["%_Comment Out Region" comment-region
(c-fn-region-is-active-p)]
["%_Uncomment Region"
(comment-region (region-beginning) (region-end) '(4))
(c-fn-region-is-active-p)]
["%_Fill Comment Paragraph" c-fill-paragraph t]
"---"
["%_Indent Expression" c-indent-exp
(memq (char-after) '(?\( ?\[ ?\{))]
["Indent %_Line or Region" c-indent-line-or-region t]
["U%_p Conditional" c-up-conditional t]
["B%_ackward Conditional" c-backward-conditional t]
["F%_orward Conditional" c-forward-conditional t]
["Insert Matching %_Endif" c-insert-matching-endif t]
["Bac%_kward Statement" c-beginning-of-statement t]
["Fo%_rward Statement" c-end-of-statement t]
"---"
["%_Macro Expand Region" c-macro-expand (c-fn-region-is-active-p)]
["%_Backslashify" c-backslash-region
(c-fn-region-is-active-p)]
["U%_nbackslashify"
(c-backslash-region (region-beginning) (region-end) '(4))
(c-fn-region-is-active-p)]
)))
(or (featurep 'menu-accelerator-support)
(setq m (mapcar #'(lambda (def)
(if (vectorp def)
(aset def 0 (replace-in-string (aref def 0)
"%_" "")))
def)
m)))
(cons modestr m)))
(defun c-populate-syntax-table (table)
;; Populate the syntax TABLE
;; DO NOT TRY TO SET _ (UNDERSCORE) TO WORD CLASS!
(modify-syntax-entry ?_ "_" table)
(modify-syntax-entry ?\\ "\\" table)
(modify-syntax-entry ?+ "." table)
(modify-syntax-entry ?- "." table)
(modify-syntax-entry ?= "." table)
(modify-syntax-entry ?% "." table)
(modify-syntax-entry ?< "." table)
(modify-syntax-entry ?> "." table)
(modify-syntax-entry ?& "." table)
(modify-syntax-entry ?| "." table)
(modify-syntax-entry ?\' "\"" table)
;; Set up block and line oriented comments. The new C standard
;; mandates both comment styles even in C, so since all languages
;; now require dual comments, we make this the default.
(cond
;; XEmacs 19 & 20
((memq '8-bit c-emacs-features)
(modify-syntax-entry ?/ ". 1456" table)
(modify-syntax-entry ?* ". 23" table))
;; Emacs 19 & 20
((memq '1-bit c-emacs-features)
(modify-syntax-entry ?/ ". 124b" table)
(modify-syntax-entry ?* ". 23" table))
;; incompatible
(t (error "CC Mode is incompatible with this version of Emacs"))
)
(modify-syntax-entry ?\n "> b" table)
;; Give CR the same syntax as newline, for selective-display
(modify-syntax-entry ?\^m "> b" table))
(defvar c-mode-syntax-table nil
"Syntax table used in c-mode buffers.")
(if c-mode-syntax-table
()
(setq c-mode-syntax-table (make-syntax-table))
(c-populate-syntax-table c-mode-syntax-table))
(defvar c-current-comment-prefix nil
"The current comment prefix regexp.
Set from `c-comment-prefix-regexp' at mode initialization.")
(make-variable-buffer-local 'c-current-comment-prefix)
;(defcustom-c-stylevar c-comment-prefix-regexp
(defcustom c-comment-prefix-regexp
'((pike-mode . "//+!?\\|\\**")
(other . "//+\\|\\**"))
"*Regexp to match the line prefix inside comments.
This regexp is used to recognize the fill prefix inside comments for
correct paragraph filling and other things.
If this variable is a string, it will be used in all CC Mode major
modes. It can also be an association list, to associate specific
regexps to specific major modes. The symbol for the major mode is
looked up in the association list, and its value is used as the line
prefix regexp. If it's not found, then the symbol `other' is looked
up and its value is used instead.
The regexp should match the prefix used in both C++ style line
comments and C style block comments, but it does not need to match a
block comment starter. In other words, it should at least match
\"//\" for line comments and the string in `c-block-comment-prefix',
which is sometimes inserted by CC Mode inside block comments. It
should not match any surrounding whitespace.
Note that CC Mode modifies other variables from this one at mode
initialization, so you will need to do \\[c-mode] (or whatever mode
you're currently using) if you change it in a CC Mode buffer."
:type '(radio
(regexp :tag "Regexp for all modes")
(list
:tag "Mode-specific regexps"
(set
:inline t :format "%v"
(cons :format "%v"
(const :format "C " c-mode) (regexp :format "%v"))
(cons :format "%v"
(const :format "C++ " c++-mode) (regexp :format "%v"))
(cons :format "%v"
(const :format "ObjC " objc-mode) (regexp :format "%v"))
(cons :format "%v"
(const :format "Java " java-mode) (regexp :format "%v"))
(cons :format "%v"
(const :format "IDL " idl-mode) (regexp :format "%v"))
(cons :format "%v"
(const :format "Pike " pike-mode) (regexp :format "%v")))
(cons :format " %v"
(const :format "Other " other) (regexp :format "%v"))))
:group 'old-c)
(defvar c-append-paragraph-start "$")
(make-variable-buffer-local 'c-append-paragraph-start)
(defconst c-Java-javadoc-paragraph-start
"\\(＠[a-zA-Z]+\\>\\|$\\)")
(defconst c-Pike-pikedoc-paragraph-start
"\\(＠[a-zA-Z]+\\>\\([^{]\\|$\\)\\|$\\)")
;; Regexp to append to paragraph-separate.
(defvar c-append-paragraph-separate "$")
(make-variable-buffer-local 'c-append-paragraph-separate)
(defconst c-Pike-pikedoc-paragraph-separate c-Pike-pikedoc-paragraph-start)
;;; end stuff from cc-mode
(defcustom c-indent-level 2
"*Indentation of C statements with respect to containing block."
:type 'integer
:group 'old-c)
(defcustom c-brace-imaginary-offset 0
"*Imagined indentation of a C open brace that actually follows a statement."
:type 'integer
:group 'old-c)
(defcustom c-brace-offset 0
"*Extra indentation for braces, compared with other text in same context."
:type 'integer
:group 'old-c)
(defcustom c-argdecl-indent 5
"*Indentation level of declarations of C function arguments."
:type 'integer
:group 'old-c)
(defcustom c-label-offset -2
"*Offset of C label lines and case statements relative to usual indentation."
:type 'integer
:group 'old-c)
(defcustom c-continued-statement-offset 2
"*Extra indent for lines not starting new statements."
:type 'integer
:group 'old-c)
(defcustom c-continued-brace-offset 0
"*Extra indent for substatements that start with open-braces.
This is in addition to `c-continued-statement-offset'."
:type 'integer
:group 'old-c)
(defconst c-style-alist
'(("GNU"
(c-indent-level . 2)
(c-argdecl-indent . 5)
(c-brace-offset . 0)
(c-continued-brace-offset . 0)
(c-label-offset . -2)
(c-continued-statement-offset . 2))
("K&R"
(c-indent-level . 5)
(c-argdecl-indent . 0)
(c-brace-offset . 0)
(c-continued-brace-offset . -5)
(c-label-offset . -5)
(c-continued-statement-offset . 5))
("BSD"
(c-indent-level . 4)
(c-argdecl-indent . 4)
(c-brace-offset . 0)
(c-continued-brace-offset . -4)
(c-label-offset . -4)
(c-continued-statement-offset . 4))
("C++"
(c-indent-level . 4)
(c-argdecl-indent . 0)
(c-brace-offset . 0)
(c-continued-brace-offset . -4)
(c-label-offset . -4)
(c-continued-statement-offset . 4)
(c-auto-newline . t))
("Whitesmith"
(c-indent-level . 4)
(c-argdecl-indent . 4)
(c-brace-offset . 0)
(c-continued-brace-offset . 0)
(c-label-offset . -4)
(c-continued-statement-offset . 4))))
(defcustom c-auto-newline nil
"*Non-nil means automatically newline before and after braces,
and after colons and semicolons, inserted in C code.
If you do not want a leading newline before braces then use:
(define-key c-mode-map \"{\" 'electric-c-semi)"
:type 'boolean
:group 'old-c)
(defcustom c-tab-always-indent t
"*Non-nil means TAB in C mode should always reindent the current line,
regardless of where in the line point is when the TAB command is used."
:type 'boolean
:group 'old-c)
;;; Regular expression used internally to recognize labels in switch
;;; statements.
(defconst c-switch-label-regexp "case[ \t'/(]\\|default[ \t]*:")
;; This is actually the expression for C++ mode, but it's used for C too.
(defvar c-imenu-generic-expression
(`
((nil
(,
(concat
"^" ; beginning of line is required
"\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
"\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; type specs; there can be no
"\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; more than 3 tokens, right?
"\\(" ; last type spec including */&
"[a-zA-Z0-9_:]+"
"\\([ \t]*[*&]+[ \t]*\\|[ \t]+\\)" ; either pointer/ref sign or whitespace
"\\)?" ; if there is a last type spec
"\\(" ; name; take that into the imenu entry
"[a-zA-Z0-9_:~]+" ; member function, ctor or dtor...
; (may not contain * because then
; "a::operator char*" would become "char*"!)
"\\|"
"\\([a-zA-Z0-9_:~]*::\\)?operator"
"[^a-zA-Z1-9_][^(]*" ; ...or operator
" \\)"
"[ \t]*([^)]*)[ \t\n]*[^ ;]" ; require something other than a ; after
; the (...) to avoid prototypes. Can't
; catch cases with () inside the parentheses
; surrounding the parameters
; (like "int foo(int a=bar()) {...}"
)) 6)
("Class"
(, (concat
"^" ; beginning of line is required
"\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
"class[ \t]+"
"\\([a-zA-Z0-9_]+\\)" ; this is the string we want to get
"[ \t]*[:{]"
)) 2)
;; Example of generic expression for finding prototypes, structs, unions, enums.
;; Uncomment if you want to find these too. It will be a bit slower gathering
;; the indexes.
; ("Prototypes"
; (,
; (concat
; "^" ; beginning of line is required
; "\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
; "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; type specs; there can be no
; "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; more than 3 tokens, right?
; "\\(" ; last type spec including */&
; "[a-zA-Z0-9_:]+"
; "\\([ \t]*[*&]+[ \t]*\\|[ \t]+\\)" ; either pointer/ref sign or whitespace
; "\\)?" ; if there is a last type spec
; "\\(" ; name; take that into the imenu entry
; "[a-zA-Z0-9_:~]+" ; member function, ctor or dtor...
; ; (may not contain * because then
; ; "a::operator char*" would become "char*"!)
; "\\|"
; "\\([a-zA-Z0-9_:~]*::\\)?operator"
; "[^a-zA-Z1-9_][^(]*" ; ...or operator
; " \\)"
; "[ \t]*([^)]*)[ \t\n]*;" ; require ';' after
; ; the (...) Can't
; ; catch cases with () inside the parentheses
; ; surrounding the parameters
; ; (like "int foo(int a=bar());"
; )) 6)
; ("Struct"
; (, (concat
; "^" ; beginning of line is required
; "\\(static[ \t]+\\)?" ; there may be static or const.
; "\\(const[ \t]+\\)?"
; "struct[ \t]+"
; "\\([a-zA-Z0-9_]+\\)" ; this is the string we want to get
; "[ \t]*[{]"
; )) 3)
; ("Enum"
; (, (concat
; "^" ; beginning of line is required
; "\\(static[ \t]+\\)?" ; there may be static or const.
; "\\(const[ \t]+\\)?"
; "enum[ \t]+"
; "\\([a-zA-Z0-9_]+\\)" ; this is the string we want to get
; "[ \t]*[{]"
; )) 3)
; ("Union"
; (, (concat
; "^" ; beginning of line is required
; "\\(static[ \t]+\\)?" ; there may be static or const.
; "\\(const[ \t]+\\)?"
; "union[ \t]+"
; "\\([a-zA-Z0-9_]+\\)" ; this is the string we want to get
; "[ \t]*[{]"
; )) 3)
))
"Imenu generic expression for C mode. See `imenu-generic-expression'.")
(defun c-mode ()
"Major mode for editing C code.
Expression and list commands understand all C brackets.
Tab indents for C code.
Comments are delimited with /* ... */.
Paragraphs are separated by blank lines only.
Delete converts tabs to spaces as it moves back.
\\{c-mode-map}
Variables controlling indentation style:
c-tab-always-indent
Non-nil means TAB in C mode should always reindent the current line,
regardless of where in the line point is when the TAB command is used.
c-auto-newline
Non-nil means automatically newline before and after braces,
and after colons and semicolons, inserted in C code.
c-indent-level
Indentation of C statements within surrounding block.
The surrounding block's indentation is the indentation
of the line on which the open-brace appears.
c-continued-statement-offset
Extra indentation given to a substatement, such as the
then-clause of an if or body of a while.
c-continued-brace-offset
Extra indentation given to a brace that starts a substatement.
This is in addition to c-continued-statement-offset.
c-brace-offset
Extra indentation for line if it starts with an open brace.
c-brace-imaginary-offset
An open brace following other text is treated as if it were
this far to the right of the start of its line.
c-argdecl-indent
Indentation level of declarations of C function arguments.
c-label-offset
Extra indentation for line that is a label, or case or default.
Settings for K&R and BSD indentation styles are
c-indent-level 5 8
c-continued-statement-offset 5 8
c-brace-offset -5 -8
c-argdecl-indent 0 8
c-label-offset -5 -8
Turning on C mode calls the value of the variable c-mode-hook with no args,
if that value is non-nil."
(interactive)
(kill-all-local-variables)
(use-local-map c-mode-map)
(setq major-mode 'c-mode)
(setq mode-name "C")
;;; begin stuff from cc-mode
(make-local-variable 'require-final-newline)
(make-local-variable 'parse-sexp-ignore-comments)
(make-local-variable 'indent-line-function)
(make-local-variable 'indent-region-function)
(make-local-variable 'outline-regexp)
(make-local-variable 'outline-level)
(make-local-variable 'normal-auto-fill-function)
(make-local-variable 'comment-start)
(make-local-variable 'comment-end)
(make-local-variable 'comment-column)
(make-local-variable 'comment-start-skip)
(make-local-variable 'comment-multi-line)
(make-local-variable 'paragraph-start)
(make-local-variable 'paragraph-separate)
(make-local-variable 'paragraph-ignore-fill-prefix)
(make-local-variable 'adaptive-fill-mode)
(make-local-variable 'adaptive-fill-regexp)
(make-local-variable 'imenu-generic-expression) ;set in the mode functions
; ;; X/Emacs 20 only
; (and (boundp 'comment-line-break-function)
; (progn
; (make-local-variable 'comment-line-break-function)
; (setq comment-line-break-function
; 'c-indent-new-comment-line)))
;; now set their values
(setq require-final-newline t
parse-sexp-ignore-comments t
indent-line-function 'c-indent-line
indent-region-function 'c-indent-region
outline-regexp "[^#\n\^M]"
outline-level 'c-outline-level
normal-auto-fill-function 'c-do-auto-fill
comment-column 32
comment-start-skip "/\\*+ *\\|//+ *"
comment-multi-line t)
; ;; now set the mode style based on c-default-style
; (let ((style (if (stringp c-default-style)
; c-default-style
; (or (cdr (assq major-mode c-default-style))
; (cdr (assq 'other c-default-style))
; "gnu"))))
; ;; Override style variables if `c-old-style-variable-behavior' is
; ;; set. Also override if we are using global style variables,
; ;; have already initialized a style once, and are switching to a
; ;; different style. (It's doubtful whether this is desirable, but
; ;; the whole situation with nonlocal style variables is a bit
; ;; awkward. It's at least the most compatible way with the old
; ;; style init procedure.)
; (c-set-style style (not (or c-old-style-variable-behavior
; (and (not c-style-variables-are-local-p)
; c-indentation-style
; (not (string-equal c-indentation-style
; style)))))))
;; Fix things up for paragraph recognition and filling inside
;; comments by using c-current-comment-prefix in the relevant
;; places. We use adaptive filling for this to make it possible to
;; use filladapt or some other fancy package.
(setq c-current-comment-prefix
(if (listp c-comment-prefix-regexp)
(cdr-safe (or (assoc major-mode c-comment-prefix-regexp)
(assoc 'other c-comment-prefix-regexp)))
c-comment-prefix-regexp))
(let ((comment-line-prefix
(concat "[ \t]*\\(" c-current-comment-prefix "\\)[ \t]*")))
(setq paragraph-start (concat comment-line-prefix
c-append-paragraph-start
"\\|"
page-delimiter)
paragraph-separate (concat comment-line-prefix
c-append-paragraph-separate
"\\|"
page-delimiter)
paragraph-ignore-fill-prefix t
adaptive-fill-mode t
adaptive-fill-regexp
(concat comment-line-prefix
(if adaptive-fill-regexp
(concat "\\(" adaptive-fill-regexp "\\)")
"")))
(when (boundp 'adaptive-fill-first-line-regexp)
;; XEmacs (20.x) adaptive fill mode doesn't have this.
(make-local-variable 'adaptive-fill-first-line-regexp)
(setq adaptive-fill-first-line-regexp
(concat "\\`" comment-line-prefix
;; Maybe we should incorporate the old value here,
;; but then we have to do all sorts of kludges to
;; deal with the \` and \' it probably contains.
"\\'"))))
; ;; we have to do something special for c-offsets-alist so that the
; ;; buffer local value has its own alist structure.
; (setq c-offsets-alist (copy-alist c-offsets-alist))
;; setup the comment indent variable in a Emacs version portable way
;; ignore any byte compiler warnings you might get here
(make-local-variable 'comment-indent-function)
(setq comment-indent-function 'c-comment-indent)
;; add menus to menubar
(easy-menu-add (c-mode-menu mode-name))
; ;; put auto-hungry designators onto minor-mode-alist, but only once
; (or (assq 'c-auto-hungry-string minor-mode-alist)
; (setq minor-mode-alist
; (cons '(c-auto-hungry-string c-auto-hungry-string)
; minor-mode-alist)))
;;; end stuff from cc-mode
(setq local-abbrev-table c-mode-abbrev-table)
(set-syntax-table c-mode-syntax-table)
(make-local-variable 'fill-paragraph-function)
(setq fill-paragraph-function 'c-fill-paragraph)
(setq comment-start "/* ")
(setq comment-end " */")
(make-local-variable 'imenu-generic-expression)
(setq imenu-generic-expression c-imenu-generic-expression)
(run-hooks 'c-mode-hook))
(defun c-outline-level ()
;; This so that `current-column' DTRT in otherwise-hidden text.
(let (buffer-invisibility-spec)
(save-excursion
(skip-chars-forward "\t ")
(current-column))))
;; This is used by indent-for-comment
;; to decide how much to indent a comment in C code
;; based on its context.
(defun c-comment-indent ()
(if (looking-at "^/\\*")
0 ;Existing comment at bol stays there.
(let ((opoint (point)))
(save-excursion
(beginning-of-line)
(cond ((looking-at "[ \t]*}[ \t]*\\($\\|/\\*\\)")
;; A comment following a solitary close-brace
;; should have only one space.
(search-forward "}")
(1+ (current-column)))
((or (looking-at "^#[ \t]*endif[ \t]*")
(looking-at "^#[ \t]*else[ \t]*"))
7) ;2 spaces after #endif
((progn
(goto-char opoint)
(skip-chars-backward " \t")
(and (= comment-column 0) (bolp)))
;; If comment-column is 0, and nothing but space
;; before the comment, align it at 0 rather than 1.
0)
(t
(max (1+ (current-column)) ;Else indent at comment column
comment-column))))))) ; except leave at least one space.
(defun c-fill-paragraph (&optional arg)
"Like \\[fill-paragraph] but handle C comments.
If any of the current line is a comment or within a comment,
fill the comment or the paragraph of it that point is in,
preserving the comment indentation or line-starting decorations."
(interactive "P")
(let* (comment-start-place
(first-line
;; Check for obvious entry to comment.
(save-excursion
(beginning-of-line)
(skip-chars-forward " \t\n")
(and (looking-at comment-start-skip)
(setq comment-start-place (point))))))
(if (and (eq major-mode 'c++-mode)
(save-excursion
(beginning-of-line)
(looking-at ".*//")))
(let (fill-prefix
(paragraph-start
;; Lines containing just a comment start or just an end
;; should not be filled into paragraphs they are next to.
(concat
paragraph-start
"\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$"))
(paragraph-separate
(concat
paragraph-separate
"\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$")))
(save-excursion
(beginning-of-line)
;; Move up to first line of this comment.
(while (and (not (bobp)) (looking-at "[ \t]*//"))
(forward-line -1))
(if (not (looking-at ".*//"))
(forward-line 1))
;; Find the comment start in this line.
(re-search-forward "[ \t]*//[ \t]*")
;; Set the fill-prefix to be what all lines except the first
;; should start with.
(let ((endcol (current-column)))
(skip-chars-backward " \t")
(setq fill-prefix
(concat (make-string (- (current-column) 2) ?\ )
"//"
(make-string (- endcol (current-column)) ?\ ))))
(save-restriction
;; Narrow down to just the lines of this comment.
(narrow-to-region (point)
(save-excursion
(forward-line 1)
(while (looking-at "[ \t]*//")
(forward-line 1))
(point)))
(insert fill-prefix)
(fill-paragraph arg)
(delete-region (point-min)
(+ (point-min) (length fill-prefix))))))
(if (or first-line
;; t if we enter a comment between start of function and this line.
(eq (calculate-c-indent) t)
;; t if this line contains a comment starter.
(setq first-line
(save-excursion
(beginning-of-line)
(prog1
(re-search-forward comment-start-skip
(save-excursion (end-of-line)
(point))
t)
(setq comment-start-place (point))))))
;; Inside a comment: fill one comment paragraph.
(let ((fill-prefix
;; The prefix for each line of this paragraph
;; is the appropriate part of the start of this line,
;; up to the column at which text should be indented.
(save-excursion
(beginning-of-line)
(if (looking-at "[ \t]*/\\*.*\\*/")
(progn (re-search-forward comment-start-skip)
(make-string (current-column) ?\ ))
(if first-line (forward-line 1))
(let ((line-width (progn (end-of-line) (current-column))))
(beginning-of-line)
(prog1
(buffer-substring
(point)
;; How shall we decide where the end of the
;; fill-prefix is?
;; calculate-c-indent-within-comment bases its value
;; on the indentation of previous lines; if they're
;; indented specially, it could return a column
;; that's well into the current line's text. So
;; we'll take at most that many space, tab, or *
;; characters, and use that as our fill prefix.
(let ((max-prefix-end
(progn
(move-to-column
(calculate-c-indent-within-comment t)
t)
(point))))
(beginning-of-line)
(skip-chars-forward " \t*" max-prefix-end)
;; Don't include part of comment terminator
;; in the fill-prefix.
(and (eq (following-char) ?/)
(eq (preceding-char) ?*)
(backward-char 1))
(point)))
;; If the comment is only one line followed by a blank
;; line, calling move-to-column above may have added
;; some spaces and tabs to the end of the line; the
;; fill-paragraph function will then delete it and the
;; newline following it, so we'll lose a blank line
;; when we shouldn't. So delete anything
;; move-to-column added to the end of the line. We
;; record the line width instead of the position of the
;; old line end because move-to-column might break a
;; tab into spaces, and the new characters introduced
;; there shouldn't be deleted.
;; If you can see a better way to do this, please make
;; the change. This seems very messy to me.
(delete-region (progn (move-to-column line-width)
(point))
(progn (end-of-line) (point))))))))
(paragraph-start
;; Lines containing just a comment start or just an end
;; should not be filled into paragraphs they are next to.
(concat
paragraph-start
"\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$"))
(paragraph-separate
(concat
paragraph-separate
"\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$"))
(chars-to-delete 0))
(save-restriction
;; Don't fill the comment together with the code following it.
;; So temporarily exclude everything before the comment start,
;; and everything after the line where the comment ends.
;; If comment-start-place is non-nil, the comment starter is there.
;; Otherwise, point is inside the comment.
(narrow-to-region (save-excursion
(if comment-start-place
(goto-char comment-start-place)
(search-backward "/*"))
;; Protect text before the comment start
;; by excluding it. Add spaces to bring back
;; proper indentation of that point.
(let ((column (current-column)))
(prog1 (point)
(setq chars-to-delete column)
(insert-char ?\ column))))
(save-excursion
(if comment-start-place
(goto-char (+ comment-start-place 2)))
(search-forward "*/" nil 'move)
(forward-line 1)
(point)))
(save-excursion
(goto-char (point-max))
(forward-line -1)
;; And comment terminator was on a separate line before,
;; keep it that way.
;; This also avoids another problem:
;; if the fill-prefix ends in a *, it could eat up
;; the * of the comment terminator.
(if (looking-at "[ \t]*\\*/")
(narrow-to-region (point-min) (point))))
(fill-paragraph arg)
(save-excursion
;; Delete the chars we inserted to avoid clobbering
;; the stuff before the comment start.
(goto-char (point-min))
(if (> chars-to-delete 0)
(delete-region (point) (+ (point) chars-to-delete)))
;; Find the comment ender (should be on last line of buffer,
;; given the narrowing) and don't leave it on its own line.
;; Do this with a fill command, so as to preserve sentence
;; boundaries.
(goto-char (point-max))
(forward-line -1)
(search-forward "*/" nil 'move)
(beginning-of-line)
(if (looking-at "[ \t]*\\*/")
(let ((fill-column (+ fill-column 9999)))
(forward-line -1)
(fill-region-as-paragraph (point) (point-max)))))))
;; Outside of comments: do ordinary filling.
(fill-paragraph arg)))
t))
(defun electric-c-brace (arg)
"Insert character and correct line's indentation."
(interactive "P")
(let (insertpos)
(if (and (not arg)
(eolp)
(or (save-excursion
(skip-chars-backward " \t")
(bolp))
(if c-auto-newline (progn (c-indent-line) (newline) t) nil)))
(progn
(insert last-command-char)
(c-indent-line)
(if c-auto-newline
(progn
(newline)
;; (newline) may have done auto-fill
(setq insertpos (- (point) 2))
(c-indent-line)))
(save-excursion
(if insertpos (goto-char (1+ insertpos)))
(delete-char -1))))
(if insertpos
(save-excursion
(goto-char insertpos)
(self-insert-command (prefix-numeric-value arg)))
(self-insert-command (prefix-numeric-value arg)))))
(defun electric-c-sharp-sign (arg)
"Insert character and correct line's indentation."
(interactive "P")
(if (save-excursion
(skip-chars-backward " \t")
(bolp))
(let ((c-auto-newline nil))
(electric-c-terminator arg))
(self-insert-command (prefix-numeric-value arg))))
(defun electric-c-semi (arg)
"Insert character and correct line's indentation."
(interactive "P")
(if c-auto-newline
(electric-c-terminator arg)
(self-insert-command (prefix-numeric-value arg))))
(defun electric-c-terminator (arg)
"Insert character and correct line's indentation."
(interactive "P")
(let (insertpos (end (point)))
(if (and (not arg) (eolp)
(not (save-excursion
(beginning-of-line)
(skip-chars-forward " \t")
(or (= (following-char) ?#)
;; Colon is special only after a label, or case ....
;; So quickly rule out most other uses of colon
;; and do no indentation for them.
(and (eq last-command-char ?:)
(not (looking-at c-switch-label-regexp))
(save-excursion
(skip-chars-forward "a-zA-Z0-9_$")
(skip-chars-forward " \t")
(< (point) end)))
(progn
(beginning-of-defun)
(let ((pps (parse-partial-sexp (point) end)))
(or (nth 3 pps) (nth 4 pps) (nth 5 pps))))))))
(progn
(insert last-command-char)
(c-indent-line)
(and c-auto-newline
(not (c-inside-parens-p))
(progn
(newline)
;; (newline) may have done auto-fill
(setq insertpos (- (point) 2))
(c-indent-line)))
(save-excursion
(if insertpos (goto-char (1+ insertpos)))
(delete-char -1))))
(if insertpos
(save-excursion
(goto-char insertpos)
(self-insert-command (prefix-numeric-value arg)))
(self-insert-command (prefix-numeric-value arg)))))
(defun c-inside-parens-p ()
(condition-case ()
(save-excursion
(save-restriction
(narrow-to-region (point)
(progn (beginning-of-defun) (point)))
(goto-char (point-max))
(= (char-after (or (scan-lists (point) -1 1) (point-min))) ?\()))
(error nil)))
(defun c-indent-command (&optional whole-exp)
"Indent current line as C code, or in some cases insert a tab character.
If `c-tab-always-indent' is non-nil (the default), always indent current line.
Otherwise, indent the current line only if point is at the left margin or
in the line's indentation; otherwise insert a tab.
A numeric argument, regardless of its value, means indent rigidly all the
lines of the expression starting after point so that this line becomes
properly indented. The relative indentation among the lines of the
expression are preserved."
(interactive "P")
(if whole-exp
;; If arg, always indent this line as C
;; and shift remaining lines of expression the same amount.
(let ((shift-amt (c-indent-line))
beg end)
(save-excursion
(if c-tab-always-indent
(beginning-of-line))
;; Find beginning of following line.
(save-excursion
(forward-line 1) (setq beg (point)))
;; Find first beginning-of-sexp for sexp extending past this line.
(while (< (point) beg)
(forward-sexp 1)
(setq end (point))
(skip-chars-forward " \t\n")))
(if (> end beg)
(indent-code-rigidly beg end shift-amt "#")))
(if (and (not c-tab-always-indent)
(save-excursion
(skip-chars-backward " \t")
(not (bolp))))
(insert-tab)
(c-indent-line))))
(defun c-indent-line ()
"Indent current line as C code.
Return the amount the indentation changed by."
(let ((indent (calculate-c-indent nil))
beg shift-amt
(case-fold-search nil)
(pos (- (point-max) (point))))
(beginning-of-line)
(setq beg (point))
(cond ((eq indent nil)
(setq indent (current-indentation)))
((eq indent t)
(setq indent (calculate-c-indent-within-comment)))
((looking-at "[ \t]*#")
(setq indent 0))
(t
(skip-chars-forward " \t")
(if (listp indent) (setq indent (car indent)))
(cond ((or (looking-at c-switch-label-regexp)
(and (looking-at "[A-Za-z]")
(save-excursion
(forward-sexp 1)
(looking-at ":"))))
(setq indent (max 1 (+ indent c-label-offset))))
((and (looking-at "else\\b")
(not (looking-at "else\\s_")))
(setq indent (save-excursion
(c-backward-to-start-of-if)
(current-indentation))))
((and (looking-at "}[ \t]*else\\b")
(not (looking-at "}[ \t]*else\\s_")))
(setq indent (save-excursion
(forward-char)
(backward-sexp)
(c-backward-to-start-of-if)
(current-indentation))))
((and (looking-at "while\\b")
(not (looking-at "while\\s_"))
(save-excursion
(c-backward-to-start-of-do)))
;; This is a `while' that ends a do-while.
(setq indent (save-excursion
(c-backward-to-start-of-do)
(current-indentation))))
((= (following-char) ?})
(setq indent (- indent c-indent-level)))
((= (following-char) ?{)
(setq indent (+ indent c-brace-offset))))))
(skip-chars-forward " \t")
(setq shift-amt (- indent (current-column)))
(if (zerop shift-amt)
(if (> (- (point-max) pos) (point))
(goto-char (- (point-max) pos)))
(delete-region beg (point))
(indent-to indent)
;; If initial point was within line's indentation,
;; position after the indentation. Else stay at same point in text.
(if (> (- (point-max) pos) (point))
(goto-char (- (point-max) pos))))
shift-amt))
(defun calculate-c-indent (&optional parse-start)
"Return appropriate indentation for current line as C code.
In usual case returns an integer: the column to indent to.
Returns nil if line starts inside a string, t if in a comment."
(save-excursion
(beginning-of-line)
(let ((indent-point (point))
(case-fold-search nil)
state
containing-sexp)
(if parse-start
(goto-char parse-start)
(beginning-of-defun))
(while (< (point) indent-point)
(setq parse-start (point))
(setq state (parse-partial-sexp (point) indent-point 0))
(setq containing-sexp (car (cdr state))))
(cond ((or (nth 3 state) (nth 4 state))
;; return nil or t if should not change this line
(nth 4 state))
((null containing-sexp)
;; Line is at top level. May be data or function definition,
;; or may be function argument declaration.
;; Indent like the previous top level line
;; unless that ends in a closeparen without semicolon,
;; in which case this line is the first argument decl.
(goto-char indent-point)
(skip-chars-forward " \t")
(if (= (following-char) ?{)
0 ; Unless it starts a function body
(c-backward-to-noncomment (or parse-start (point-min)))
;; Look at previous line that's at column 0
;; to determine whether we are in top-level decls
;; or function's arg decls. Set basic-indent accordingly.
(let ((basic-indent
(save-excursion
(re-search-backward "^[^ \^L\t\n#]" nil 'move)
(let (comment lim)
;; Recognize the DEFUN macro in Emacs.
(if (save-excursion
;; Move down to the (putative) argnames line.
(while (and (not (eobp))
(not (looking-at " *[({}#/]")))
(forward-line 1))
;; Go back to the DEFUN, if it is one.
(condition-case nil
(backward-sexp 1)
(error))
(beginning-of-line)
(looking-at "DEFUN\\b"))
c-argdecl-indent
(if (and (looking-at "\\sw\\|\\s_")
;; This is careful to stop at the first
;; paren if we have
;; int foo Proto ((int, int));
(looking-at "[^\"\n=(]*(")
(progn
(goto-char (1- (match-end 0)))
;; Skip any number of paren-groups.
;; Consider typedef int (*fcn) (int);
(while (= (following-char) ?\()
(setq lim (point))
(condition-case nil
(forward-sexp 1)
(error))
(skip-chars-forward " \t\f"))
;; Have we reached something
;; that shows this isn't a function
;; definition?
(and (< (point) indent-point)
(not (memq (following-char)
'(?\, ?\;)))))
;; Make sure the "function decl" we found
;; is not inside a comment.
(progn
;; Move back to the `(' starting arglist
(goto-char lim)
(beginning-of-line)
(while (and (not comment)
(search-forward "/*" lim t))
(setq comment
(not (search-forward "*/" lim t))))
(not comment)))
c-argdecl-indent 0))))))
basic-indent)))
;; ;; Now add a little if this is a continuation line.
;; (+ basic-indent (if (or (bobp)
;; (memq (preceding-char) '(?\) ?\; ?\}))
;; ;; Line with zero indentation
;; ;; is probably the return-type
;; ;; of a function definition,
;; ;; so following line is function name.
;; (= (current-indentation) 0))
;; 0 c-continued-statement-offset))
((/= (char-after containing-sexp) ?{)
;; line is expression, not statement:
;; indent to just after the surrounding open.
(goto-char (1+ containing-sexp))
(current-column))
(t
;; Statement level. Is it a continuation or a new statement?
;; Find previous non-comment character.
(goto-char indent-point)
(c-backward-to-noncomment containing-sexp)
;; Back up over label lines, since they don't
;; affect whether our line is a continuation.
(while (or (eq (preceding-char) ?\,)
(and (eq (preceding-char) ?:)
(or (eq (char-after (- (point) 2)) ?\')
(memq (char-syntax (char-after (- (point) 2)))
'(?w ?_)))))
(if (eq (preceding-char) ?\,)
(progn (forward-char -1)
(c-backward-to-start-of-continued-exp containing-sexp)))
(beginning-of-line)
(c-backward-to-noncomment containing-sexp))
;; Check for a preprocessor statement or its continuation lines.
;; Move back to end of previous non-preprocessor line,
;; or possibly beginning of buffer.
(let ((found (point)) stop)
(while (not stop)
(beginning-of-line)
(cond ((bobp)
(setq found (point)
stop t))
((save-excursion (forward-char -1)
(= (preceding-char) ?\\))
(forward-char -1))
;; This line is not preceded by a backslash.
;; So either it starts a preprocessor command
;; or any following continuation lines
;; should not be skipped.
((= (following-char) ?#)
(forward-char -1)
(setq found (point)))
(t (setq stop t))))
(goto-char found))
;; Now we get the answer.
(if (and (not (memq (preceding-char) '(0 ?\, ?\; ?\} ?\{)))
;; But don't treat a line with a close-brace
;; as a continuation. It is probably the
;; end of an enum type declaration.
(save-excursion
(goto-char indent-point)
(skip-chars-forward " \t")
(not (= (following-char) ?}))))
;; This line is continuation of preceding line's statement;
;; indent c-continued-statement-offset more than the
;; previous line of the statement.
(progn
(c-backward-to-start-of-continued-exp containing-sexp)
(+ c-continued-statement-offset (current-column)
(if (save-excursion (goto-char indent-point)
(skip-chars-forward " \t")
(eq (following-char) ?{))
c-continued-brace-offset 0)))
;; This line starts a new statement.
;; Position following last unclosed open.
(goto-char containing-sexp)
;; Is line first statement after an open-brace?
(or
;; If no, find that first statement and indent like it.
(save-excursion
(forward-char 1)
(let ((colon-line-end 0))
(while (progn (skip-chars-forward " \t\n")
(looking-at "#\\|/\\*\\|case[ \t\n'/(].*:\\|[a-zA-Z0-9_$]*:"))
;; Skip over comments and labels following openbrace.
(cond ((= (following-char) ?\#)
(forward-line 1))
((= (following-char) ?\/)
(forward-char 2)
(search-forward "*/" nil 'move))
;; case or label:
(t
(save-excursion (end-of-line)
(setq colon-line-end (point)))
(search-forward ":"))))
;; The first following code counts
;; if it is before the line we want to indent.
(and (< (point) indent-point)
(-
(if (> colon-line-end (point))
(- (current-indentation) c-label-offset)
(current-column))
;; If prev stmt starts with open-brace, that
;; open brace was offset by c-brace-offset.
;; Compensate to get the column where
;; an ordinary statement would start.
(if (= (following-char) ?\{) c-brace-offset 0)))))
;; If no previous statement,
;; indent it relative to line brace is on.
(calculate-c-indent-after-brace))))))))
(defun calculate-c-indent-after-brace ()
"Return the proper C indent for the first line after an open-brace.
This function is called with point before the brace."
;; For open brace in column zero, don't let statement
;; start there too. If c-indent-level is zero,
;; use c-brace-offset + c-continued-statement-offset instead.
;; For open-braces not the first thing in a line,
;; add in c-brace-imaginary-offset.
(+ (if (and (bolp) (zerop c-indent-level))
(+ c-brace-offset c-continued-statement-offset)
c-indent-level)
;; Move back over whitespace before the openbrace.
;; If openbrace is not first nonwhite thing on the line,
;; add the c-brace-imaginary-offset.
(progn (skip-chars-backward " \t")
(if (bolp) 0 c-brace-imaginary-offset))
;; If the openbrace is preceded by a parenthesized exp,
;; move to the beginning of that;
;; possibly a different line
(progn
(if (eq (preceding-char) ?\))
(forward-sexp -1))
;; Get initial indentation of the line we are on.
(current-indentation))))
(defun calculate-c-indent-within-comment (&optional after-star)
"Return the indentation amount for line inside a block comment.
Optional arg AFTER-STAR means, if lines in the comment have a leading star,
return the indentation of the text that would follow this star."
(let (end star-start)
(save-excursion
(beginning-of-line)
(skip-chars-forward " \t")
(setq star-start (= (following-char) ?\*))
(skip-chars-backward " \t\n")
(setq end (point))
(beginning-of-line)
(skip-chars-forward " \t")
(if after-star
(and (looking-at "\\*")
(re-search-forward "\\*[ \t]*")))
(and (re-search-forward "/\\*[ \t]*" end t)
star-start
(not after-star)
(goto-char (1+ (match-beginning 0))))
(if (and (looking-at "[ \t]*$") (= (preceding-char) ?\*))
(1+ (current-column))
(current-column)))))
(defun c-backward-to-noncomment (lim)
(let (opoint stop)
(while (not stop)
(skip-chars-backward " \t\n\f" lim)
(setq opoint (point))
(if (and (>= (point) (+ 2 lim))
(save-excursion
(forward-char -2)
(looking-at "\\*/")))
(search-backward "/*" lim 'move)
(setq stop (or (<= (point) lim)
(save-excursion
(beginning-of-line)
(skip-chars-forward " \t")
(not (looking-at "#")))))
(or stop (beginning-of-line))))))
(defun c-backward-to-start-of-continued-exp (lim)
(if (memq (preceding-char) '(?\) ?\"))
(forward-sexp -1))
(beginning-of-line)
(if (<= (point) lim)
(goto-char (1+ lim)))
(skip-chars-forward " \t"))
(defun c-backward-to-start-of-if (&optional limit)
"Move to the start of the last \"unbalanced\" `if'."
(or limit (setq limit (save-excursion (beginning-of-defun) (point))))
(let ((if-level 1)
(case-fold-search nil))
(while (and (not (bobp)) (not (zerop if-level)))
(backward-sexp 1)
(cond ((and (looking-at "else\\b")
(not (looking-at "else\\s_")))
(setq if-level (1+ if-level)))
((and (looking-at "if\\b")
(not (looking-at "if\\s_")))
(setq if-level (1- if-level)))
((< (point) limit)
(setq if-level 0)
(goto-char limit))))))
(defun c-backward-to-start-of-do (&optional limit)
"If point follows a `do' statement, move to beginning of it and return t.
Otherwise return nil and don't move point."
(or limit (setq limit (save-excursion (beginning-of-defun) (point))))
(let ((first t)
(startpos (point))
(done nil))
(while (not done)
(let ((next-start (point)))
(condition-case nil
;; Move back one token or one brace or paren group.
(backward-sexp 1)
;; If we find an open-brace, we lose.
(error (setq done 'fail)))
(if done
nil
;; If we reached a `do', we win.
(if (looking-at "do\\b")
(setq done 'succeed)
;; Otherwise, if we skipped a semicolon, we lose.
;; (Exception: we can skip one semicolon before getting
;; to a the last token of the statement, unless that token
;; is a close brace.)
(if (save-excursion
(forward-sexp 1)
(or (and (not first) (= (preceding-char) ?}))
(search-forward ";" next-start t
(if (and first
(/= (preceding-char) ?}))
2 1))))
(setq done 'fail)
(setq first nil)
;; If we go too far back in the buffer, we lose.
(if (< (point) limit)
(setq done 'fail)))))))
(if (eq done 'succeed)
t
(goto-char startpos)
nil)))
(defun c-beginning-of-statement (count)
"Go to the beginning of the innermost C statement.
With prefix arg, go back N - 1 statements. If already at the beginning of a
statement then go to the beginning of the preceding one.
If within a string or comment, or next to a comment (only whitespace between),
move by sentences instead of statements."
(interactive "p")
(let ((here (point)) state)
(save-excursion
(beginning-of-defun)
(setq state (parse-partial-sexp (point) here nil nil)))
(if (or (nth 3 state) (nth 4 state)
(looking-at (concat "[ \t]*" comment-start-skip))
(save-excursion (skip-chars-backward " \t")
(goto-char (- (point) 2))
(looking-at "\\*/")))
(forward-sentence (- count))
(while (> count 0)
(c-beginning-of-statement-1)
(setq count (1- count)))
(while (< count 0)
(c-end-of-statement-1)
(setq count (1+ count))))))
(defun c-end-of-statement (count)
"Go to the end of the innermost C statement.
With prefix arg, go forward N - 1 statements.
Move forward to end of the next statement if already at end.
If within a string or comment, move by sentences instead of statements."
(interactive "p")
(c-beginning-of-statement (- count)))
(defun c-beginning-of-statement-1 ()
(let ((last-begin (point))
(first t))
(condition-case ()
(progn
(while (and (not (bobp))
(progn
(backward-sexp 1)
(or first
(not (re-search-forward "[;{}]" last-begin t)))))
(setq last-begin (point) first nil))
(goto-char last-begin))
(error (if first (backward-up-list 1) (goto-char last-begin))))))
(defun c-end-of-statement-1 ()
(condition-case ()
(progn
(while (and (not (eobp))
(let ((beg (point)))
(forward-sexp 1)
(let ((end (point)))
(save-excursion
(goto-char beg)
(not (re-search-forward "[;{}]" end t)))))))
(re-search-backward "[;}]")
(forward-char 1))
(error
(let ((beg (point)))
(backward-up-list -1)
(let ((end (point)))
(goto-char beg)
(search-forward ";" end 'move))))))
(defun mark-c-function ()
"Put mark at end of C function, point at beginning."
(interactive)
(push-mark (point))
(end-of-defun)
(push-mark (point) nil t)
(beginning-of-defun)
(backward-paragraph))
;; Idea of ENDPOS is, indent each line, stopping when
;; ENDPOS is encountered. But it's too much of a pain to make that work.
(defun indent-c-exp (&optional endpos)
"Indent each line of the C grouping following point."
(interactive)
(let* ((indent-stack (list nil))
(opoint (point)) ;; May be altered below.
(contain-stack
(list (if endpos
(let (funbeg)
;; Find previous fcn-start.
(save-excursion (forward-char 1)
(beginning-of-defun)
(setq funbeg (point)))
(setq opoint funbeg)
;; Try to find containing open,
;; but don't scan past that fcn-start.
(save-restriction
(narrow-to-region funbeg (point))
(condition-case nil
(save-excursion
(backward-up-list 1)
(point))
;; We gave up: must be between fcns.
;; Set opoint to beg of prev fcn
;; since otherwise calculate-c-indent
;; will get wrong answers.
(error (setq opoint funbeg)
(point)))))
(point))))
(case-fold-search nil)
restart outer-loop-done inner-loop-done state ostate
this-indent last-sexp
at-else at-brace at-while
last-depth this-point
(next-depth 0))
;; If the braces don't match, get an error right away.
(save-excursion
(forward-sexp 1))
;; Realign the comment on the first line, even though we don't reindent it.
(save-excursion
(let ((beg (point)))
(and (re-search-forward
comment-start-skip
(save-excursion (end-of-line) (point)) t)
;; Make sure this isn't a comment alone on a line
;; (which should be indented like code instead).
(save-excursion
(goto-char (match-beginning 0))
(skip-chars-backward " \t")
(not (bolp)))
;; Make sure the comment starter we found
;; is not actually in a string or quoted.
(let ((new-state
(parse-partial-sexp beg (point)
nil nil state)))
(and (not (nth 3 new-state)) (not (nth 5 new-state))))
(progn (indent-for-comment) (beginning-of-line)))))
(save-excursion
(setq outer-loop-done nil)
(while (and (not (eobp))
(if endpos (< (point) endpos)
(not outer-loop-done)))
(setq last-depth next-depth)
;; Compute how depth changes over this line
;; plus enough other lines to get to one that
;; does not end inside a comment or string.
;; Meanwhile, do appropriate indentation on comment lines.
(setq inner-loop-done nil)
(while (and (not inner-loop-done)
(not (and (eobp) (setq outer-loop-done t))))
(setq ostate state)
(setq state (parse-partial-sexp (point) (progn (end-of-line) (point))
nil nil state))
(setq next-depth (car state))
(if (and (car (cdr (cdr state)))
(>= (car (cdr (cdr state))) 0))
(setq last-sexp (car (cdr (cdr state)))))
;; If this line started within a comment, indent it as such.
(if (or (nth 4 ostate) (nth 7 ostate))
(c-indent-line))
;; If it ends outside of comments or strings, exit the inner loop.
;; Otherwise move on to next line.
(if (or (nth 3 state) (nth 4 state) (nth 7 state))
(forward-line 1)
(setq inner-loop-done t)))
(and endpos
(while (< next-depth 0)
(setq indent-stack (append indent-stack (list nil)))
(setq contain-stack (append contain-stack (list nil)))
(setq next-depth (1+ next-depth))
(setq last-depth (1+ last-depth))
(setcar (nthcdr 6 state) (1+ (nth 6 state)))))
(setq outer-loop-done (and (not endpos) (<= next-depth 0)))
(if outer-loop-done
nil
;; If this line had ..))) (((.. in it, pop out of the levels
;; that ended anywhere in this line, even if the final depth
;; doesn't indicate that they ended.
(while (> last-depth (nth 6 state))
(setq indent-stack (cdr indent-stack)
contain-stack (cdr contain-stack)
last-depth (1- last-depth)))
(if (/= last-depth next-depth)
(setq last-sexp nil))
;; Add levels for any parens that were started in this line.
(while (< last-depth next-depth)
(setq indent-stack (cons nil indent-stack)
contain-stack (cons nil contain-stack)
last-depth (1+ last-depth)))
(if (null (car contain-stack))
(setcar contain-stack (or (car (cdr state))
(save-excursion (forward-sexp -1)
(point)))))
(forward-line 1)
(skip-chars-forward " \t")
;; Don't really reindent if the line is just whitespace,
;; or if it is past the endpos.
;; (The exit test in the outer while
;; does not exit until we have passed the first line
;; past the region.)
(if (or (eolp) (and endpos (>= (point) endpos)))
nil
;; Is this line in a new nesting level?
;; In other words, is this the first line that
;; starts in the new level?
(if (and (car indent-stack)
(>= (car indent-stack) 0))
nil
;; Yes.
;; Compute the standard indent for this level.
(let (val)
(if (= (char-after (car contain-stack)) ?{)
(save-excursion
(goto-char (car contain-stack))
(setq val (calculate-c-indent-after-brace)))
(setq val (calculate-c-indent
(if (car indent-stack)
(- (car indent-stack))
opoint))))
;; t means we are in a block comment and should
;; calculate accordingly.
(if (eq val t)
(setq val (calculate-c-indent-within-comment)))
(setcar indent-stack val)))
;; Adjust indent of this individual line
;; based on its predecessor.
;; Handle continuation lines, if, else, while, and so on.
(if (/= (char-after (car contain-stack)) ?{)
(setq this-indent (car indent-stack))
;; Line is at statement level.
;; Is it a new statement? Is it an else?
;; Find last non-comment character before this line
(save-excursion
(setq this-point (point))
(setq at-else (and (looking-at "else\\b")
(not (looking-at "else\\s_"))))
(setq at-brace (= (following-char) ?{))
(setq at-while (and (looking-at "while\\b")
(not (looking-at "while\\s_"))))
(if (= (following-char) ?})
(setq this-indent (car indent-stack))
(c-backward-to-noncomment opoint)
(if (not (memq (preceding-char) '(0 ?\, ?\; ?} ?: ?{)))
;; Preceding line did not end in comma or semi;
;; indent this line c-continued-statement-offset
;; more than previous.
(progn
(c-backward-to-start-of-continued-exp (car contain-stack))
(setq this-indent
(+ c-continued-statement-offset (current-column)
(if at-brace c-continued-brace-offset 0))))
;; Preceding line ended in comma or semi;
;; use the standard indent for this level.
(cond (at-else (progn (c-backward-to-start-of-if opoint)
(setq this-indent
(current-indentation))))
((and at-while (c-backward-to-start-of-do opoint))
(setq this-indent (current-indentation)))
((eq (preceding-char) ?\,)
(goto-char this-point)
(setq this-indent (calculate-c-indent)))
(t (setq this-indent (car indent-stack))))))))
;; Adjust line indentation according to its contents
(if (or (looking-at c-switch-label-regexp)
(and (looking-at "[A-Za-z]")
(save-excursion
(forward-sexp 1)
(looking-at ":"))))
(setq this-indent (max 1 (+ this-indent c-label-offset))))
(if (= (following-char) ?})
(setq this-indent (- this-indent c-indent-level)))
(if (= (following-char) ?{)
;; Don't move an open-brace in column 0.
;; This is good when constructs such as
;; `extern "C" {' surround a function definition
;; that should be indented as usual.
;; It is also good for nested functions.
;; It is bad when an open-brace is indented at column 0
;; and you want to fix that, but we can't win 'em all.
(if (zerop (current-column))
(setq this-indent 0)
(setq this-indent (+ this-indent c-brace-offset))))
;; Don't leave indentation in empty lines.
(if (eolp) (setq this-indent 0))
;; Put chosen indentation into effect.
(or (= (current-column) this-indent)
(= (following-char) ?\#)
(progn
(delete-region (point) (progn (beginning-of-line) (point)))
(indent-to this-indent)))
;; Indent any comment following the text.
(or (looking-at comment-start-skip)
(save-excursion
(let ((beg (point)))
(and (re-search-forward
comment-start-skip
(save-excursion (end-of-line) (point)) t)
;; Make sure the comment starter we found
;; is not actually in a string or quoted.
(let ((new-state
(parse-partial-sexp beg (point)
nil nil state)))
(and (not (nth 3 new-state)) (not (nth 5 new-state))))
(indent-for-comment)))))))))))
;; Look at all comment-start strings in the current line after point.
;; Return t if one of them starts a real comment.
;; This is not used yet, because indent-for-comment
;; isn't smart enough to handle the cases this can find.
(defun indent-c-find-real-comment ()
(let (win)
(while (and (not win)
(re-search-forward comment-start-skip
(save-excursion (end-of-line) (point))
t))
;; Make sure the comment start is not quoted.
(let ((state-1
(parse-partial-sexp
(save-excursion (beginning-of-line) (point))
(point) nil nil state)))
(setq win (and (null (nth 3 state-1)) (null (nth 5 state-1))))))
win))
;; Indent every line whose first char is between START and END inclusive.
(defun c-indent-region (start end)
(save-excursion
(goto-char start)
;; Advance to first nonblank line.
(skip-chars-forward " \t\n")
(beginning-of-line)
(let ((endmark (copy-marker end))
(c-tab-always-indent t))
(while (and (bolp) (not (eobp)) (< (point) endmark))
;; Indent one line as with TAB.
(let ((shift-amt (c-indent-line))
nextline sexpbeg sexpend)
(if (save-excursion (beginning-of-line) (looking-at "[ \t]*#"))
(forward-line 1)
(save-excursion
;; Find beginning of following line.
(save-excursion
(forward-line 1) (setq nextline (point)))
;; Find first beginning-of-sexp for sexp extending past this line.
(beginning-of-line)
(while (< (point) nextline)
(condition-case nil
(progn
(forward-sexp 1)
(setq sexpend (point-marker)))
(error (setq sexpend nil)
(goto-char nextline)))
(skip-chars-forward " \t\n"))
(if sexpend
(progn
;; Make sure the sexp we found really starts on the
;; current line and extends past it.
(goto-char sexpend)
(backward-sexp 1)
(setq sexpbeg (point)))))
;; If that sexp ends within the region,
;; indent it all at once, fast.
(if (and sexpend (> sexpend nextline) (<= sexpend endmark)
(< sexpbeg nextline))
(progn
(indent-c-exp)
(goto-char sexpend)))
;; Move to following line and try again.
(and sexpend (set-marker sexpend nil))
(forward-line 1))))
(set-marker endmark nil))))
(defun set-c-style (style &optional global)
"Set C-mode variables to use one of several different indentation styles.
The arguments are a string representing the desired style
and a flag which, if non-nil, means to set the style globally.
\(Interactively, the flag comes from the prefix argument.)
Available styles are GNU, K&R, BSD and Whitesmith."
(interactive (list (let ((completion-ignore-case t))
(completing-read "Use which C indentation style? "
c-style-alist nil t))
current-prefix-arg))
(let ((vars (cdr (assoc style c-style-alist))))
(or vars
(error "Invalid C indentation style `%s'" style))
(while vars
(or global
(make-local-variable (car (car vars))))
(set (car (car vars)) (cdr (car vars)))
(setq vars (cdr vars)))))
;;; This page handles insertion and removal of backslashes for C macros.
(defcustom c-backslash-column 48
"*Minimum column for end-of-line backslashes of macro definitions."
:type 'integer
:group 'old-c)
(defun c-backslash-region (from to delete-flag)
"Insert, align, or delete end-of-line backslashes on the lines in the region.
With no argument, inserts backslashes and aligns existing backslashes.
With an argument, deletes the backslashes.
This function does not modify the last line of the region if the region ends
right at the start of the following line; it does not modify blank lines
at the start of the region. So you can put the region around an entire macro
definition and conveniently use this command."
(interactive "r\nP")
(save-excursion
(goto-char from)
(let ((column c-backslash-column)
(endmark (make-marker)))
(move-marker endmark to)
;; Compute the smallest column number past the ends of all the lines.
(if (not delete-flag)
(while (< (point) to)
(end-of-line)
(if (= (preceding-char) ?\\)
(progn (forward-char -1)
(skip-chars-backward " \t")))
(setq column (max column (1+ (current-column))))
(forward-line 1)))
;; Adjust upward to a tab column, if that doesn't push past the margin.
(if (> (% column tab-width) 0)
(let ((adjusted (* (/ (+ column tab-width -1) tab-width) tab-width)))
(if (< adjusted (window-width))
(setq column adjusted))))
;; Don't modify blank lines at start of region.
(goto-char from)
(while (and (< (point) endmark) (eolp))
(forward-line 1))
;; Add or remove backslashes on all the lines.
(while (and (< (point) endmark)
;; Don't backslashify the last line
;; if the region ends right at the start of the next line.
(save-excursion
(forward-line 1)
(< (point) endmark)))
(if (not delete-flag)
(c-append-backslash column)
(c-delete-backslash))
(forward-line 1))
(move-marker endmark nil))))
(defun c-append-backslash (column)
(end-of-line)
;; Note that "\\\\" is needed to get one backslash.
(if (= (preceding-char) ?\\)
(progn (forward-char -1)
(delete-horizontal-space)
(indent-to column))
(indent-to column)
(insert "\\")))
(defun c-delete-backslash ()
(end-of-line)
(or (bolp)
(progn
(forward-char -1)
(if (looking-at "\\\\")
(delete-region (1+ (point))
(progn (skip-chars-backward " \t") (point)))))))
(defun c-up-conditional (count)
"Move back to the containing preprocessor conditional, leaving mark behind.
A prefix argument acts as a repeat count. With a negative argument,
move forward to the end of the containing preprocessor conditional.
When going backwards, `#elif' is treated like `#else' followed by `#if'.
When going forwards, `#elif' is ignored."
(interactive "p")
(c-forward-conditional (- count) t))
(defun c-backward-conditional (count &optional up-flag)
"Move back across a preprocessor conditional, leaving mark behind.
A prefix argument acts as a repeat count. With a negative argument,
move forward across a preprocessor conditional."
(interactive "p")
(c-forward-conditional (- count) up-flag))
(defun c-forward-conditional (count &optional up-flag)
"Move forward across a preprocessor conditional, leaving mark behind.
A prefix argument acts as a repeat count. With a negative argument,
move backward across a preprocessor conditional."
(interactive "p")
(let* ((forward (> count 0))
(increment (if forward -1 1))
(search-function (if forward 're-search-forward 're-search-backward))
(opoint (point))
(new))
(save-excursion
(while (/= count 0)
(let ((depth (if up-flag 0 -1)) found)
(save-excursion
;; Find the "next" significant line in the proper direction.
(while (and (not found)
;; Rather than searching for a # sign that comes
;; at the beginning of a line aside from whitespace,
;; search first for a string starting with # sign.
;; Then verify what precedes it.
;; This is faster on account of the fastmap feature of
;; the regexp matcher.
(funcall search-function
"#[ \t]*\\(if\\|elif\\|endif\\)"
nil t))
(beginning-of-line)
;; Now verify it is really a preproc line.
(if (looking-at "^[ \t]*#[ \t]*\\(if\\|elif\\|endif\\)")
(let ((prev depth))
;; Update depth according to what we found.
(beginning-of-line)
(cond ((looking-at "[ \t]*#[ \t]*endif")
(setq depth (+ depth increment)))
((looking-at "[ \t]*#[ \t]*elif")
(if (and forward (= depth 0))
(setq found (point))))
(t (setq depth (- depth increment))))
;; If we are trying to move across, and we find
;; an end before we find a beginning, get an error.
(if (and (< prev 0) (< depth prev))
(error (if forward
"No following conditional at this level"
"No previous conditional at this level")))
;; When searching forward, start from next line
;; so that we don't find the same line again.
(if forward (forward-line 1))
;; If this line exits a level of conditional, exit inner loop.
(if (< depth 0)
(setq found (point))))
;; If the line is not really a conditional, skip past it.
(if forward (end-of-line)))))
(or found
(error "No containing preprocessor conditional"))
(goto-char (setq new found)))
(setq count (+ count increment))))
(push-mark)
(goto-char new)))
;;; begin stuff from cc-mode
(defsubst c-region-is-active-p ()
;; Return t when the region is active. The determination of region
;; activeness is different in both Emacs and XEmacs.
(cond
;; XEmacs
((and (fboundp 'region-active-p)
(boundp 'zmacs-regions)
zmacs-regions)
(region-active-p))
;; Emacs
((boundp 'mark-active) mark-active)
;; fallback; shouldn't get here
(t (mark t))))
(defun c-fn-region-is-active-p ()
;; Function version of the macro for use in places that aren't
;; compiled, e.g. in the menus.
(c-region-is-active-p))
(defun c-indent-line-or-region ()
"When the region is active, indent it. Otherwise indent the current line."
;; Emacs has a variable called mark-active, XEmacs uses region-active-p
(interactive)
(if (c-region-is-active-p)
(c-indent-region (region-beginning) (region-end))
(indent-according-to-mode)))
(defmacro c-point (position &optional point)
;; Returns the value of certain commonly referenced POSITIONs
;; relative to POINT. The current point is used if POINT isn't
;; specified. POSITION can be one of the following symbols:
;;
;; bol -- beginning of line
;; eol -- end of line
;; bod -- beginning of defun
;; eod -- end of defun
;; boi -- back to indentation
;; ionl -- indentation of next line
;; iopl -- indentation of previous line
;; bonl -- beginning of next line
;; bopl -- beginning of previous line
;;
;; This function does not modify point or mark.
`(save-excursion
,(if point `(goto-char ,point))
,(if (and (eq (car-safe position) 'quote)
(symbolp (eval position)))
(let ((position (eval position)))
(cond
((eq position 'bol) `(beginning-of-line))
((eq position 'eol) `(end-of-line))
((eq position 'boi) `(back-to-indentation))
((eq position 'bonl) `(forward-line 1))
((eq position 'bopl) `(forward-line -1))
((eq position 'bod) `(c-beginning-of-defun-1))
((eq position 'eod) `(c-end-of-defun-1))
((eq position 'iopl) `(progn
(forward-line -1)
(back-to-indentation)))
((eq position 'ionl) `(progn
(forward-line 1)
(back-to-indentation)))
(t (error "unknown buffer position requested: %s" position))))
;;(message "c-point long expansion")
`(let ((position ,position))
(cond
((eq position 'bol) (beginning-of-line))
((eq position 'eol) (end-of-line))
((eq position 'boi) (back-to-indentation))
((eq position 'bonl) (forward-line 1))
((eq position 'bopl) (forward-line -1))
((eq position 'bod) (c-beginning-of-defun-1))
((eq position 'eod) (c-end-of-defun-1))
((eq position 'iopl) (progn
(forward-line -1)
(back-to-indentation)))
((eq position 'ionl) (progn
(forward-line 1)
(back-to-indentation)))
(t (error "unknown buffer position requested: %s" position)))))
(point)))
(defmacro c-safe (&rest body)
;; safely execute BODY, return nil if an error occurred
`(condition-case nil
(progn ,＠body)
(error nil)))
(defmacro c-forward-sexp (&optional arg)
;; like forward-sexp except
;; 1. this is much stripped down from the XEmacs version
;; 2. this cannot be used as a command, so we're insulated from
;; XEmacs' losing efforts to make forward-sexp more user
;; friendly
;; 3. Preserves the semantics most of CC Mode is based on
(or arg (setq arg 1))
`(goto-char (or (scan-sexps (point) ,arg)
,(if (numberp arg)
(if (> arg 0) `(point-max) `(point-min))
`(if (> ,arg 0) (point-max) (point-min))))))
(defmacro c-backward-sexp (&optional arg)
;; See c-forward-sexp and reverse directions
(or arg (setq arg 1))
`(c-forward-sexp ,(if (numberp arg) (- arg) `(- ,arg))))
(defun c-indent-exp (&optional shutup-p)
"Indent each line in the balanced expression following point syntactically.
If optional SHUTUP-P is non-nil, no errors are signalled if no
balanced expression is found."
(interactive "*P")
(let ((here (point-marker))
end)
(set-marker-insertion-type here t)
(unwind-protect
(let ((start (progn
;; try to be smarter about finding the range of
;; lines to indent. skip all following
;; whitespace, then try to find any
;; opening paren on the current line
(skip-chars-forward " \t\n")
(save-restriction
(narrow-to-region (point-min) (c-point 'eol))
(c-safe (1- (scan-lists (point) 1 -1)))))))
;; find balanced expression end
(setq end (and (c-safe (progn (c-forward-sexp 1) t))
(point)))
;; sanity check
(if (not start)
(unless shutup-p
(error "Cannot find start of balanced expression to indent"))
(if (not end)
(unless shutup-p
(error "Cannot find end of balanced expression to indent"))
(c-indent-region start end))))
(goto-char here)
(set-marker here nil))))
(defun c-insert-matching-endif ()
"Insert a #endif expression matching the corresponding #if... statement.
This skips across any number of intervening #if/#endif pairs to find the
matching #if/#ifdef/#ifndef statement and inserts a #endif with a comment
corresponding to the expression following the #if. If the statement is
a #ifndef, the word \"not\" appears in the comment. If there are spaces
between the '#' and the 'if', the same number of spaces appear in the
#endif. Comments following the #if statement are ignored and do not appear
in the #endif comment."
(interactive)
(let (spaces expr notp)
(save-excursion
(c-up-conditional 1)
;; we have to construct the regexps carefully to avoid running into
;; problems due to the greedy operators. XEmacs has non-greedy
;; operators, which would simplify matters, but they're not present
;; in GNU Emacs.
(or (looking-at "#\\( *\\)if\\(n?\\)[a-z]*\\(.*[^ \t\n]\\)[ \t]*/[*/].*")
(looking-at "#\\( *\\)if\\(n?\\)[a-z]*\\(.*[^ \t\n]\\)")
(error "Malformed #if... expression"))
(setq spaces (match-string 1))
(setq notp (> (match-end 2) (match-beginning 2)))
(setq expr (match-string 3)))
(insert "#" spaces "endif /*" (if notp " not" "") expr " */\n")))
;;; end stuff from cc-mode
(provide 'c-mode)
;;; old-c-mode.el ends here
- 5 participants
- 4 comments
shell-mode input history on windows
22 years, 10 months
Jeff Mincy
Jeff Mincy
Running on windows 98 (with cygwin), The input ring is set
incorrectly when I run bash.
My shell command is set to "c:/Cygwin/bin/bash.exe"
So, shell-mode generates "bash.exe" as the shell when it does
(file-name-nondirectory (process-command ... ))
This causes the (string-equal shell "bash") test to fail.
(defun shell-mode ()
...
;; shell-dependent assignments.
(let ((shell (file-name-nondirectory (car
(process-command (get-buffer-process (current-buffer)))))))
(setq comint-input-ring-file-name
(or (getenv "HISTFILE")
(cond ((string-equal shell "bash") "~/.bash_history")
((string-equal shell "ksh") "~/.sh_history")
(t "~/.history"))))
...
))
So, I would suggest stripping the extension on windows with
file-name-sans-extension.
(if (eq system-type 'windows-nt)
(setq shell (file-name-sans-extension shell)))
If you like this I can submit a patch.
-jeff
- 2 participants
- 1 comments