diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 21 |
2 files changed, 15 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ebbe9bab941..7c07489dfc1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-04-14 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * xdisp.c (Vwrap_prefix, Vline_prefix): Reflow docstrings. | ||
| 4 | |||
| 1 | 2009-04-14 Kenichi Handa <handa@m17n.org> | 5 | 2009-04-14 Kenichi Handa <handa@m17n.org> |
| 2 | 6 | ||
| 3 | * xfont.c (xfont_has_char): The font has C if C is ASCII and the | 7 | * xfont.c (xfont_has_char): The font has C if C is ASCII and the |
diff --git a/src/xdisp.c b/src/xdisp.c index 7a01d60d5a7..39232cf2bec 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -25275,26 +25275,27 @@ The enable predicate for a menu binding should check this variable. */); | |||
| 25275 | inhibit_menubar_update = 0; | 25275 | inhibit_menubar_update = 0; |
| 25276 | 25276 | ||
| 25277 | DEFVAR_LISP ("wrap-prefix", &Vwrap_prefix, | 25277 | DEFVAR_LISP ("wrap-prefix", &Vwrap_prefix, |
| 25278 | doc: /* Prefix added to the beginning of all continuation lines at display-time. | 25278 | doc: /* Prefix prepended to all continuation lines at display time. |
| 25279 | May be a string, an image, or a stretch-glyph such as used by the | 25279 | The value may be a string, an image, or a stretch-glyph; it is |
| 25280 | `display' text-property. | 25280 | interpreted in the same way as the value of a `display' text property. |
| 25281 | 25281 | ||
| 25282 | This variable is overridden by any `wrap-prefix' text-property. | 25282 | This variable is overridden by any `wrap-prefix' text or overlay |
| 25283 | property. | ||
| 25283 | 25284 | ||
| 25284 | To add a prefix to non-continuation lines, use the `line-prefix' variable. */); | 25285 | To add a prefix to non-continuation lines, use `line-prefix'. */); |
| 25285 | Vwrap_prefix = Qnil; | 25286 | Vwrap_prefix = Qnil; |
| 25286 | staticpro (&Qwrap_prefix); | 25287 | staticpro (&Qwrap_prefix); |
| 25287 | Qwrap_prefix = intern ("wrap-prefix"); | 25288 | Qwrap_prefix = intern ("wrap-prefix"); |
| 25288 | Fmake_variable_buffer_local (Qwrap_prefix); | 25289 | Fmake_variable_buffer_local (Qwrap_prefix); |
| 25289 | 25290 | ||
| 25290 | DEFVAR_LISP ("line-prefix", &Vline_prefix, | 25291 | DEFVAR_LISP ("line-prefix", &Vline_prefix, |
| 25291 | doc: /* Prefix added to the beginning of all non-continuation lines at display-time. | 25292 | doc: /* Prefix prepended to all non-continuation lines at display time. |
| 25292 | May be a string, an image, or a stretch-glyph such as used by the | 25293 | The value may be a string, an image, or a stretch-glyph; it is |
| 25293 | `display' text-property. | 25294 | interpreted in the same way as the value of a `display' text property. |
| 25294 | 25295 | ||
| 25295 | This variable is overridden by any `line-prefix' text-property. | 25296 | This variable is overridden by any `line-prefix' text property. |
| 25296 | 25297 | ||
| 25297 | To add a prefix to continuation lines, use the `wrap-prefix' variable. */); | 25298 | To add a prefix to continuation lines, use `wrap-prefix'. */); |
| 25298 | Vline_prefix = Qnil; | 25299 | Vline_prefix = Qnil; |
| 25299 | staticpro (&Qline_prefix); | 25300 | staticpro (&Qline_prefix); |
| 25300 | Qline_prefix = intern ("line-prefix"); | 25301 | Qline_prefix = intern ("line-prefix"); |