comparison src/buffer.c @ 90261:7beb78bc1f8e

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 616-696) - Add lisp/mh-e/.arch-inventory - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords. - lisp/gnus/ChangeLog: Remove duplicate entry * gnus--rel--5.10 (patch 147-181) - Update from CVS - Merge from emacs--cvs-trunk--0 - Update from CVS: lisp/mml.el (mml-preview): Doc fix. - Update from CVS: texi/message.texi: Fix default values. - Update from CVS: texi/gnus.texi (RSS): Addition.
author Miles Bader <miles@gnu.org>
date Mon, 16 Jan 2006 08:37:27 +0000
parents 0ca0d9181b5e a4a1c5b73301
children c5406394f567
comparison
equal deleted inserted replaced
90260:0ca0d9181b5e 90261:7beb78bc1f8e
1358 set_buffer_internal (b); 1358 set_buffer_internal (b);
1359 1359
1360 /* First run the query functions; if any query is answered no, 1360 /* First run the query functions; if any query is answered no,
1361 don't kill the buffer. */ 1361 don't kill the buffer. */
1362 arglist[0] = Qkill_buffer_query_functions; 1362 arglist[0] = Qkill_buffer_query_functions;
1363 if (NILP (Frun_hook_with_args_until_failure (1, arglist))) 1363 tem = Frun_hook_with_args_until_failure (1, arglist);
1364 if (NILP (tem))
1364 return unbind_to (count, Qnil); 1365 return unbind_to (count, Qnil);
1365 1366
1366 /* Then run the hooks. */ 1367 /* Then run the hooks. */
1367 Frun_hooks (1, &Qkill_buffer_hook); 1368 Frun_hooks (1, &Qkill_buffer_hook);
1368 unbind_to (count, Qnil); 1369 unbind_to (count, Qnil);
1721 buf = Fget_buffer_create (buffer); 1722 buf = Fget_buffer_create (buffer);
1722 Fset_buffer_major_mode (buf); 1723 Fset_buffer_major_mode (buf);
1723 } 1724 }
1724 } 1725 }
1725 Fset_buffer (buf); 1726 Fset_buffer (buf);
1726 if (NILP (norecord))
1727 /* Why bother ? Fselect_window will do it for us anyway. -stef */
1728 record_buffer (buf);
1729 Fselect_window (Fdisplay_buffer (buf, other_window, Qnil), norecord); 1727 Fselect_window (Fdisplay_buffer (buf, other_window, Qnil), norecord);
1730 return buf; 1728 return buf;
1731 } 1729 }
1732 1730
1733 DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, 1731 DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0,