summaryrefslogtreecommitdiff
path: root/util/emacs/m5-c-style.el
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2004-05-11 01:15:18 -0400
committerLisa Hsu <hsul@eecs.umich.edu>2004-05-11 01:15:18 -0400
commita5f90eba3bd2d96c6733a6ac9e8d03a9297fae6a (patch)
tree06662aecdd919aa0bafb0562fc646465dda5a901 /util/emacs/m5-c-style.el
parent3c7071a6be21fc0c87753758fc09ff28890edc99 (diff)
parent2cc4fd87eb643c81d37954cbf4a226e78ebd34bc (diff)
downloadgem5-a5f90eba3bd2d96c6733a6ac9e8d03a9297fae6a.tar.xz
first pass at merging m5 with linux
--HG-- extra : convert_revision : dfe23349b80ae3b34d3cb95c5734e01ef62f700e
Diffstat (limited to 'util/emacs/m5-c-style.el')
-rw-r--r--util/emacs/m5-c-style.el21
1 files changed, 11 insertions, 10 deletions
diff --git a/util/emacs/m5-c-style.el b/util/emacs/m5-c-style.el
index 7f25e9f5f..b9d16a4b1 100644
--- a/util/emacs/m5-c-style.el
+++ b/util/emacs/m5-c-style.el
@@ -1,4 +1,4 @@
-; Copyright (c) 2003 The Regents of The University of Michigan
+; Copyright (c) 2003-2004 The Regents of The University of Michigan
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
@@ -28,12 +28,13 @@
; Steve Reinhardt
(c-add-style "m5"
- '((c-basic-offset . 4)
- (c-offsets-alist . ((substatement-open . 0)
- (inline-open . 0)
- (block-open . -4)
- (case-label . 2)
- (label . 2)
- (statement-case-intro . 2)
- (statement-case-open . 2)
- (access-label . -2)))))
+ '((c-basic-offset . 4)
+ (c-offsets-alist . ((substatement-open . 0)
+ (inline-open . 0)
+ (block-open . -4)
+ (case-label . 2)
+ (label . 2)
+ (statement-case-intro . 2)
+ (statement-case-open . 2)
+ (access-label . -2)
+ (innamespace . 0)))))