Mercurial > emacs
comparison src/editfns.c @ 90600:84dd84b43e1b
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 423-426)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 131-133)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-109
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 06 Sep 2006 07:30:39 +0000 |
| parents | c358d0861b16 d8f99fba05ca |
| children | a1a25ac6c88a |
comparison
equal
deleted
inserted
replaced
| 90599:c358d0861b16 | 90600:84dd84b43e1b |
|---|---|
| 1690 buf[0] = '\1'; | 1690 buf[0] = '\1'; |
| 1691 result = emacs_memftimeu (buf, size, SDATA (format_string), | 1691 result = emacs_memftimeu (buf, size, SDATA (format_string), |
| 1692 SBYTES (format_string), | 1692 SBYTES (format_string), |
| 1693 tm, ut); | 1693 tm, ut); |
| 1694 if ((result > 0 && result < size) || (result == 0 && buf[0] == '\0')) | 1694 if ((result > 0 && result < size) || (result == 0 && buf[0] == '\0')) |
| 1695 return code_convert_string_norecord (make_string (buf, result), | 1695 return code_convert_string_norecord (make_unibyte_string (buf, result), |
| 1696 Vlocale_coding_system, 0); | 1696 Vlocale_coding_system, 0); |
| 1697 | 1697 |
| 1698 /* If buffer was too small, make it bigger and try again. */ | 1698 /* If buffer was too small, make it bigger and try again. */ |
| 1699 result = emacs_memftimeu (NULL, (size_t) -1, | 1699 result = emacs_memftimeu (NULL, (size_t) -1, |
| 1700 SDATA (format_string), | 1700 SDATA (format_string), |