Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/src/buffer.c Tue May 03 03:01:09 2005 +0000 +++ b/src/buffer.c Fri May 06 21:06:31 2005 +0000 @@ -1,6 +1,6 @@ /* Buffer manipulation primitives for GNU Emacs. - Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, - 2000, 01, 02, 03, 04, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, + 2000, 01, 02, 03, 04, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -4972,6 +4972,7 @@ buffer_defaults.direction_reversed = Qnil; buffer_defaults.cursor_type = Qt; buffer_defaults.extra_line_spacing = Qnil; + buffer_defaults.cursor_in_non_selected_windows = Qt; #ifdef DOS_NT buffer_defaults.buffer_file_type = Qnil; /* TEXT */ @@ -5068,6 +5069,7 @@ XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx; XSETFASTINT (buffer_local_flags.cursor_type, idx); ++idx; XSETFASTINT (buffer_local_flags.extra_line_spacing, idx); ++idx; + XSETFASTINT (buffer_local_flags.cursor_in_non_selected_windows, idx); ++idx; /* Need more room? */ if (idx >= MAX_PER_BUFFER_VARS) @@ -5259,6 +5261,11 @@ doc: /* Default value of `line-spacing' for buffers that don't override it. This is the same as (default-value 'line-spacing). */); + DEFVAR_LISP_NOPRO ("default-cursor-in-non-selected-windows", + &buffer_defaults.cursor_in_non_selected_windows, + doc: /* Default value of `cursor-in-non-selected-windows'. +This is the same as (default-value 'cursor-in-non-selected-windows). */); + DEFVAR_LISP_NOPRO ("default-abbrev-mode", &buffer_defaults.abbrev_mode, doc: /* Default value of `abbrev-mode' for buffers that do not override it. @@ -5938,6 +5945,11 @@ If value is a floating point number, it specifies the spacing relative to the default frame line height. */); + DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", + ¤t_buffer->cursor_in_non_selected_windows, Qnil, + doc: /* *Cursor type to display in non-selected windows. +t means to use hollow box cursor. See `cursor-type' for other values. */); + DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, doc: /* List of functions called with no args to query before killing a buffer. */); Vkill_buffer_query_functions = Qnil;