comparison src/buffer.c @ 83301:b151ec53c504

Merged from miles@gnu.org--gnu-2005 (patch 68, 286-291) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-286 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-287 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-288 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-289 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-290 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-291 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-68 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-341
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 06 May 2005 21:06:31 +0000
parents 9deb6323655c a0a348c8b14b
children 63b7247f4be6
comparison
equal deleted inserted replaced
83300:6deb860255f3 83301:b151ec53c504
1 /* Buffer manipulation primitives for GNU Emacs. 1 /* Buffer manipulation primitives for GNU Emacs.
2 Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, 2 Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99,
3 2000, 01, 02, 03, 04, 2005 Free Software Foundation, Inc. 3 2000, 01, 02, 03, 04, 2005 Free Software Foundation, Inc.
4 4
5 This file is part of GNU Emacs. 5 This file is part of GNU Emacs.
6 6
7 GNU Emacs is free software; you can redistribute it and/or modify 7 GNU Emacs is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
4970 buffer_defaults.truncate_lines = Qnil; 4970 buffer_defaults.truncate_lines = Qnil;
4971 buffer_defaults.ctl_arrow = Qt; 4971 buffer_defaults.ctl_arrow = Qt;
4972 buffer_defaults.direction_reversed = Qnil; 4972 buffer_defaults.direction_reversed = Qnil;
4973 buffer_defaults.cursor_type = Qt; 4973 buffer_defaults.cursor_type = Qt;
4974 buffer_defaults.extra_line_spacing = Qnil; 4974 buffer_defaults.extra_line_spacing = Qnil;
4975 buffer_defaults.cursor_in_non_selected_windows = Qt;
4975 4976
4976 #ifdef DOS_NT 4977 #ifdef DOS_NT
4977 buffer_defaults.buffer_file_type = Qnil; /* TEXT */ 4978 buffer_defaults.buffer_file_type = Qnil; /* TEXT */
4978 #endif 4979 #endif
4979 buffer_defaults.enable_multibyte_characters = Qt; 4980 buffer_defaults.enable_multibyte_characters = Qt;
5066 XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx; 5067 XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx;
5067 XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx; 5068 XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx;
5068 XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx; 5069 XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx;
5069 XSETFASTINT (buffer_local_flags.cursor_type, idx); ++idx; 5070 XSETFASTINT (buffer_local_flags.cursor_type, idx); ++idx;
5070 XSETFASTINT (buffer_local_flags.extra_line_spacing, idx); ++idx; 5071 XSETFASTINT (buffer_local_flags.extra_line_spacing, idx); ++idx;
5072 XSETFASTINT (buffer_local_flags.cursor_in_non_selected_windows, idx); ++idx;
5071 5073
5072 /* Need more room? */ 5074 /* Need more room? */
5073 if (idx >= MAX_PER_BUFFER_VARS) 5075 if (idx >= MAX_PER_BUFFER_VARS)
5074 abort (); 5076 abort ();
5075 last_per_buffer_idx = idx; 5077 last_per_buffer_idx = idx;
5256 5258
5257 DEFVAR_LISP_NOPRO ("default-line-spacing", 5259 DEFVAR_LISP_NOPRO ("default-line-spacing",
5258 &buffer_defaults.extra_line_spacing, 5260 &buffer_defaults.extra_line_spacing,
5259 doc: /* Default value of `line-spacing' for buffers that don't override it. 5261 doc: /* Default value of `line-spacing' for buffers that don't override it.
5260 This is the same as (default-value 'line-spacing). */); 5262 This is the same as (default-value 'line-spacing). */);
5263
5264 DEFVAR_LISP_NOPRO ("default-cursor-in-non-selected-windows",
5265 &buffer_defaults.cursor_in_non_selected_windows,
5266 doc: /* Default value of `cursor-in-non-selected-windows'.
5267 This is the same as (default-value 'cursor-in-non-selected-windows). */);
5261 5268
5262 DEFVAR_LISP_NOPRO ("default-abbrev-mode", 5269 DEFVAR_LISP_NOPRO ("default-abbrev-mode",
5263 &buffer_defaults.abbrev_mode, 5270 &buffer_defaults.abbrev_mode,
5264 doc: /* Default value of `abbrev-mode' for buffers that do not override it. 5271 doc: /* Default value of `abbrev-mode' for buffers that do not override it.
5265 This is the same as (default-value 'abbrev-mode). */); 5272 This is the same as (default-value 'abbrev-mode). */);
5936 doc: /* Additional space to put between lines when displaying a buffer. 5943 doc: /* Additional space to put between lines when displaying a buffer.
5937 The space is measured in pixels, and put below lines on window systems. 5944 The space is measured in pixels, and put below lines on window systems.
5938 If value is a floating point number, it specifies the spacing relative 5945 If value is a floating point number, it specifies the spacing relative
5939 to the default frame line height. */); 5946 to the default frame line height. */);
5940 5947
5948 DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows",
5949 &current_buffer->cursor_in_non_selected_windows, Qnil,
5950 doc: /* *Cursor type to display in non-selected windows.
5951 t means to use hollow box cursor. See `cursor-type' for other values. */);
5952
5941 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, 5953 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions,
5942 doc: /* List of functions called with no args to query before killing a buffer. */); 5954 doc: /* List of functions called with no args to query before killing a buffer. */);
5943 Vkill_buffer_query_functions = Qnil; 5955 Vkill_buffer_query_functions = Qnil;
5944 5956
5945 defsubr (&Sbuffer_live_p); 5957 defsubr (&Sbuffer_live_p);