[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117148: Fix last commits in xdisp.c, which cause
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-24 r117148: Fix last commits in xdisp.c, which caused a crash at startup on w32. |
Date: |
Sat, 24 May 2014 19:20:15 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117148
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17577
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-05-24 22:19:27 +0300
message:
Fix last commits in xdisp.c, which caused a crash at startup on w32.
src/xdisp.c (safe__call): Accept va_list argument instead of '...'.
(safe_call, safe__call1): Construct a va_list argument for safe_call.
(safe_call1): Call safe_call instead of safe__call directly.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-05-24 17:59:22 +0000
+++ b/src/ChangeLog 2014-05-24 19:19:27 +0000
@@ -1,3 +1,9 @@
+2014-05-24 Eli Zaretskii <address@hidden>
+
+ * xdisp.c (safe__call): Accept va_list argument instead of '...'.
+ (safe_call, safe__call1): Construct a va_list argument for safe_call.
+ (safe_call1): Call safe_call instead of safe__call directly.
+
2014-05-24 Ken Brown <address@hidden>
* w32term.c (x_delete_display) [CYGWIN]: Don't free
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2014-05-24 15:50:05 +0000
+++ b/src/xdisp.c 2014-05-24 19:19:27 +0000
@@ -2592,7 +2592,7 @@
wrong. Prevent redisplay during the evaluation. */
static Lisp_Object
-safe__call (bool inhibit_quit, ptrdiff_t nargs, Lisp_Object func, ...)
+safe__call (bool inhibit_quit, ptrdiff_t nargs, Lisp_Object func, va_list ap)
{
Lisp_Object val;
@@ -2600,17 +2600,14 @@
val = Qnil;
else
{
- va_list ap;
ptrdiff_t i;
ptrdiff_t count = SPECPDL_INDEX ();
struct gcpro gcpro1;
Lisp_Object *args = alloca (nargs * word_size);
args[0] = func;
- va_start (ap, func);
for (i = 1; i < nargs; i++)
args[i] = va_arg (ap, Lisp_Object);
- va_end (ap);
GCPRO1 (args[0]);
gcpro1.nvars = nargs;
@@ -2631,7 +2628,13 @@
Lisp_Object
safe_call (ptrdiff_t nargs, Lisp_Object func, ...)
{
- return safe__call (false, nargs, func);
+ Lisp_Object retval;
+ va_list ap;
+
+ va_start (ap, func);
+ retval = safe__call (false, nargs, func, ap);
+ va_end (ap);
+ return retval;
}
/* Call function FN with one argument ARG.
@@ -2640,13 +2643,19 @@
Lisp_Object
safe_call1 (Lisp_Object fn, Lisp_Object arg)
{
- return safe__call (false, 2, fn, arg);
+ return safe_call (2, fn, arg);
}
Lisp_Object
-safe__call1 (bool inhibit_quit, Lisp_Object fn, Lisp_Object arg)
+safe__call1 (bool inhibit_quit, Lisp_Object fn, ...)
{
- return safe__call (inhibit_quit, 2, fn, arg);
+ Lisp_Object retval;
+ va_list ap;
+
+ va_start (ap, fn);
+ retval = safe__call (inhibit_quit, 2, fn, ap);
+ va_end (ap);
+ return retval;
}
static Lisp_Object Qeval;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117148: Fix last commits in xdisp.c, which caused a crash at startup on w32.,
Eli Zaretskii <=