diff options
| author | Miles Bader | 2006-08-16 14:08:49 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-08-16 14:08:49 +0000 |
| commit | de20e0ccdb039a2ac27e5bbd3e06ab70c4e7bb65 (patch) | |
| tree | 80243ce02b52cbf7945c614bd213dd63142b861a /lisp/cus-start.el | |
| parent | 7a5c2a42040b12b037940a067aee6ac6fde01680 (diff) | |
| parent | 5ebdc2990a95cc38b21f772eea4de3ceee149e54 (diff) | |
| download | emacs-de20e0ccdb039a2ac27e5bbd3e06ab70c4e7bb65.tar.gz emacs-de20e0ccdb039a2ac27e5bbd3e06ab70c4e7bb65.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 382-398)
- Update from CVS
- Update from erc--emacs--22
- Fix ERC bug introduced in last patch
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 123-125)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-101
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index e35a75da598..2fce89c73c2 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el | |||
| @@ -178,7 +178,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of | |||
| 178 | ;; fringe.c | 178 | ;; fringe.c |
| 179 | (overflow-newline-into-fringe fringe boolean) | 179 | (overflow-newline-into-fringe fringe boolean) |
| 180 | ;; indent.c | 180 | ;; indent.c |
| 181 | (indent-tabs-mode fill boolean) | 181 | (indent-tabs-mode indent boolean) |
| 182 | ;; keyboard.c | 182 | ;; keyboard.c |
| 183 | (meta-prefix-char keyboard character) | 183 | (meta-prefix-char keyboard character) |
| 184 | (auto-save-interval auto-save integer) | 184 | (auto-save-interval auto-save integer) |