/* Buffer manipulation primitives for GNU Emacs.
- Copyright (C) 1985, 1986, 1987, 1988, 1989, 1992 Free Software Foundation, Inc.
+ Copyright (C) 1985, 1986, 1987, 1988, 1989, 1992, 1993
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/param.h>
#ifndef MAXPATHLEN
buffer_slot_type_mismatch will signal an error. */
struct buffer buffer_local_types;
-/* Nonzero means don't allow modification of protected fields. */
-
-int check_protected_fields;
-
Lisp_Object Fset_buffer ();
void set_buffer_internal ();
Lisp_Object Vbefore_change_function;
Lisp_Object Vafter_change_function;
-/* Function to call before changing an unmodified buffer. */
-Lisp_Object Vfirst_change_function;
+Lisp_Object Vtransient_mark_mode;
+
+/* List of functions to call before changing an unmodified buffer. */
+Lisp_Object Vfirst_change_hook;
+Lisp_Object Qfirst_change_hook;
Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local;
b->directory = (current_buffer) ? current_buffer->directory : Qnil;
b->modtime = 0;
b->save_modified = 1;
- b->save_length = 0;
+ XFASTINT (b->save_length) = 0;
b->last_window_start = 1;
b->backed_up = Qnil;
b->auto_save_modified = 0;
reset_buffer_local_variables(b);
}
-reset_buffer_local_variables(b)
+reset_buffer_local_variables (b)
register struct buffer *b;
{
register int offset;
b->upcase_table = Vascii_upcase_table;
b->case_canon_table = Vascii_downcase_table;
b->case_eqv_table = Vascii_upcase_table;
+ b->mark_active = Qnil;
#if 0
b->sort_table = XSTRING (Vascii_sort_table);
b->folding_sort_table = XSTRING (Vascii_folding_sort_table);
}
\f
DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2,
- "sRename buffer (to new name): ",
+ "sRename buffer (to new name): \nP",
"Change current buffer's name to NEWNAME (a string).\n\
-If second arg DISTINGUISH is nil or omitted, it is an error if a\n\
+If second arg UNIQUE is nil or omitted, it is an error if a\n\
buffer named NEWNAME already exists.\n\
-If DISTINGUISH is non-nil, come up with a new name using\n\
+If UNIQUE is non-nil, come up with a new name using\n\
`generate-new-buffer-name'.\n\
-Return the name we actually gave the buffer.\n\
+Interactively, you can set UNIQUE with a prefix argument.\n\
+We return the name we actually gave the buffer.\n\
This does not change the name of the visited file (if any).")
- (name, distinguish)
- register Lisp_Object name, distinguish;
+ (name, unique)
+ register Lisp_Object name, unique;
{
register Lisp_Object tem, buf;
return current_buffer->name;
if (!NILP (tem))
{
- if (!NILP (distinguish))
+ if (!NILP (unique))
name = Fgenerate_new_buffer_name (name);
else
error ("Buffer name \"%s\" is in use", XSTRING (name)->data);
}
current_buffer->name = name;
+
+ /* Catch redisplay's attention. Unless we do this, the mode lines for
+ any windows displaying current_buffer will stay unchanged. */
+ update_mode_lines++;
+
XSET (buf, Lisp_Buffer, current_buffer);
Fsetcar (Frassq (buf, Vbuffer_alist), name);
if (NILP (current_buffer->filename) && !NILP (current_buffer->auto_save_file_name))
record_buffer (buf);
Fset_window_buffer (EQ (selected_window, minibuf_window)
- ? Fnext_window (minibuf_window, Qnil) : selected_window,
+ ? Fnext_window (minibuf_window, Qnil, Qnil)
+ : selected_window,
buf);
return Qnil;
"Put BUFFER at the end of the list of all buffers.\n\
There it is the least likely candidate for `other-buffer' to return;\n\
thus, the least likely buffer for \\[switch-to-buffer] to select by default.\n\
-BUFFER is also removed from the selected window if it was displayed there.\n\
-If BUFFER is omitted, the current buffer is buried.")
+If BUFFER is nil or omitted, bury the current buffer.\n\
+Also, if BUFFER is nil or omitted, remove the current buffer from the\n\
+selected window if it is displayed there.")
(buf)
register Lisp_Object buf;
{
/* Figure out what buffer we're going to bury. */
if (NILP (buf))
- XSET (buf, Lisp_Buffer, current_buffer);
+ {
+ XSET (buf, Lisp_Buffer, current_buffer);
+
+ /* If we're burying the current buffer, unshow it. */
+ Fswitch_to_buffer (Fother_buffer (buf, Qnil), Qnil);
+ }
else
{
Lisp_Object buf1;
buf = buf1;
}
- /* Remove it from the screen. */
- if (EQ (buf, XWINDOW (selected_window)->buffer))
- Fswitch_to_buffer (Fother_buffer (buf, Qnil), Qnil);
-
- /* Move it to the end of the buffer list. */
+ /* Move buf to the end of the buffer list. */
{
register Lisp_Object aelt, link;
return Qnil;
}
\f
-DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, 0,
+DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*",
"Delete the entire contents of the current buffer.\n\
-Any clipping restriction in effect (see `narrow-to-buffer') is removed,\n\
+Any clipping restriction in effect (see `narrow-to-region') is removed,\n\
so the buffer is truly empty after this.")
()
{
Lisp_Object valcontents, newval;
{
unsigned int offset = XUINT (valcontents);
- char *symbol_name =
+ unsigned char *symbol_name =
(XSYMBOL (*(Lisp_Object *)(offset + (char *)&buffer_local_symbols))
->name->data);
char *type_name;
case Lisp_Marker: type_name = "markers"; break;
case Lisp_Symbol: type_name = "symbols"; break;
case Lisp_Cons: type_name = "lists"; break;
- case Lisp_Vector: type_name = "vector"; break;
+ case Lisp_Vector: type_name = "vectors"; break;
default:
abort ();
}
buffer_defaults.display_table = Qnil;
buffer_defaults.fieldlist = Qnil;
buffer_defaults.undo_list = Qnil;
+ buffer_defaults.mark_active = Qnil;
XFASTINT (buffer_defaults.tab_width) = 8;
buffer_defaults.truncate_lines = Qnil;
XFASTINT (buffer_local_flags.major_mode) = -1;
XFASTINT (buffer_local_flags.mode_name) = -1;
XFASTINT (buffer_local_flags.undo_list) = -1;
+ XFASTINT (buffer_local_flags.mark_active) = -1;
XFASTINT (buffer_local_flags.mode_line_format) = 1;
XFASTINT (buffer_local_flags.abbrev_mode) = 2;
init_buffer ()
{
char buf[MAXPATHLEN+1];
+ char *pwd;
+ struct stat dotstat, pwdstat;
Fset_buffer (Fget_buffer_create (build_string ("*scratch*")));
- if (getwd (buf) == 0)
+
+ /* If PWD is accurate, use it instead of calling getwd. This is faster
+ when PWD is right, and may avoid a fatal error. */
+ if ((pwd = getenv ("PWD")) != 0 && *pwd == '/'
+ && stat (pwd, &pwdstat) == 0
+ && stat (".", &dotstat) == 0
+ && dotstat.st_ino == pwdstat.st_ino
+ && dotstat.st_dev == pwdstat.st_dev
+ && strlen (pwd) < MAXPATHLEN)
+ strcpy (buf, pwd);
+ else if (getwd (buf) == 0)
fatal ("`getwd' failed: %s.\n", buf);
#ifndef VMS
/* initialize the buffer routines */
syms_of_buffer ()
{
+ extern Lisp_Object Qdisabled;
+
staticpro (&Vbuffer_defaults);
staticpro (&Vbuffer_local_symbols);
staticpro (&Qfundamental_mode);
Fput (Qprotected_field, Qerror_message,
build_string ("Attempt to modify a protected field"));
+ Fput (intern ("erase-buffer"), Qdisabled, Qt);
+
/* All these use DEFVAR_LISP_NOPRO because the slots in
buffer_defaults will all be marked via Vbuffer_defaults. */
/* This doc string is too long for cpp; cpp dies if it isn't in a comment.
But make-docfile finds it!
DEFVAR_PER_BUFFER ("mode-line-format", ¤t_buffer->mode_line_format,
+ Qnil,
"Template for displaying mode line for current buffer.\n\
Each buffer has its own value of this variable.\n\
Value may be a string, a symbol or a list or cons cell.\n\
If this variable is nil, the value of `standard-display-table' is used.\n\
Each window can have its own, overriding display table.");
- DEFVAR_PER_BUFFER ("buffer-field-list", ¤t_buffer->fieldlist, Qnil,
- "List of fields in the current buffer. See `add-field'.");
-
- DEFVAR_BOOL ("check-protected-fields", check_protected_fields,
- "Non-nil means don't allow modification of a protected field.\n\
-See `add-field'.");
- check_protected_fields = 0;
-
/*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol,
"Don't ask.");
*/
cause calls to any `before-change-function' or `after-change-function'.");
Vafter_change_function = Qnil;
- DEFVAR_LISP ("first-change-function", &Vfirst_change_function,
- "Function to call before changing a buffer which is unmodified.\n\
-The function is called, with no arguments, if it is non-nil.");
- Vfirst_change_function = Qnil;
+ DEFVAR_LISP ("first-change-hook", &Vfirst_change_hook,
+ "A list of functions to call before changing a buffer which is unmodified.\n\
+The functions are run using the `run-hooks' function.");
+ Vfirst_change_hook = Qnil;
+ Qfirst_change_hook = intern ("first-change-hook");
+ staticpro (&Qfirst_change_hook);
DEFVAR_PER_BUFFER ("buffer-undo-list", ¤t_buffer->undo_list, Qnil,
"List of undo entries in current buffer.\n\
modification count of the most recent save is different, this entry is\n\
obsolete.\n\
\n\
+An entry (nil PROP VAL BEG . END) indicates that a text property\n\
+was modified between BEG and END. PROP is the property name,\n\
+and VAL is the old value.\n\
+\n\
+An entry of the form POSITION indicates that point was at the buffer\n\
+location given by the integer. Undoing an entry of this form places\n\
+point at POSITION.\n\
+\n\
nil marks undo boundaries. The undo command treats the changes\n\
between two undo boundaries as a single step to be undone.\n\
\n\
-If the value of the variable is t, undo information is not recorded.\n\
-");
+If the value of the variable is t, undo information is not recorded.");
+
+ DEFVAR_PER_BUFFER ("mark-active", ¤t_buffer->mark_active, Qnil,
+ "Non-nil means the mark and region are currently active in this buffer.\n\
+Automatically local in all buffers.");
+
+ DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode,
+ "*Non-nil means deactivate the mark when the buffer contents change.");
+ Vtransient_mark_mode = Qnil;
defsubr (&Sbuffer_list);
defsubr (&Sget_buffer);
HCoop / bpt / emacs.git / blobdiff