diff options
| author | Andreas Schwab | 2007-11-16 00:19:41 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2007-11-16 00:19:41 +0000 |
| commit | 6af41c87dfc91b3cc980467b074e5efed3998ed5 (patch) | |
| tree | a30cbc0bc91a1ef811636bbaefe020331b00e272 /src | |
| parent | 791e6ff67d2d04940e1771d98bfe044821ccf31c (diff) | |
| download | emacs-6af41c87dfc91b3cc980467b074e5efed3998ed5.tar.gz emacs-6af41c87dfc91b3cc980467b074e5efed3998ed5.zip | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 96b0d5f5e3f..e620d1e9e9e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | 2007-11-15 Andreas Schwab <schwab@suse.de> | 1 | 2007-11-15 Andreas Schwab <schwab@suse.de> |
| 2 | 2 | ||
| 3 | * editfns.c (Fformat): Correctly format EMACS_INT values. | 3 | * editfns.c (Fformat): Correctly format EMACS_INT values. Also |
| 4 | When formatting an integer as float take precision into account. | 4 | take precision into account when formatting an integer. |
| 5 | 5 | ||
| 6 | 2007-11-15 Juanma Barranquero <lekktu@gmail.com> | 6 | 2007-11-15 Juanma Barranquero <lekktu@gmail.com> |
| 7 | 7 | ||
diff --git a/src/editfns.c b/src/editfns.c index 06fb1413b02..bcfe5756034 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3601,11 +3601,7 @@ usage: (format STRING &rest OBJECTS) */) | |||
| 3601 | So make sure we have a flonum if the argument should | 3601 | So make sure we have a flonum if the argument should |
| 3602 | be a double. */ | 3602 | be a double. */ |
| 3603 | if (*format == 'e' || *format == 'f' || *format == 'g') | 3603 | if (*format == 'e' || *format == 'f' || *format == 'g') |
| 3604 | { | 3604 | args[n] = Ffloat (args[n]); |
| 3605 | args[n] = Ffloat (args[n]); | ||
| 3606 | if (precision[n] > 0) | ||
| 3607 | thissize += precision[n]; | ||
| 3608 | } | ||
| 3609 | else | 3605 | else |
| 3610 | if (*format != 'd' && *format != 'o' && *format != 'x' | 3606 | if (*format != 'd' && *format != 'o' && *format != 'x' |
| 3611 | && *format != 'i' && *format != 'X' && *format != 'c') | 3607 | && *format != 'i' && *format != 'X' && *format != 'c') |