diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-02 02:34:44 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-02 02:34:44 +0000 |
| commit | e35ae98e41ee3c7b511aa351455683aff26fc3cd (patch) | |
| tree | 6be4accc54e7156820a590566adfff4d12af17cc /lisp/progmodes/cc-styles.el | |
| parent | c24fa7dcae432696df74d2fa537e233bcbeeeb92 (diff) | |
| parent | e19bc9c426237617960d9b6a4ab1f776bdf09ec3 (diff) | |
| download | emacs-e35ae98e41ee3c7b511aa351455683aff26fc3cd.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 583-585)
- Update from CVS
- Fix admin/quick-install-emacs to work with recent versions of autoconf
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-160
Diffstat (limited to 'lisp/progmodes/cc-styles.el')
| -rw-r--r-- | lisp/progmodes/cc-styles.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el index 81048d52072..98bc4e1f801 100644 --- a/lisp/progmodes/cc-styles.el +++ b/lisp/progmodes/cc-styles.el @@ -68,7 +68,10 @@ (arglist-intro . c-lineup-arglist-intro-after-paren) (arglist-close . c-lineup-arglist) (inline-open . 0) - (brace-list-open . +))) + (brace-list-open . +) + (topmost-intro-cont + . (first c-lineup-topmost-intro-cont + c-lineup-gnu-DEFUN-intro-cont)))) (c-special-indent-hook . c-gnu-impose-minimum) (c-block-comment-prefix . "")) |