diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-01 17:41:03 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-01 17:41:03 -0500 |
| commit | 860273101ff18c97d8d1e88e3946f113d549dfa8 (patch) | |
| tree | 68ad46b1fc7986b831c96e80c064c357441e6e52 | |
| parent | 993934f4cbf8880dfb4906bec8a84a4f3ed380ac (diff) | |
| parent | ad1e46203b2355af86d183c2d89a39a3ee29c72b (diff) | |
| download | gem5-860273101ff18c97d8d1e88e3946f113d549dfa8.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch
--HG--
extra : convert_revision : f2339d64cc63709e32c06892f4eabb40a806095e
| -rw-r--r-- | util/emacs/m5-c-style.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/emacs/m5-c-style.el b/util/emacs/m5-c-style.el index b9d16a4b1..9578e3dbe 100644 --- a/util/emacs/m5-c-style.el +++ b/util/emacs/m5-c-style.el @@ -1,4 +1,4 @@ -; Copyright (c) 2003-2004 The Regents of The University of Michigan +; Copyright (c) 2003-2004, 2006 The Regents of The University of Michigan ; All rights reserved. ; ; Redistribution and use in source and binary forms, with or without @@ -29,6 +29,7 @@ (c-add-style "m5" '((c-basic-offset . 4) + (indent-tabs-mode . nil) (c-offsets-alist . ((substatement-open . 0) (inline-open . 0) (block-open . -4) |