xemacs-beta: src/buffer.c comparison

comparison src/buffer.c @ 386:4af0ddfb7c5b r21-2-8

Import from CVS: tag r21-2-8

author	cvs
date	Mon, 13 Aug 2007 11:08:50 +0200
parents	8626e4521993
children	aabb7f5b1c81

comparison

equal deleted inserted replaced

-:bc48d89bf15c
+:4af0ddfb7c5b
 buffers and as a reset-value when local-vars are killed.  */
 struct buffer buffer_local_flags;
 /* This is the initial (startup) directory, as used for the *scratch* buffer.
 We're making this a global to make others aware of the startup directory.
+`initial_directory' is stored in external format.
 */
 char initial_directory[MAXPATHLEN+1];
 /* This structure holds the names of symbols whose values may be
 buffer-local.  It is indexed and accessed in the same way as the above. */
 return Qnil;
 }
 DEFUN ("kill-buffer", Fkill_buffer, 1, 1, "bKill buffer: ", /*
-Kill the buffer BUFNAME.
+Kill the buffer BUFFER.
 The argument may be a buffer or may be the name of a buffer.
 An argument of nil means kill the current buffer.
 Value is t if the buffer is actually killed, nil if user says no.
 when the hook functions are called.
 Any processes that have this buffer as the `process-buffer' are killed
 with `delete-process'.
 */
-(bufname))
+(buffer))
 {
 /* This function can call lisp */
 Lisp_Object buf;
 REGISTER struct buffer *b;
 struct gcpro gcpro1, gcpro2;
-if (NILP (bufname))
+if (NILP (buffer))
 buf = Fcurrent_buffer ();
-else if (BUFFERP (bufname))
+else if (BUFFERP (buffer))
-buf = bufname;
+buf = buffer;
 else
 {
-buf = get_buffer (bufname, 0);
+buf = get_buffer (buffer, 0);
-if (NILP (buf)) nsberror (bufname);
+if (NILP (buf)) nsberror (buffer);
 }
 b = XBUFFER (buf);
 /* OK to delete an already-deleted buffer.  */
 /* Query if the buffer is still modified.  */
 if (INTERACTIVE && !NILP (b->filename)
 && BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
 {
 Lisp_Object killp;
-GCPRO2 (buf, bufname);
+GCPRO1 (buf);
 killp = call1
 	(Qyes_or_no_p,
 	 (emacs_doprnt_string_c
 	  ((CONST Bufbyte *) GETTEXT ("Buffer %s modified; kill anyway? "),
 	   Qnil, -1, XSTRING_DATA (b->name))));
 }
 return Qt;
 }
 DEFUN ("record-buffer", Frecord_buffer, 1, 1, 0, /*
-Place buffer BUF first in the buffer order.
+Place buffer BUFFER first in the buffer order.
 Call this function when a buffer is selected "visibly".
 This function changes the global buffer order and the per-frame buffer
 order for the selected frame.  The buffer order keeps track of recency
 of selection so that `other-buffer' will return a recently selected
 buffer.  See `other-buffer' for more information.
 */
-(buf))
+(buffer))
 {
 REGISTER Lisp_Object lynk, prev;
 struct frame *f = selected_frame ();
 prev = Qnil;
 for (lynk = Vbuffer_alist; CONSP (lynk); lynk = XCDR (lynk))
 {
-if (EQ (XCDR (XCAR (lynk)), buf))
+if (EQ (XCDR (XCAR (lynk)), buffer))
 	break;
 prev = lynk;
 }
 /* Effectively do Vbuffer_alist = delq_no_quit (lynk, Vbuffer_alist) */
 if (NILP (prev))
 /* That was the global one.  Now do the same thing for the
 per-frame buffer-alist. */
 prev = Qnil;
 for (lynk = f->buffer_alist; CONSP (lynk); lynk = XCDR (lynk))
 {
-if (EQ (XCDR (XCAR (lynk)), buf))
+if (EQ (XCDR (XCAR (lynk)), buffer))
 	break;
 prev = lynk;
 }
 /* Effectively do f->buffer_alist = delq_no_quit (lynk, f->buffer_alist) */
 if (NILP (prev))
 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, 1, 1, 0, /*
 Set an appropriate major mode for BUFFER, according to `default-major-mode'.
 Use this function before selecting the buffer, since it may need to inspect
 the current buffer's major mode.
 */
-(buf))
+(buffer))
 {
 int speccount = specpdl_depth ();
-REGISTER Lisp_Object function, tem;
+Lisp_Object function = XBUFFER (Vbuffer_defaults)->major_mode;
-function = XBUFFER (Vbuffer_defaults)->major_mode;
 if (NILP (function))
 {
-tem = Fget (current_buffer->major_mode, Qmode_class, Qnil);
+Lisp_Object tem = Fget (current_buffer->major_mode, Qmode_class, Qnil);
 if (NILP (tem))
 	function = current_buffer->major_mode;
 }
 if (NILP (function) || EQ (function, Qfundamental_mode))
 /* To select a nonfundamental mode,
 select the buffer temporarily and then call the mode function. */
 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
-Fset_buffer (buf);
+Fset_buffer (buffer);
 call0 (function);
 return unbind_to (speccount, Qnil);
 }
 DEFUN ("current-buffer", Fcurrent_buffer, 0, 0, 0, /*
 Return the current buffer as a Lisp object.
 */
 ())
 {
-Lisp_Object buf;
+Lisp_Object buffer;
-XSETBUFFER (buf, current_buffer);
+XSETBUFFER (buffer, current_buffer);
-return buf;
+return buffer;
 }
 /* Set the current buffer to B.  */
 void
 /* Want no undo records for *scratch* until after Emacs is dumped */
 Fbuffer_disable_undo (scratch);
 }
 }
