/[emacs]/emacs/src/buffer.c
ViewVC logotype

Diff of /emacs/src/buffer.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.435.2.2 by handa, Fri Apr 16 12:50:45 2004 UTC revision 1.435.2.3 by miles, Mon Jun 28 07:29:17 2004 UTC
# Line 488  static void Line 488  static void
488  clone_per_buffer_values (from, to)  clone_per_buffer_values (from, to)
489       struct buffer *from, *to;       struct buffer *from, *to;
490  {  {
491    Lisp_Object to_buffer;    Lisp_Object to_buffer, tem;
492    int offset;    int offset;
493    
494    XSETBUFFER (to_buffer, to);    XSETBUFFER (to_buffer, to);
# Line 515  clone_per_buffer_values (from, to) Line 515  clone_per_buffer_values (from, to)
515    
516    to->overlays_before = copy_overlays (to, from->overlays_before);    to->overlays_before = copy_overlays (to, from->overlays_before);
517    to->overlays_after = copy_overlays (to, from->overlays_after);    to->overlays_after = copy_overlays (to, from->overlays_after);
518    
519      /* Copy the alist of local variables,
520         and all the alist elements too.  */
521      to->local_var_alist
522        = Fcopy_sequence (from->local_var_alist);
523      for (tem = to->local_var_alist; CONSP (tem);
524           tem = XCDR (tem))
525        XSETCAR (tem, Fcons (XCAR (XCAR (tem)), XCDR (XCAR (tem))));
526  }  }
527    
528    
# Line 833  No argument or nil as argument means use Line 841  No argument or nil as argument means use
841  DEFUN ("buffer-base-buffer", Fbuffer_base_buffer, Sbuffer_base_buffer,  DEFUN ("buffer-base-buffer", Fbuffer_base_buffer, Sbuffer_base_buffer,
842         0, 1, 0,         0, 1, 0,
843         doc: /* Return the base buffer of indirect buffer BUFFER.         doc: /* Return the base buffer of indirect buffer BUFFER.
844  If BUFFER is not indirect, return nil.  */)  If BUFFER is not indirect, return nil.
845    BUFFER defaults to the current buffer.  */)
846       (buffer)       (buffer)
847       register Lisp_Object buffer;       register Lisp_Object buffer;
848  {  {
# Line 1683  DEFUN ("pop-to-buffer", Fpop_to_buffer, Line 1692  DEFUN ("pop-to-buffer", Fpop_to_buffer,
1692         doc: /* Select buffer BUFFER in some window, preferably a different one.         doc: /* Select buffer BUFFER in some window, preferably a different one.
1693  If BUFFER is nil, then some other buffer is chosen.  If BUFFER is nil, then some other buffer is chosen.
1694  If `pop-up-windows' is non-nil, windows can be split to do this.  If `pop-up-windows' is non-nil, windows can be split to do this.
1695  If optional second arg OTHER-WINDOW is nil, insist on finding another  If optional second arg OTHER-WINDOW is non-nil, insist on finding another
1696  window even if BUFFER is already visible in the selected window,  window even if BUFFER is already visible in the selected window,
1697  and ignore `same-window-regexps' and `same-window-buffer-names'.  and ignore `same-window-regexps' and `same-window-buffer-names'.
1698  This uses the function `display-buffer' as a subroutine; see the documentation  This uses the function `display-buffer' as a subroutine; see the documentation
# Line 2145  current buffer is cleared.  */) Line 2154  current buffer is cleared.  */)
2154        GPT = GPT_BYTE;        GPT = GPT_BYTE;
2155        TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE);        TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE);
2156    
2157          
2158        for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next)        for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next)
2159          tail->charpos = tail->bytepos;          tail->charpos = tail->bytepos;
2160    
# Line 3354  fix_start_end_in_overlays (start, end) Line 3363  fix_start_end_in_overlays (start, end)
3363    
3364        if (endpos < start)        if (endpos < start)
3365          break;          break;
3366          
3367        if (endpos < end        if (endpos < end
3368            || (startpos >= start && startpos < end))            || (startpos >= start && startpos < end))
3369          {          {
# Line 3397  fix_start_end_in_overlays (start, end) Line 3406  fix_start_end_in_overlays (start, end)
3406          {          {
3407            startpos = endpos;            startpos = endpos;
3408            Fset_marker (OVERLAY_START (overlay), make_number (startpos),            Fset_marker (OVERLAY_START (overlay), make_number (startpos),
3409                         Qnil);                             Qnil);
3410          }          }
3411    
3412        if (startpos >= end)        if (startpos >= end)
# Line 4208  report_overlay_modification (start, end, Line 4217  report_overlay_modification (start, end,
4217                  add_overlay_mod_hooklist (prop, overlay);                  add_overlay_mod_hooklist (prop, overlay);
4218              }              }
4219          }          }
4220          
4221        for (tail = current_buffer->overlays_after; tail; tail = tail->next)        for (tail = current_buffer->overlays_after; tail; tail = tail->next)
4222          {          {
4223            int startpos, endpos;            int startpos, endpos;
# Line 5444  nil here means use current buffer's majo Line 5453  nil here means use current buffer's majo
5453    DEFVAR_PER_BUFFER ("fill-column", &current_buffer->fill_column,    DEFVAR_PER_BUFFER ("fill-column", &current_buffer->fill_column,
5454                       make_number (Lisp_Int),                       make_number (Lisp_Int),
5455                       doc: /* *Column beyond which automatic line-wrapping should happen.                       doc: /* *Column beyond which automatic line-wrapping should happen.
5456  Interactively, you can set this using \\[set-fill-column].  */);  Interactively, you can set the buffer local value using \\[set-fill-column].  */);
5457    
5458    DEFVAR_PER_BUFFER ("left-margin", &current_buffer->left_margin,    DEFVAR_PER_BUFFER ("left-margin", &current_buffer->left_margin,
5459                       make_number (Lisp_Int),                       make_number (Lisp_Int),
# Line 5854  If the buffer has never been shown in a Line 5863  If the buffer has never been shown in a
5863                 doc: /* *Non-nil means deactivate the mark when the buffer contents change.                 doc: /* *Non-nil means deactivate the mark when the buffer contents change.
5864  Non-nil also enables highlighting of the region whenever the mark is active.  Non-nil also enables highlighting of the region whenever the mark is active.
5865  The variable `highlight-nonselected-windows' controls whether to highlight  The variable `highlight-nonselected-windows' controls whether to highlight
5866  all windows or just the selected window.  */);  all windows or just the selected window.
5867    
5868    If the value is `lambda', that enables Transient Mark mode temporarily
5869    until the next buffer modification.  If a command sets the value to `only',
5870    that enables Transient Mark mode for the following command only.  */);
5871    Vtransient_mark_mode = Qnil;    Vtransient_mark_mode = Qnil;
5872    
5873    DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only,    DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only,
# Line 5871  Values are interpreted as follows: Line 5884  Values are interpreted as follows:
5884    
5885    t              use the cursor specified for the frame    t              use the cursor specified for the frame
5886    nil            don't display a cursor    nil            don't display a cursor
5887    bar            display a bar cursor with default width    box            display a filled box cursor
5888    (bar . WIDTH)  display a bar cursor with width WIDTH    hollow         display a hollow box cursor
5889    ANYTHING ELSE  display a box cursor.    bar            display a vertical bar cursor with default width
5890      (bar . WIDTH)  display a vertical bar cursor with width WIDTH
5891      hbar           display a horisontal bar cursor with default width
5892      (hbar . WIDTH) display a horisontal bar cursor with width WIDTH
5893      ANYTHING ELSE  display a hollow box cursor.
5894    
5895  When the buffer is displayed in a nonselected window,  When the buffer is displayed in a nonselected window,
5896  this variable has no effect; the cursor appears as a hollow box.  */);  this variable has no effect; the cursor appears as a hollow box.  */);
# Line 5881  this variable has no effect; the cursor Line 5898  this variable has no effect; the cursor
5898    DEFVAR_PER_BUFFER ("line-spacing",    DEFVAR_PER_BUFFER ("line-spacing",
5899                       &current_buffer->extra_line_spacing, Qnil,                       &current_buffer->extra_line_spacing, Qnil,
5900                       doc: /* Additional space to put between lines when displaying a buffer.                       doc: /* Additional space to put between lines when displaying a buffer.
5901  The space is measured in pixels, and put below lines on window systems.  */);  The space is measured in pixels, and put below lines on window systems.
5902    If value is a floating point number, it specifies the spacing relative
5903    to the default frame line height.  */);
5904    
5905    DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions,    DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions,
5906                 doc: /* List of functions called with no args to query before killing a buffer.  */);                 doc: /* List of functions called with no args to query before killing a buffer.  */);

Legend:
Removed from v.1.435.2.2  
changed lines
  Added in v.1.435.2.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26