comparison src/buffer.c @ 90533:8a8e69664178

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 343-356) - Update from CVS - Update for ERC 5.1.3. - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 113-115) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90
author Miles Bader <miles@gnu.org>
date Wed, 19 Jul 2006 00:42:56 +0000
parents a8190f7e546e b0505e901bff
children 7f3f771c85fa
comparison
equal deleted inserted replaced
90532:e22cf6d2400c 90533:8a8e69664178
937 937
938 /* Now get the (perhaps updated) value out of the binding. */ 938 /* Now get the (perhaps updated) value out of the binding. */
939 result = XCDR (result); 939 result = XCDR (result);
940 } 940 }
941 941
942 if (EQ (result, Qunbound)) 942 if (!EQ (result, Qunbound))
943 return Fsignal (Qvoid_variable, Fcons (variable, Qnil)); 943 return result;
944 944
945 return result; 945 xsignal1 (Qvoid_variable, variable);
946 } 946 }
947 947
948 /* Return an alist of the Lisp-level buffer-local bindings of 948 /* Return an alist of the Lisp-level buffer-local bindings of
949 buffer BUF. That is, don't include the variables maintained 949 buffer BUF. That is, don't include the variables maintained
950 in special slots in the buffer object. */ 950 in special slots in the buffer object. */
1960 doc: /* Signal a `buffer-read-only' error if the current buffer is read-only. */) 1960 doc: /* Signal a `buffer-read-only' error if the current buffer is read-only. */)
1961 () 1961 ()
1962 { 1962 {
1963 if (!NILP (current_buffer->read_only) 1963 if (!NILP (current_buffer->read_only)
1964 && NILP (Vinhibit_read_only)) 1964 && NILP (Vinhibit_read_only))
1965 Fsignal (Qbuffer_read_only, (Fcons (Fcurrent_buffer (), Qnil))); 1965 xsignal1 (Qbuffer_read_only, Fcurrent_buffer ());
1966 return Qnil; 1966 return Qnil;
1967 } 1967 }
1968 1968
1969 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "", 1969 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "",
1970 doc: /* Put BUFFER at the end of the list of all buffers. 1970 doc: /* Put BUFFER at the end of the list of all buffers.