diff options
| author | Kenichi Handa | 2004-01-08 08:40:12 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2004-01-08 08:40:12 +0000 |
| commit | 3a9f36e6345fb62fb47b831850384b28ae81f4a3 (patch) | |
| tree | 7a7ebdb9e6ce66ab0397a3f52f8bb047dd5a5603 /src | |
| parent | c9ec040a0de0c3d2b336adddbe697a1eaaca3210 (diff) | |
| download | emacs-3a9f36e6345fb62fb47b831850384b28ae81f4a3.tar.gz emacs-3a9f36e6345fb62fb47b831850384b28ae81f4a3.zip | |
(Fformat): Fix '&' to '&&'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f42395977c9..44d922a254e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-01-08 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * editfns.c (Fformat): Fix '&' to '&&'. | ||
| 4 | |||
| 1 | 2004-01-08 Andreas Schwab <schwab@suse.de> | 5 | 2004-01-08 Andreas Schwab <schwab@suse.de> |
| 2 | 6 | ||
| 3 | * print.c (print_preprocess) <case Lisp_Vectorlike>: Only mask | 7 | * print.c (print_preprocess) <case Lisp_Vectorlike>: Only mask |
diff --git a/src/editfns.c b/src/editfns.c index 0b71d105155..a636c35a464 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3447,7 +3447,7 @@ usage: (format STRING &rest OBJECTS) */) | |||
| 3447 | /* Anything but a string, convert to a string using princ. */ | 3447 | /* Anything but a string, convert to a string using princ. */ |
| 3448 | register Lisp_Object tem; | 3448 | register Lisp_Object tem; |
| 3449 | tem = Fprin1_to_string (args[n], Qt); | 3449 | tem = Fprin1_to_string (args[n], Qt); |
| 3450 | if (STRING_MULTIBYTE (tem) & ! multibyte) | 3450 | if (STRING_MULTIBYTE (tem) && ! multibyte) |
| 3451 | { | 3451 | { |
| 3452 | multibyte = 1; | 3452 | multibyte = 1; |
| 3453 | goto retry; | 3453 | goto retry; |