[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/buffer.c,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/buffer.c,v |
Date: |
Tue, 24 Jun 2008 17:56:15 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/06/24 17:56:14
Index: buffer.c
===================================================================
RCS file: /sources/emacs/emacs/src/buffer.c,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -b -r1.562 -r1.563
--- buffer.c 11 Jun 2008 16:25:03 -0000 1.562
+++ buffer.c 24 Jun 2008 17:56:14 -0000 1.563
@@ -5139,6 +5139,7 @@
XSETFASTINT (buffer_defaults.tab_width, 8);
buffer_defaults.truncate_lines = Qnil;
+ buffer_defaults.word_wrap = Qnil;
buffer_defaults.ctl_arrow = Qt;
buffer_defaults.direction_reversed = Qnil;
buffer_defaults.cursor_type = Qt;
@@ -5211,6 +5212,7 @@
#endif
XSETFASTINT (buffer_local_flags.tab_width, idx); ++idx;
XSETFASTINT (buffer_local_flags.truncate_lines, idx); ++idx;
+ XSETFASTINT (buffer_local_flags.word_wrap, idx); ++idx;
XSETFASTINT (buffer_local_flags.ctl_arrow, idx); ++idx;
XSETFASTINT (buffer_local_flags.fill_column, idx); ++idx;
XSETFASTINT (buffer_local_flags.left_margin, idx); ++idx;
@@ -5502,6 +5504,11 @@
doc: /* Default value of `truncate-lines' for buffers that
do not override it.
This is the same as (default-value 'truncate-lines). */);
+ DEFVAR_LISP_NOPRO ("default-word-wrap",
+ &buffer_defaults.word_wrap,
+ doc: /* Default value of `word-wrap' for buffers that do
not override it.
+This is the same as (default-value 'word-wrap). */);
+
DEFVAR_LISP_NOPRO ("default-fill-column",
&buffer_defaults.fill_column,
doc: /* Default value of `fill-column' for buffers that do
not override it.
@@ -5753,6 +5760,15 @@
`truncate-partial-width-windows' if that variable is non-nil
and this buffer is not full-frame width. */);
+ DEFVAR_PER_BUFFER ("word-wrap", ¤t_buffer->word_wrap, Qnil,
+ doc: /* *Non-nil means to use word-wrapping for
continuation lines.
+When word-wrapping is on, continuation lines are wrapped at the space
+or tab character nearest to the right window edge.
+If nil, continuation lines are wrapped at the right screen edge.
+
+This variable has no effect if long lines are truncated (see
+`truncate-lines' and `truncate-partial-width-windows'). */);
+
#ifdef DOS_NT
DEFVAR_PER_BUFFER ("buffer-file-type", ¤t_buffer->buffer_file_type,
Qnil,