diff options
| author | Miles Bader | 2006-09-06 07:30:39 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-09-06 07:30:39 +0000 |
| commit | fae22cbf7f66b7adc732e46a27b821114c812fdd (patch) | |
| tree | a1c7545e4579d1da9d7d00d98287b1bff4dd0c26 /src/editfns.c | |
| parent | af6ea8ad8d62810d901561ae4a56d89f22ebacf0 (diff) | |
| parent | 04e28558df772845d83d5e870300b755b2528b57 (diff) | |
| download | emacs-fae22cbf7f66b7adc732e46a27b821114c812fdd.tar.gz emacs-fae22cbf7f66b7adc732e46a27b821114c812fdd.zip | |
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
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 2fcacc16901..10c5cbe1153 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -1692,7 +1692,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". */) | |||
| 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. */ |