diff options
| author | Paul Eggert | 2012-05-25 12:24:54 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-25 12:24:54 -0700 |
| commit | 243e053005d21aa66c2fc0d5be299d677de02fa5 (patch) | |
| tree | 6786f1135454bfd87bff9d143bf9c0a761e86ce4 /src/editfns.c | |
| parent | 42b2a986d9d4b7040fb20c90ec0efeffb78e761a (diff) | |
| download | emacs-243e053005d21aa66c2fc0d5be299d677de02fa5.tar.gz emacs-243e053005d21aa66c2fc0d5be299d677de02fa5.zip | |
Merge recent dbus changes better.
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/editfns.c b/src/editfns.c index 6d59b89513c..8f7b2aee76c 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -1695,7 +1695,7 @@ format_time_string (char const *format, ptrdiff_t formatlen, | |||
| 1695 | { | 1695 | { |
| 1696 | char buffer[4000]; | 1696 | char buffer[4000]; |
| 1697 | char *buf = buffer; | 1697 | char *buf = buffer; |
| 1698 | size_t size = sizeof buffer; | 1698 | ptrdiff_t size = sizeof buffer; |
| 1699 | size_t len; | 1699 | size_t len; |
| 1700 | Lisp_Object bufstring; | 1700 | Lisp_Object bufstring; |
| 1701 | int usec; | 1701 | int usec; |