aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/buffer.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c670f757962..52693075982 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12006-05-21 Richard Stallman <rms@gnu.org>
2
3 * buffer.c (syms_of_buffer, Fmake_overlay): Doc fixes.
4
12006-05-20 Kim F. Storm <storm@cua.dk> 52006-05-20 Kim F. Storm <storm@cua.dk>
2 6
3 * xfaces.c (best_matching_font): Fix crash in 2006-05-17 change. 7 * xfaces.c (best_matching_font): Fix crash in 2006-05-17 change.
diff --git a/src/buffer.c b/src/buffer.c
index c03c58a39f3..f53f67ca2c2 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3554,10 +3554,10 @@ If omitted, BUFFER defaults to the current buffer.
3554BEG and END may be integers or markers. 3554BEG and END may be integers or markers.
3555The fourth arg FRONT-ADVANCE, if non-nil, makes the marker 3555The fourth arg FRONT-ADVANCE, if non-nil, makes the marker
3556for the front of the overlay advance when text is inserted there 3556for the front of the overlay advance when text is inserted there
3557(which means the text *is not* included in the overlay). 3557\(which means the text *is not* included in the overlay).
3558The fifth arg REAR-ADVANCE, if non-nil, makes the marker 3558The fifth arg REAR-ADVANCE, if non-nil, makes the marker
3559for the rear of the overlay advance when text is inserted there 3559for the rear of the overlay advance when text is inserted there
3560(which means the text *is* included in the overlay). */) 3560\(which means the text *is* included in the overlay). */)
3561 (beg, end, buffer, front_advance, rear_advance) 3561 (beg, end, buffer, front_advance, rear_advance)
3562 Lisp_Object beg, end, buffer; 3562 Lisp_Object beg, end, buffer;
3563 Lisp_Object front_advance, rear_advance; 3563 Lisp_Object front_advance, rear_advance;
@@ -5739,7 +5739,7 @@ the actual bitmap shown in the left or right fringe for the logical
5739indicator. LEFT and RIGHT are the bitmaps shown in the left and/or 5739indicator. LEFT and RIGHT are the bitmaps shown in the left and/or
5740right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps 5740right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps
5741are used only for the `bottom' and `one-line' indicators when the last 5741are used only for the `bottom' and `one-line' indicators when the last
5742(only) line in has no final newline. BITMAPS may also be a single 5742\(only) line in has no final newline. BITMAPS may also be a single
5743symbol which is used in both left and right fringes. */); 5743symbol which is used in both left and right fringes. */);
5744 5744
5745 DEFVAR_PER_BUFFER ("fringe-cursor-alist", 5745 DEFVAR_PER_BUFFER ("fringe-cursor-alist",
@@ -5986,7 +5986,7 @@ this variable has no effect; the cursor appears as a hollow box. */);
5986 doc: /* Additional space to put between lines when displaying a buffer. 5986 doc: /* Additional space to put between lines when displaying a buffer.
5987The space is measured in pixels, and put below lines on window systems. 5987The space is measured in pixels, and put below lines on window systems.
5988If value is a floating point number, it specifies the spacing relative 5988If value is a floating point number, it specifies the spacing relative
5989to the default frame line height. */); 5989to the default frame line height. nil means add no extra space. */);
5990 5990
5991 DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", 5991 DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows",
5992 &current_buffer->cursor_in_non_selected_windows, Qnil, 5992 &current_buffer->cursor_in_non_selected_windows, Qnil,