diff options
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/buffer.c b/src/buffer.c index db16b22e35a..4f6ac755436 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -2143,7 +2143,7 @@ current buffer is cleared. */) | |||
| 2143 | GPT = GPT_BYTE; | 2143 | GPT = GPT_BYTE; |
| 2144 | TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE); | 2144 | TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE); |
| 2145 | 2145 | ||
| 2146 | 2146 | ||
| 2147 | for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next) | 2147 | for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next) |
| 2148 | tail->charpos = tail->bytepos; | 2148 | tail->charpos = tail->bytepos; |
| 2149 | 2149 | ||
| @@ -3339,7 +3339,7 @@ fix_start_end_in_overlays (start, end) | |||
| 3339 | 3339 | ||
| 3340 | if (endpos < start) | 3340 | if (endpos < start) |
| 3341 | break; | 3341 | break; |
| 3342 | 3342 | ||
| 3343 | if (endpos < end | 3343 | if (endpos < end |
| 3344 | || (startpos >= start && startpos < end)) | 3344 | || (startpos >= start && startpos < end)) |
| 3345 | { | 3345 | { |
| @@ -3382,7 +3382,7 @@ fix_start_end_in_overlays (start, end) | |||
| 3382 | { | 3382 | { |
| 3383 | startpos = endpos; | 3383 | startpos = endpos; |
| 3384 | Fset_marker (OVERLAY_START (overlay), make_number (startpos), | 3384 | Fset_marker (OVERLAY_START (overlay), make_number (startpos), |
| 3385 | Qnil); | 3385 | Qnil); |
| 3386 | } | 3386 | } |
| 3387 | 3387 | ||
| 3388 | if (startpos >= end) | 3388 | if (startpos >= end) |
| @@ -4193,7 +4193,7 @@ report_overlay_modification (start, end, after, arg1, arg2, arg3) | |||
| 4193 | add_overlay_mod_hooklist (prop, overlay); | 4193 | add_overlay_mod_hooklist (prop, overlay); |
| 4194 | } | 4194 | } |
| 4195 | } | 4195 | } |
| 4196 | 4196 | ||
| 4197 | for (tail = current_buffer->overlays_after; tail; tail = tail->next) | 4197 | for (tail = current_buffer->overlays_after; tail; tail = tail->next) |
| 4198 | { | 4198 | { |
| 4199 | int startpos, endpos; | 4199 | int startpos, endpos; |
| @@ -5866,7 +5866,9 @@ this variable has no effect; the cursor appears as a hollow box. */); | |||
| 5866 | DEFVAR_PER_BUFFER ("line-spacing", | 5866 | DEFVAR_PER_BUFFER ("line-spacing", |
| 5867 | ¤t_buffer->extra_line_spacing, Qnil, | 5867 | ¤t_buffer->extra_line_spacing, Qnil, |
| 5868 | doc: /* Additional space to put between lines when displaying a buffer. | 5868 | doc: /* Additional space to put between lines when displaying a buffer. |
| 5869 | The space is measured in pixels, and put below lines on window systems. */); | 5869 | The space is measured in pixels, and put below lines on window systems. |
| 5870 | If value is a floating point number, it specifies the spacing relative | ||
| 5871 | to the default frame line height. */); | ||
| 5870 | 5872 | ||
| 5871 | DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, | 5873 | DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, |
| 5872 | doc: /* List of functions called with no args to query before killing a buffer. */); | 5874 | doc: /* List of functions called with no args to query before killing a buffer. */); |