[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/editfns.c,v [EMACS_22_BASE]
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] Changes to emacs/src/editfns.c,v [EMACS_22_BASE] |
Date: |
Thu, 15 Nov 2007 23:45:01 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Andreas Schwab <schwab> 07/11/15 23:45:01
Index: editfns.c
===================================================================
RCS file: /sources/emacs/emacs/src/editfns.c,v
retrieving revision 1.439.2.3
retrieving revision 1.439.2.4
diff -u -b -r1.439.2.3 -r1.439.2.4
--- editfns.c 8 Aug 2007 07:49:19 -0000 1.439.2.3
+++ editfns.c 15 Nov 2007 23:45:01 -0000 1.439.2.4
@@ -3803,6 +3803,19 @@
format - this_format_start);
this_format[format - this_format_start] = 0;
+ if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g')
+ sprintf (p, this_format, XFLOAT_DATA (args[n]));
+ else
+ {
+ if (sizeof (EMACS_INT) > sizeof (int))
+ {
+ /* Insert 'l' before format spec. */
+ this_format[format - this_format_start]
+ = this_format[format - this_format_start - 1];
+ this_format[format - this_format_start - 1] = 'l';
+ this_format[format - this_format_start + 1] = 0;
+ }
+
if (INTEGERP (args[n]))
{
if (format[-1] == 'd')
@@ -3811,8 +3824,6 @@
else
sprintf (p, this_format, XUINT (args[n]));
}
- else if (format[-1] == 'e' || format[-1] == 'f' || format[-1] ==
'g')
- sprintf (p, this_format, XFLOAT_DATA (args[n]));
else if (format[-1] == 'd')
/* Maybe we should use "%1.0f" instead so it also works
for values larger than MAXINT. */
@@ -3820,6 +3831,7 @@
else
/* Don't sign-extend for octal or hex printing. */
sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n]));
+ }
if (p > buf
&& multibyte
- [Emacs-diffs] Changes to emacs/src/editfns.c,v [EMACS_22_BASE],
Andreas Schwab <=
- [Emacs-diffs] Changes to emacs/src/editfns.c,v [EMACS_22_BASE], Andreas Schwab, 2007/11/15
- [Emacs-diffs] Changes to emacs/src/editfns.c,v [EMACS_22_BASE], Andreas Schwab, 2007/11/15
- [Emacs-diffs] Changes to emacs/src/editfns.c,v [EMACS_22_BASE], Andreas Schwab, 2007/11/15
- [Emacs-diffs] Changes to emacs/src/editfns.c,v [EMACS_22_BASE], Andreas Schwab, 2007/11/15
- [Emacs-diffs] Changes to emacs/src/editfns.c,v [EMACS_22_BASE], Andreas Schwab, 2007/11/23