diff options
| author | Karoly Lorentey <[email protected]> | 2006-07-29 09:59:12 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2006-07-29 09:59:12 +0000 |
| commit | 251bc578cc636223d618d06cf2a2bb7d07db9cce (patch) | |
| tree | 58e1c6b0a35bb4a77e6cb77876e4bc6a9d3f2ab2 /src/buffer.c | |
| parent | 99715bbc447eb633e45ffa23b87284771ce3ac74 (diff) | |
| parent | 0ed0527cb02180a50f6744086ce3a487740c73e4 (diff) | |
Merged from [email protected]
Patches applied:
* [email protected]/emacs--devo--0--patch-351
Update from CVS
* [email protected]/emacs--devo--0--patch-352
Update from CVS
* [email protected]/emacs--devo--0--patch-353
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-354
Update from CVS
* [email protected]/emacs--devo--0--patch-355
Update from CVS
* [email protected]/emacs--devo--0--patch-356
Update from CVS
* [email protected]/emacs--devo--0--patch-357
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-358
Update from CVS
* [email protected]/emacs--devo--0--patch-359
Update from CVS
* [email protected]/emacs--devo--0--patch-360
Update from CVS
* [email protected]/emacs--devo--0--patch-361
Update from CVS
* [email protected]/emacs--devo--0--patch-362
Update from CVS
* [email protected]/emacs--devo--0--patch-363
Update from CVS
* [email protected]/emacs--devo--0--patch-364
Update from CVS
* [email protected]/emacs--devo--0--patch-365
Update from CVS
* [email protected]/emacs--devo--0--patch-366
Update from CVS
* [email protected]/emacs--devo--0--patch-367
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-368
Update from CVS
* [email protected]/emacs--devo--0--patch-369
Update from CVS
* [email protected]/emacs--devo--0--patch-370
Update from CVS
* [email protected]/gnus--rel--5.10--patch-115
Update from CVS
* [email protected]/gnus--rel--5.10--patch-116
Update from CVS
* [email protected]/gnus--rel--5.10--patch-117
Update from CVS
* [email protected]/gnus--rel--5.10--patch-118
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-119
Update from CVS
* [email protected]/gnus--rel--5.10--patch-120
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-573
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/buffer.c b/src/buffer.c index 73db9d2141..dc6bcd8f6d 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -951,10 +951,10 @@ is the default binding of the variable. */) result = XCDR (result); } - if (EQ (result, Qunbound)) - return Fsignal (Qvoid_variable, Fcons (variable, Qnil)); + if (!EQ (result, Qunbound)) + return result; - return result; + xsignal1 (Qvoid_variable, variable); } /* Return an alist of the Lisp-level buffer-local bindings of @@ -1991,7 +1991,7 @@ DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, { if (!NILP (current_buffer->read_only) && NILP (Vinhibit_read_only)) - Fsignal (Qbuffer_read_only, (Fcons (Fcurrent_buffer (), Qnil))); + xsignal1 (Qbuffer_read_only, Fcurrent_buffer ()); return Qnil; } |