diff options
| author | Dan Nicolaescu | 2010-04-15 11:24:00 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-04-15 11:24:00 -0700 |
| commit | 6bb244570e95ee5e7178d55ca94da8cec3b0a3c0 (patch) | |
| tree | 37ca0a37e047606c6d7fc8c02fd5d678e6d4f6c1 /src | |
| parent | bc319ba44872a8288c0bbbbfb0bee81f446d87e6 (diff) | |
| download | emacs-6bb244570e95ee5e7178d55ca94da8cec3b0a3c0.tar.gz emacs-6bb244570e95ee5e7178d55ca94da8cec3b0a3c0.zip | |
* xdisp.c (message): Do not use NO_ARG_ARRAY.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c962fe04af6..668dc24e229 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-04-15 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2010-04-15 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * xdisp.c (message): Do not use NO_ARG_ARRAY. | ||
| 4 | |||
| 3 | * frame.h (FRAME_SAMPLE_VISIBILITY): Remove unused 0 in comma expression. | 5 | * frame.h (FRAME_SAMPLE_VISIBILITY): Remove unused 0 in comma expression. |
| 4 | 6 | ||
| 5 | 2010-04-14 Dan Nicolaescu <dann@ics.uci.edu> | 7 | 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) | |||
| 8472 | if (m) | 8472 | if (m) |
| 8473 | { | 8473 | { |
| 8474 | int len; | 8474 | int len; |
| 8475 | #ifdef NO_ARG_ARRAY | ||
| 8476 | char *a[3]; | 8475 | char *a[3]; |
| 8477 | a[0] = (char *) a1; | 8476 | a[0] = (char *) a1; |
| 8478 | a[1] = (char *) a2; | 8477 | a[1] = (char *) a2; |
| @@ -8480,11 +8479,6 @@ message (m, a1, a2, a3) | |||
| 8480 | 8479 | ||
| 8481 | len = doprnt (FRAME_MESSAGE_BUF (f), | 8480 | len = doprnt (FRAME_MESSAGE_BUF (f), |
| 8482 | FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a); | 8481 | FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a); |
| 8483 | #else | ||
| 8484 | len = doprnt (FRAME_MESSAGE_BUF (f), | ||
| 8485 | FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, | ||
| 8486 | (char **) &a1); | ||
| 8487 | #endif /* NO_ARG_ARRAY */ | ||
| 8488 | 8482 | ||
| 8489 | message2 (FRAME_MESSAGE_BUF (f), len, 0); | 8483 | message2 (FRAME_MESSAGE_BUF (f), len, 0); |
| 8490 | } | 8484 | } |