diff options
| author | Miles Bader | 2007-07-15 02:05:20 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-15 02:05:20 +0000 |
| commit | 7eb1e4534e88a32fe5e549e630fdabf3e062be2b (patch) | |
| tree | 34fc72789f1cfbfeb067cf507f8871c322df300a /src/buffer.c | |
| parent | 76d11d2cf9623e9f4c38e8239c4444ffc1fae485 (diff) | |
| parent | 6f8a87c027ebd6f9cfdac5c0df97d651227bec62 (diff) | |
| download | emacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.tar.gz emacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 803-813)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 51-58)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-236)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c index dee7b04190a..c74a6cbc2a5 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5682,8 +5682,8 @@ Backing up is done before the first time the file is saved. */); | |||
| 5682 | DEFVAR_PER_BUFFER ("selective-display", ¤t_buffer->selective_display, | 5682 | DEFVAR_PER_BUFFER ("selective-display", ¤t_buffer->selective_display, |
| 5683 | Qnil, | 5683 | Qnil, |
| 5684 | doc: /* Non-nil enables selective display. | 5684 | doc: /* Non-nil enables selective display. |
| 5685 | An Integer N as value means display only lines | 5685 | An integer N as value means display only lines |
| 5686 | that start with less than n columns of space. | 5686 | that start with less than N columns of space. |
| 5687 | A value of t means that the character ^M makes itself and | 5687 | A value of t means that the character ^M makes itself and |
| 5688 | all the rest of the line invisible; also, when saving the buffer | 5688 | all the rest of the line invisible; also, when saving the buffer |
| 5689 | in a file, save the ^M as a newline. */); | 5689 | in a file, save the ^M as a newline. */); |