Mercurial > emacs

comparison src/buffer.c @ 83561:dc002877ce12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-674 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-675 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-676 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-677 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-678 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-679 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-680 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-681 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-682 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-683 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-684 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-685 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-686 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-687 Release ERC 5.2. * emacs@sv.gnu.org/emacs--devo--0--patch-688 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-689 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-690 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-691 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-692 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-693 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-694 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-695 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-696 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-697 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-698 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-699 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-700 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-701 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-209 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-210 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-211 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-212 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-213 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-214 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-215 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-601
author Karoly Lorentey <karoly@lorentey.hu>
date Sun, 22 Apr 2007 12:42:47 +0000
parents 738ce3540ffb 421b3f5480da
children cc587bfd19ca
comparison
equal deleted inserted replaced
83560:738ce3540ffb 83561:dc002877ce12
1469 #ifdef CLASH_DETECTION 1469 #ifdef CLASH_DETECTION
1470 /* Unlock this buffer's file, if it is locked. */ 1470 /* Unlock this buffer's file, if it is locked. */
1471 unlock_buffer (b); 1471 unlock_buffer (b);
1472 #endif /* CLASH_DETECTION */ 1472 #endif /* CLASH_DETECTION */
1473 1473
1474 GCPRO1 (buf);
1474 kill_buffer_processes (buf); 1475 kill_buffer_processes (buf);
1476 UNGCPRO;
1477
1478 /* Killing buffer processes may run sentinels which may
1479 have called kill-buffer. */
1480
1481 if (NILP (b->name))
1482 return Qnil;
1483
1475 clear_charpos_cache (b); 1484 clear_charpos_cache (b);
1476 1485
1477 tem = Vinhibit_quit; 1486 tem = Vinhibit_quit;
1478 Vinhibit_quit = Qt; 1487 Vinhibit_quit = Qt;
1479 replace_buffer_in_all_windows (buf); 1488 replace_buffer_in_all_windows (buf);
1641 (buffer) 1650 (buffer)
1642 Lisp_Object buffer; 1651 Lisp_Object buffer;
1643 { 1652 {
1644 int count; 1653 int count;
1645 Lisp_Object function; 1654 Lisp_Object function;
1655
1656 CHECK_BUFFER (buffer);
1646 1657
1647 if (STRINGP (XBUFFER (buffer)->name) 1658 if (STRINGP (XBUFFER (buffer)->name)
1648 && strcmp (SDATA (XBUFFER (buffer)->name), "*scratch*") == 0) 1659 && strcmp (SDATA (XBUFFER (buffer)->name), "*scratch*") == 0)
1649 function = find_symbol_value (intern ("initial-major-mode")); 1660 function = find_symbol_value (intern ("initial-major-mode"));
1650 else 1661 else