/[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.419 by monnier, Fri May 23 18:11:50 2003 UTC revision 1.420 by kfstorm, Sat May 24 21:54:43 2003 UTC
# Line 1607  switch_to_buffer_1 (buffer, norecord) Line 1607  switch_to_buffer_1 (buffer, norecord)
1607    Fset_window_buffer (EQ (selected_window, minibuf_window)    Fset_window_buffer (EQ (selected_window, minibuf_window)
1608                        ? Fnext_window (minibuf_window, Qnil, Qnil)                        ? Fnext_window (minibuf_window, Qnil, Qnil)
1609                        : selected_window,                        : selected_window,
1610                        buf);                        buf, Qnil);
1611    
1612    return buf;    return buf;
1613  }  }
# Line 4927  init_buffer_once () Line 4927  init_buffer_once ()
4927    buffer_defaults.cache_long_line_scans = Qnil;    buffer_defaults.cache_long_line_scans = Qnil;
4928    buffer_defaults.file_truename = Qnil;    buffer_defaults.file_truename = Qnil;
4929    XSETFASTINT (buffer_defaults.display_count, 0);    XSETFASTINT (buffer_defaults.display_count, 0);
4930      XSETFASTINT (buffer_defaults.left_margin_cols, 0);
4931      XSETFASTINT (buffer_defaults.right_margin_cols, 0);
4932      buffer_defaults.left_fringe_width = Qnil;
4933      buffer_defaults.right_fringe_width = Qnil;
4934      buffer_defaults.fringes_outside_margins = Qnil;
4935      buffer_defaults.scroll_bar_width = Qnil;
4936      buffer_defaults.vertical_scroll_bar_type = Qt;
4937    buffer_defaults.indicate_empty_lines = Qnil;    buffer_defaults.indicate_empty_lines = Qnil;
4938    buffer_defaults.scroll_up_aggressively = Qnil;    buffer_defaults.scroll_up_aggressively = Qnil;
4939    buffer_defaults.scroll_down_aggressively = Qnil;    buffer_defaults.scroll_down_aggressively = Qnil;
# Line 4989  init_buffer_once () Line 4996  init_buffer_once ()
4996    XSETFASTINT (buffer_local_flags.buffer_file_coding_system, idx);    XSETFASTINT (buffer_local_flags.buffer_file_coding_system, idx);
4997    /* Make this one a permanent local.  */    /* Make this one a permanent local.  */
4998    buffer_permanent_local_flags[idx++] = 1;    buffer_permanent_local_flags[idx++] = 1;
4999    XSETFASTINT (buffer_local_flags.left_margin_width, idx); ++idx;    XSETFASTINT (buffer_local_flags.left_margin_cols, idx); ++idx;
5000    XSETFASTINT (buffer_local_flags.right_margin_width, idx); ++idx;    XSETFASTINT (buffer_local_flags.right_margin_cols, idx); ++idx;
5001      XSETFASTINT (buffer_local_flags.left_fringe_width, idx); ++idx;
5002      XSETFASTINT (buffer_local_flags.right_fringe_width, idx); ++idx;
5003      XSETFASTINT (buffer_local_flags.fringes_outside_margins, idx); ++idx;
5004      XSETFASTINT (buffer_local_flags.scroll_bar_width, idx); ++idx;
5005      XSETFASTINT (buffer_local_flags.vertical_scroll_bar_type, idx); ++idx;
5006    XSETFASTINT (buffer_local_flags.indicate_empty_lines, idx); ++idx;    XSETFASTINT (buffer_local_flags.indicate_empty_lines, idx); ++idx;
5007    XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx;    XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx;
5008    XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx;    XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx;
# Line 5240  The file type is nil for text, t for bin Line 5252  The file type is nil for text, t for bin
5252  #endif  #endif
5253    
5254    DEFVAR_LISP_NOPRO ("default-left-margin-width",    DEFVAR_LISP_NOPRO ("default-left-margin-width",
5255                       &buffer_defaults.left_margin_width,                       &buffer_defaults.left_margin_cols,
5256                       doc: /* Default value of `left-margin-width' for buffers that don't override it.                       doc: /* Default value of `left-margin-width' for buffers that don't override it.
5257  This is the same as (default-value 'left-margin-width).  */);  This is the same as (default-value 'left-margin-width).  */);
5258    
5259    DEFVAR_LISP_NOPRO ("default-right-margin-width",    DEFVAR_LISP_NOPRO ("default-right-margin-width",
5260                       &buffer_defaults.right_margin_width,                       &buffer_defaults.right_margin_cols,
5261                       doc: /* Default value of `right_margin_width' for buffers that don't override it.                       doc: /* Default value of `right-margin-width' for buffers that don't override it.
5262  This is the same as (default-value 'right-margin-width).  */);  This is the same as (default-value 'right-margin-width).  */);
5263    
5264      DEFVAR_LISP_NOPRO ("default-left-fringe-width",
5265                         &buffer_defaults.left_fringe_width,
5266                         doc: /* Default value of `left-fringe-width' for buffers that don't override it.
5267    This is the same as (default-value 'left-fringe-width).  */);
5268    
5269      DEFVAR_LISP_NOPRO ("default-right-fringe-width",
5270                         &buffer_defaults.right_fringe_width,
5271                         doc: /* Default value of `right-fringe-width' for buffers that don't override it.
5272    This is the same as (default-value 'right-fringe-width).  */);
5273    
5274      DEFVAR_LISP_NOPRO ("default-fringes-outside-margins",
5275                         &buffer_defaults.fringes_outside_margins,
5276                         doc: /* Default value of `fringes-outside-margins' for buffers that don't override it.
5277    This is the same as (default-value 'fringes-outside-margins).  */);
5278    
5279      DEFVAR_LISP_NOPRO ("default-scroll-bar-width",
5280                         &buffer_defaults.scroll_bar_width,
5281                         doc: /* Default value of `scroll-bar-width' for buffers that don't override it.
5282    This is the same as (default-value 'scroll-bar-width).  */);
5283    
5284      DEFVAR_LISP_NOPRO ("default-vertical-scroll-bar",
5285                         &buffer_defaults.vertical_scroll_bar_type,
5286                         doc: /* Default value of `vertical-scroll-bar' for buffers that don't override it.
5287    This is the same as (default-value 'vertical-scroll-bar).  */);
5288    
5289    DEFVAR_LISP_NOPRO ("default-indicate-empty-lines",    DEFVAR_LISP_NOPRO ("default-indicate-empty-lines",
5290                       &buffer_defaults.indicate_empty_lines,                       &buffer_defaults.indicate_empty_lines,
5291                       doc: /* Default value of `indicate-empty-lines' for buffers that don't override it.                       doc: /* Default value of `indicate-empty-lines' for buffers that don't override it.
# Line 5517  In addition, a char-table has six extra Line 5554  In addition, a char-table has six extra
5554    
5555  See also the functions `display-table-slot' and `set-display-table-slot'.  */);  See also the functions `display-table-slot' and `set-display-table-slot'.  */);
5556    
5557    DEFVAR_PER_BUFFER ("left-margin-width", &current_buffer->left_margin_width,    DEFVAR_PER_BUFFER ("left-margin-width", &current_buffer->left_margin_cols,
5558                       Qnil,                       Qnil,
5559                       doc: /* *Width of left marginal area for display of a buffer.                       doc: /* *Width of left marginal area for display of a buffer.
5560  A value of nil means no marginal area.  */);  A value of nil means no marginal area.  */);
5561    
5562    DEFVAR_PER_BUFFER ("right-margin-width", &current_buffer->right_margin_width,    DEFVAR_PER_BUFFER ("right-margin-width", &current_buffer->right_margin_cols,
5563                       Qnil,                       Qnil,
5564                       doc: /* *Width of right marginal area for display of a buffer.                       doc: /* *Width of right marginal area for display of a buffer.
5565  A value of nil means no marginal area.  */);  A value of nil means no marginal area.  */);
5566    
5567      DEFVAR_PER_BUFFER ("left-fringe-width", &current_buffer->left_fringe_width,
5568                         Qnil,
5569                         doc: /* *Width of this buffer's left fringe (in pixels).
5570    A value of 0 means no left fringe is shown in this buffer's window.
5571    A value of nil means to use the left fringe width from the window's frame.  */);
5572    
5573      DEFVAR_PER_BUFFER ("right-fringe-width", &current_buffer->right_fringe_width,
5574                         Qnil,
5575                         doc: /* *Width of this buffer's right fringe (in pixels).
5576    A value of 0 means no right fringe is shown in this buffer's window.
5577    A value of nil means to use the right fringe width from the window's frame.  */);
5578    
5579      DEFVAR_PER_BUFFER ("fringes-outside-margins", &current_buffer->fringes_outside_margins,
5580                         Qnil,
5581                         doc: /* *Non-nil means to display fringes outside display margins.
5582    A value of nil means to display fringes between margins and buffer text.  */);
5583    
5584      DEFVAR_PER_BUFFER ("scroll-bar-width", &current_buffer->scroll_bar_width,
5585                         Qnil,
5586                         doc: /* *Width of this buffer's scroll bars in pixels.
5587    A value of nil means to use the scroll bar width from the window's frame.  */);
5588    
5589      DEFVAR_PER_BUFFER ("vertical-scroll-bar", &current_buffer->vertical_scroll_bar_type,
5590                         Qnil,
5591                         doc: /* *Position of this buffer's vertical scroll bar.
5592    A value of left or right means to place the vertical scroll bar at that side
5593    of the window; a value of nil means that this window has no vertical scroll bar.
5594    A value of t means to use the vertical scroll bar type from the window's frame.  */);
5595    
5596    DEFVAR_PER_BUFFER ("indicate-empty-lines",    DEFVAR_PER_BUFFER ("indicate-empty-lines",
5597                       &current_buffer->indicate_empty_lines, Qnil,                       &current_buffer->indicate_empty_lines, Qnil,
5598                       doc: /* *Visually indicate empty lines after the buffer end.                       doc: /* *Visually indicate empty lines after the buffer end.

Legend:
Removed from v.1.419  
changed lines
  Added in v.1.420

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