+/* Is PWD another name for `.' ? */
+static int
+directory_is_current_directory (char *pwd)
+{
+Bufbyte *pwd_internal;
+struct stat dotstat, pwdstat;
+GET_C_CHARPTR_INT_FILENAME_DATA_ALLOCA (pwd, pwd_internal);
+return (IS_DIRECTORY_SEP (*pwd_internal)
+	  && stat (pwd_internal, &pwdstat) == 0
+	  && stat ("."         , &dotstat) == 0
+	  && dotstat.st_ino == pwdstat.st_ino
+	  && dotstat.st_dev == pwdstat.st_dev
+	  && (int) strlen (pwd_internal) < MAXPATHLEN);
+}
 void
 init_initial_directory (void)
 {
 /* This function can GC */
 char *pwd;
-struct stat dotstat, pwdstat;
-int rc;
 initial_directory[0] = 0;
 /* If PWD is accurate, use it instead of calling getcwd.  This is faster
 when PWD is right, and may avoid a fatal error.  */
-if ((pwd = getenv ("PWD")) != 0 && IS_DIRECTORY_SEP (*pwd)
+if ((pwd = getenv ("PWD")) != NULL
-&& stat (pwd, &pwdstat) == 0
+&& directory_is_current_directory (pwd))
-&& stat (".", &dotstat) == 0
-&& dotstat.st_ino == pwdstat.st_ino
-&& dotstat.st_dev == pwdstat.st_dev
-&& (int) strlen (pwd) < MAXPATHLEN)
 strcpy (initial_directory, pwd);
 else if (getcwd (initial_directory, MAXPATHLEN) == NULL)
 fatal ("`getcwd' failed: %s\n", strerror (errno));
-/* Maybe this should really use some standard subroutine
+/* Make sure pwd is DIRECTORY_SEP-terminated.
+Maybe this should really use some standard subroutine
 whose definition is filename syntax dependent.  */
-rc = strlen (initial_directory);
+{
-if (!(IS_DIRECTORY_SEP (initial_directory[rc - 1])))
+int len = strlen (initial_directory);
-{
-initial_directory[rc] = DIRECTORY_SEP;
+if (! IS_DIRECTORY_SEP (initial_directory[len - 1]))
-initial_directory[rc + 1] = '\0';
+{
-}
+	initial_directory[len] = DIRECTORY_SEP;
+	initial_directory[len + 1] = '\0';
+}
+}
 /* XEmacs change: store buffer's default directory
 using preferred (i.e. as defined at compile-time)
 directory separator. --marcpa */
 #ifdef DOS_NT
 #define CORRECT_DIR_SEPS(s) \
 {
 /* This function can GC */
 Fset_buffer (Fget_buffer_create (QSscratch));
-current_buffer->directory = build_string (initial_directory);
+current_buffer->directory =
+build_ext_string (initial_directory, FORMAT_FILENAME);
 #if 0 /* FSFmacs */
 /* #### is this correct? */
 temp = get_minibuffer (0);
 XBUFFER (temp)->directory = current_buffer->directory;

Mercurial > hg > xemacs-beta

comparison src/buffer.c @ 386:4af0ddfb7c5b r21-2-8