From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Thu, 15 Apr 2010 18:24:00 +0000 (-0700)
Subject: * xdisp.c (message): Do not use NO_ARG_ARRAY.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~504
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6bb244570e95ee5e7178d55ca94da8cec3b0a3c0;p=emacs.git

* xdisp.c (message): Do not use NO_ARG_ARRAY.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c962fe04af6..668dc24e229 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-04-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* xdisp.c (message): Do not use NO_ARG_ARRAY.
+
 	* frame.h (FRAME_SAMPLE_VISIBILITY): Remove unused 0 in comma expression.
 
 2010-04-14  Dan Nicolaescu  <dann@ics.uci.edu>
diff --git a/src/xdisp.c b/src/xdisp.c
index 902651dcc44..7523da8bd7b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8472,7 +8472,6 @@ message (m, a1, a2, a3)
 	  if (m)
 	    {
 	      int len;
-#ifdef NO_ARG_ARRAY
 	      char *a[3];
 	      a[0] = (char *) a1;
 	      a[1] = (char *) a2;
@@ -8480,11 +8479,6 @@ message (m, a1, a2, a3)
 
 	      len = doprnt (FRAME_MESSAGE_BUF (f),
 			    FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a);
-#else
-	      len = doprnt (FRAME_MESSAGE_BUF (f),
-			    FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3,
-			    (char **) &a1);
-#endif /* NO_ARG_ARRAY */
 
 	      message2 (FRAME_MESSAGE_BUF (f), len, 0);
 	    }