[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/buffer.c [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/buffer.c [emacs-unicode-2] |
Date: |
Mon, 28 Jun 2004 03:56:40 -0400 |
Index: emacs/src/buffer.c
diff -c emacs/src/buffer.c:1.435.2.2 emacs/src/buffer.c:1.435.2.3
*** emacs/src/buffer.c:1.435.2.2 Fri Apr 16 12:50:45 2004
--- emacs/src/buffer.c Mon Jun 28 07:29:17 2004
***************
*** 488,494 ****
clone_per_buffer_values (from, to)
struct buffer *from, *to;
{
! Lisp_Object to_buffer;
int offset;
XSETBUFFER (to_buffer, to);
--- 488,494 ----
clone_per_buffer_values (from, to)
struct buffer *from, *to;
{
! Lisp_Object to_buffer, tem;
int offset;
XSETBUFFER (to_buffer, to);
***************
*** 515,520 ****
--- 515,528 ----
to->overlays_before = copy_overlays (to, from->overlays_before);
to->overlays_after = copy_overlays (to, from->overlays_after);
+
+ /* Copy the alist of local variables,
+ and all the alist elements too. */
+ to->local_var_alist
+ = Fcopy_sequence (from->local_var_alist);
+ for (tem = to->local_var_alist; CONSP (tem);
+ tem = XCDR (tem))
+ XSETCAR (tem, Fcons (XCAR (XCAR (tem)), XCDR (XCAR (tem))));
}
***************
*** 833,839 ****
DEFUN ("buffer-base-buffer", Fbuffer_base_buffer, Sbuffer_base_buffer,
0, 1, 0,
doc: /* Return the base buffer of indirect buffer BUFFER.
! If BUFFER is not indirect, return nil. */)
(buffer)
register Lisp_Object buffer;
{
--- 841,848 ----
DEFUN ("buffer-base-buffer", Fbuffer_base_buffer, Sbuffer_base_buffer,
0, 1, 0,
doc: /* Return the base buffer of indirect buffer BUFFER.
! If BUFFER is not indirect, return nil.
! BUFFER defaults to the current buffer. */)
(buffer)
register Lisp_Object buffer;
{
***************
*** 1683,1689 ****
doc: /* Select buffer BUFFER in some window, preferably a different
one.
If BUFFER is nil, then some other buffer is chosen.
If `pop-up-windows' is non-nil, windows can be split to do this.
! If optional second arg OTHER-WINDOW is nil, insist on finding another
window even if BUFFER is already visible in the selected window,
and ignore `same-window-regexps' and `same-window-buffer-names'.
This uses the function `display-buffer' as a subroutine; see the documentation
--- 1692,1698 ----
doc: /* Select buffer BUFFER in some window, preferably a different
one.
If BUFFER is nil, then some other buffer is chosen.
If `pop-up-windows' is non-nil, windows can be split to do this.
! If optional second arg OTHER-WINDOW is non-nil, insist on finding another
window even if BUFFER is already visible in the selected window,
and ignore `same-window-regexps' and `same-window-buffer-names'.
This uses the function `display-buffer' as a subroutine; see the documentation
***************
*** 2145,2151 ****
GPT = GPT_BYTE;
TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE);
!
for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next)
tail->charpos = tail->bytepos;
--- 2154,2160 ----
GPT = GPT_BYTE;
TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE);
!
for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next)
tail->charpos = tail->bytepos;
***************
*** 3354,3360 ****
if (endpos < start)
break;
!
if (endpos < end
|| (startpos >= start && startpos < end))
{
--- 3363,3369 ----
if (endpos < start)
break;
!
if (endpos < end
|| (startpos >= start && startpos < end))
{
***************
*** 3397,3403 ****
{
startpos = endpos;
Fset_marker (OVERLAY_START (overlay), make_number (startpos),
! Qnil);
}
if (startpos >= end)
--- 3406,3412 ----
{
startpos = endpos;
Fset_marker (OVERLAY_START (overlay), make_number (startpos),
! Qnil);
}
if (startpos >= end)
***************
*** 4208,4214 ****
add_overlay_mod_hooklist (prop, overlay);
}
}
!
for (tail = current_buffer->overlays_after; tail; tail = tail->next)
{
int startpos, endpos;
--- 4217,4223 ----
add_overlay_mod_hooklist (prop, overlay);
}
}
!
for (tail = current_buffer->overlays_after; tail; tail = tail->next)
{
int startpos, endpos;
***************
*** 5444,5450 ****
DEFVAR_PER_BUFFER ("fill-column", ¤t_buffer->fill_column,
make_number (Lisp_Int),
doc: /* *Column beyond which automatic line-wrapping
should happen.
! Interactively, you can set this using \\[set-fill-column]. */);
DEFVAR_PER_BUFFER ("left-margin", ¤t_buffer->left_margin,
make_number (Lisp_Int),
--- 5453,5459 ----
DEFVAR_PER_BUFFER ("fill-column", ¤t_buffer->fill_column,
make_number (Lisp_Int),
doc: /* *Column beyond which automatic line-wrapping
should happen.
! Interactively, you can set the buffer local value using \\[set-fill-column].
*/);
DEFVAR_PER_BUFFER ("left-margin", ¤t_buffer->left_margin,
make_number (Lisp_Int),
***************
*** 5854,5860 ****
doc: /* *Non-nil means deactivate the mark when the buffer
contents change.
Non-nil also enables highlighting of the region whenever the mark is active.
The variable `highlight-nonselected-windows' controls whether to highlight
! all windows or just the selected window. */);
Vtransient_mark_mode = Qnil;
DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only,
--- 5863,5873 ----
doc: /* *Non-nil means deactivate the mark when the buffer
contents change.
Non-nil also enables highlighting of the region whenever the mark is active.
The variable `highlight-nonselected-windows' controls whether to highlight
! all windows or just the selected window.
!
! If the value is `lambda', that enables Transient Mark mode temporarily
! until the next buffer modification. If a command sets the value to `only',
! that enables Transient Mark mode for the following command only. */);
Vtransient_mark_mode = Qnil;
DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only,
***************
*** 5871,5879 ****
t use the cursor specified for the frame
nil don't display a cursor
! bar display a bar cursor with default width
! (bar . WIDTH) display a bar cursor with width WIDTH
! ANYTHING ELSE display a box cursor.
When the buffer is displayed in a nonselected window,
this variable has no effect; the cursor appears as a hollow box. */);
--- 5884,5896 ----
t use the cursor specified for the frame
nil don't display a cursor
! box display a filled box cursor
! hollow display a hollow box cursor
! bar display a vertical bar cursor with default width
! (bar . WIDTH) display a vertical bar cursor with width WIDTH
! hbar display a horisontal bar cursor with default width
! (hbar . WIDTH) display a horisontal bar cursor with width WIDTH
! ANYTHING ELSE display a hollow box cursor.
When the buffer is displayed in a nonselected window,
this variable has no effect; the cursor appears as a hollow box. */);
***************
*** 5881,5887 ****
DEFVAR_PER_BUFFER ("line-spacing",
¤t_buffer->extra_line_spacing, Qnil,
doc: /* Additional space to put between lines when
displaying a buffer.
! The space is measured in pixels, and put below lines on window systems. */);
DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions,
doc: /* List of functions called with no args to query before
killing a buffer. */);
--- 5898,5906 ----
DEFVAR_PER_BUFFER ("line-spacing",
¤t_buffer->extra_line_spacing, Qnil,
doc: /* Additional space to put between lines when
displaying a buffer.
! The space is measured in pixels, and put below lines on window systems.
! If value is a floating point number, it specifies the spacing relative
! to the default frame line height. */);
DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions,
doc: /* List of functions called with no args to query before
killing a buffer. */);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/buffer.c [emacs-unicode-2],
Miles Bader <=