comparison src/buffer.c @ 4959:bd169a24a554

merge
author Ben Wing <ben@xemacs.org>
date Thu, 28 Jan 2010 04:27:30 -0600
parents 304aebb79cd3
children 16112448d484
comparison
equal deleted inserted replaced
4893:99f2102552d7 4959:bd169a24a554
307 printing_unreadable_object ("#<killed buffer>"); 307 printing_unreadable_object ("#<killed buffer>");
308 else 308 else
309 printing_unreadable_object ("#<buffer %s>", XSTRING_DATA (b->name)); 309 printing_unreadable_object ("#<buffer %s>", XSTRING_DATA (b->name));
310 } 310 }
311 else if (!BUFFER_LIVE_P (b)) 311 else if (!BUFFER_LIVE_P (b))
312 write_c_string (printcharfun, "#<killed buffer>"); 312 write_ascstring (printcharfun, "#<killed buffer>");
313 else if (escapeflag) 313 else if (escapeflag)
314 write_fmt_string_lisp (printcharfun, "#<buffer %S>", 1, b->name); 314 write_fmt_string_lisp (printcharfun, "#<buffer %S>", 1, b->name);
315 else 315 else
316 print_internal (b->name, printcharfun, 0); 316 print_internal (b->name, printcharfun, 0);
317 } 317 }
786 786
787 count = 1; 787 count = 1;
788 while (1) 788 while (1)
789 { 789 {
790 qxesprintf (number, "<%d>", ++count); 790 qxesprintf (number, "<%d>", ++count);
791 gentemp = concat2 (name, build_intstring (number)); 791 gentemp = concat2 (name, build_istring (number));
792 if (!NILP (ignore)) 792 if (!NILP (ignore))
793 { 793 {
794 tem = Fstring_equal (gentemp, ignore); 794 tem = Fstring_equal (gentemp, ignore);
795 if (!NILP (tem)) 795 if (!NILP (tem))
796 return gentemp; 796 return gentemp;
1996 { 1996 {
1997 /* This function can GC */ 1997 /* This function can GC */
1998 staticpro (&QSFundamental); 1998 staticpro (&QSFundamental);
1999 staticpro (&QSscratch); 1999 staticpro (&QSscratch);
2000 2000
2001 QSFundamental = build_string ("Fundamental"); 2001 QSFundamental = build_ascstring ("Fundamental");
2002 QSscratch = build_string (DEFER_GETTEXT ("*scratch*")); 2002 QSscratch = build_ascstring ("*scratch*");
2003 2003
2004 DEFVAR_LISP ("change-major-mode-hook", &Vchange_major_mode_hook /* 2004 DEFVAR_LISP ("change-major-mode-hook", &Vchange_major_mode_hook /*
2005 List of hooks to be run before killing local variables in a buffer. 2005 List of hooks to be run before killing local variables in a buffer.
2006 This should be used by any mode that temporarily alters the contents or 2006 This should be used by any mode that temporarily alters the contents or
2007 the read-only state of the buffer. See also `kill-all-local-variables'. 2007 the read-only state of the buffer. See also `kill-all-local-variables'.
2256 defs->category_table = Vstandard_category_table; 2256 defs->category_table = Vstandard_category_table;
2257 #endif /* MULE */ 2257 #endif /* MULE */
2258 defs->syntax_table = Vstandard_syntax_table; 2258 defs->syntax_table = Vstandard_syntax_table;
2259 defs->mirror_syntax_table = 2259 defs->mirror_syntax_table =
2260 XCHAR_TABLE (Vstandard_syntax_table)->mirror_table; 2260 XCHAR_TABLE (Vstandard_syntax_table)->mirror_table;
2261 defs->modeline_format = build_string ("%-"); /* reset in loaddefs.el */ 2261 defs->modeline_format = build_ascstring ("%-"); /* reset in loaddefs.el */
2262 defs->case_fold_search = Qt; 2262 defs->case_fold_search = Qt;
2263 defs->selective_display_ellipses = Qt; 2263 defs->selective_display_ellipses = Qt;
2264 defs->tab_width = make_int (8); 2264 defs->tab_width = make_int (8);
2265 defs->ctl_arrow = Qt; 2265 defs->ctl_arrow = Qt;
2266 defs->fill_column = make_int (70); 2266 defs->fill_column = make_int (70);
2933 Ibyte *errmess; 2933 Ibyte *errmess;
2934 GET_STRERROR (errmess, errno); 2934 GET_STRERROR (errmess, errno);
2935 stderr_out ("`getcwd' failed: %s: changing default directory to %s\n", 2935 stderr_out ("`getcwd' failed: %s: changing default directory to %s\n",
2936 errmess, DEFAULT_DIRECTORY_FALLBACK); 2936 errmess, DEFAULT_DIRECTORY_FALLBACK);
2937 2937
2938 if (qxe_chdir ((Ibyte *)DEFAULT_DIRECTORY_FALLBACK) < 0) 2938 if (qxe_chdir ((Ibyte *) DEFAULT_DIRECTORY_FALLBACK) < 0)
2939 { 2939 {
2940 GET_STRERROR (errmess, errno); 2940 GET_STRERROR (errmess, errno);
2941 2941
2942 fatal ("could not `chdir' to `%s': %s\n", 2942 fatal ("could not `chdir' to `%s': %s\n",
2943 DEFAULT_DIRECTORY_FALLBACK, errmess); 2943 DEFAULT_DIRECTORY_FALLBACK, errmess);
2997 init_buffer_2 (void) 2997 init_buffer_2 (void)
2998 { 2998 {
2999 /* This function can GC */ 2999 /* This function can GC */
3000 Fset_buffer (Fget_buffer (QSscratch)); 3000 Fset_buffer (Fget_buffer (QSscratch));
3001 3001
3002 current_buffer->directory = build_intstring (initial_directory); 3002 current_buffer->directory = build_istring (initial_directory);
3003 3003
3004 #if 0 /* FSFmacs */ 3004 #if 0 /* FSFmacs */
3005 /* #### is this correct? */ 3005 /* #### is this correct? */
3006 temp = get_minibuffer (0); 3006 temp = get_minibuffer (0);
3007 XBUFFER (temp)->directory = current_buffer->directory; 3007 XBUFFER (temp)->directory = current_buffer->directory;