Mercurial > emacs

comparison src/buffer.c @ 83533:02e39decdc84

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-351 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-352 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-353 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-354 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-355 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-356 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-357 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-358 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-359 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-360 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-361 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-362 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-363 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-364 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-365 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-366 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-367 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-368 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-369 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-370 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-115 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-116 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-117 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-118 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-119 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-120 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-573
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 29 Jul 2006 09:59:12 +0000
parents 46b1096093f5 b0505e901bff
children 694bbb62a75d
comparison
equal deleted inserted replaced
83532:b19aaf4ab0ee 83533:02e39decdc84
949 949
950 /* Now get the (perhaps updated) value out of the binding. */ 950 /* Now get the (perhaps updated) value out of the binding. */
951 result = XCDR (result); 951 result = XCDR (result);
952 } 952 }
953 953
954 if (EQ (result, Qunbound)) 954 if (!EQ (result, Qunbound))
955 return Fsignal (Qvoid_variable, Fcons (variable, Qnil)); 955 return result;
956 956
957 return result; 957 xsignal1 (Qvoid_variable, variable);
958 } 958 }
959 959
960 /* Return an alist of the Lisp-level buffer-local bindings of 960 /* Return an alist of the Lisp-level buffer-local bindings of
961 buffer BUF. That is, don't include the variables maintained 961 buffer BUF. That is, don't include the variables maintained
962 in special slots in the buffer object. */ 962 in special slots in the buffer object. */
1989 doc: /* Signal a `buffer-read-only' error if the current buffer is read-only. */) 1989 doc: /* Signal a `buffer-read-only' error if the current buffer is read-only. */)
1990 () 1990 ()
1991 { 1991 {
1992 if (!NILP (current_buffer->read_only) 1992 if (!NILP (current_buffer->read_only)
1993 && NILP (Vinhibit_read_only)) 1993 && NILP (Vinhibit_read_only))
1994 Fsignal (Qbuffer_read_only, (Fcons (Fcurrent_buffer (), Qnil))); 1994 xsignal1 (Qbuffer_read_only, Fcurrent_buffer ());
1995 return Qnil; 1995 return Qnil;
1996 } 1996 }
1997 1997
1998 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "", 1998 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "",
1999 doc: /* Put BUFFER at the end of the list of all buffers. 1999 doc: /* Put BUFFER at the end of the list of all buffers.