diff options
| author | Andreas Schwab | 2002-11-01 22:35:02 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2002-11-01 22:35:02 +0000 |
| commit | 304f1f12d6401c55e2c50a0355a5e0e7b51292b0 (patch) | |
| tree | 0fc5810a93c5f0633745b14c0b1093e989378718 /src | |
| parent | 86fad4ec405473d3e8c1c72532f38779b68f4c1f (diff) | |
| download | emacs-304f1f12d6401c55e2c50a0355a5e0e7b51292b0.tar.gz emacs-304f1f12d6401c55e2c50a0355a5e0e7b51292b0.zip | |
(Fmessage): Revert last change to properly handle %% format.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/editfns.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3a81632c844..4feabdd5d7b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2002-11-01 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * editfns.c (Fmessage): Revert last change to properly handle %% | ||
| 4 | format. | ||
| 5 | |||
| 1 | 2002-11-01 Stefan Monnier <monnier@cs.yale.edu> | 6 | 2002-11-01 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 7 | ||
| 3 | * xmenu.c (unuse_menu_items): New fun. | 8 | * xmenu.c (unuse_menu_items): New fun. |
diff --git a/src/editfns.c b/src/editfns.c index 57c96ff7844..7fb203c854b 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3027,7 +3027,7 @@ usage: (message STRING &rest ARGS) */) | |||
| 3027 | else | 3027 | else |
| 3028 | { | 3028 | { |
| 3029 | register Lisp_Object val; | 3029 | register Lisp_Object val; |
| 3030 | val = nargs < 2 && STRINGP (args[0]) ? args[0] : Fformat (nargs, args); | 3030 | val = Fformat (nargs, args); |
| 3031 | message3 (val, SBYTES (val), STRING_MULTIBYTE (val)); | 3031 | message3 (val, SBYTES (val), STRING_MULTIBYTE (val)); |
| 3032 | return val; | 3032 | return val; |
| 3033 | } | 3033 | } |