Mercurial > emacs
diff lisp/progmodes/cc-vars.el @ 90743:f83d17e1ace6
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 615-621)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 197-199)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 30 Jan 2007 22:22:43 +0000 |
parents | 95d0cdf160ea befb5e26b9e7 |
children | 4ef881a120fe |
line wrap: on
line diff
--- a/lisp/progmodes/cc-vars.el Tue Jan 30 07:44:44 2007 +0000 +++ b/lisp/progmodes/cc-vars.el Tue Jan 30 22:22:43 2007 +0000 @@ -1168,7 +1168,7 @@ If OFFSET is a symbol with a value binding then that value, which must be an integer, is used as relative offset. - If OFFSET is a vector then it's first element, which must be an + If OFFSET is a vector then its first element, which must be an integer, is used as an absolute indentation column. This overrides the previous base indentation and the relative offsets applied to it, and it becomes the new base indentation.