diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-16 18:08:22 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-16 18:08:22 -0400 |
| commit | 78be8b64657aeca0472d708450ea1ce2bc142606 (patch) | |
| tree | dccbdc45e747a47b44be92abab79cca15a30111f /lib-src | |
| parent | 6615748ac6bcff258ef548f70bdcc1ab9f740472 (diff) | |
| parent | 67ed8fcd04edeff2d4931acf476e7067c5ceeef2 (diff) | |
| download | emacs-78be8b64657aeca0472d708450ea1ce2bc142606.tar.gz | |
Merge from emacs-24
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 16 | ||||
| -rw-r--r-- | lib-src/pop.c | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index d8ec0579422..0d7a0a4591e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,13 @@ +2013-03-16 Paul Eggert <eggert@cs.ucla.edu> + + * pop.c: Fix ERRMAX typo (Bug#13925). + (socket_connection) [!HAVE_KRB5_ERROR_TEXT && HAVE_KRB5_ERROR_E_TEXT]: + Use ERROR_MAX, not ERRMAX. + +2013-03-16 Glenn Morris <rgm@gnu.org> + + * Version 24.3 released. + 2013-03-13 Paul Eggert <eggert@cs.ucla.edu> File synchronization fixes (Bug#13944). @@ -6,8 +16,8 @@ * emacsclient.c (main): Use fdatasync, not fsync, since we don't care about metadata. Keep trying if interrupted. * movemail.c (main, popmail): Don't worry about BSD_SYSTEM, since - fsync is available everywhere (or there is a substitute). Don't - report an error if fsync returns EINVAL. + fsync is available everywhere (or there is a substitute). + Don't report an error if fsync returns EINVAL. Static checking by Sun C 5.12. * etags.c (analyse_regex): Omit unreachable code. @@ -5182,7 +5192,7 @@ (longopts): New long options without short counterpart are globals, members, no-globals, no-members. Regexp options are now defined conditionally to ETAGS_REGEXPS. - (print_help): Updated. + (print_help): Update. 1997-05-22 Francesco Potortì <F.Potorti@cnuce.cnr.it> diff --git a/lib-src/pop.c b/lib-src/pop.c index ba384db3d19..1f3f82baa68 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -1198,7 +1198,7 @@ socket_connection (char *host, int flags) } #elif defined HAVE_KRB5_ERROR_E_TEXT if (err_ret && err_ret->e_text && **err_ret->e_text) - snprintf (pop_error + pop_error_len, ERRMAX - pop_error_len, + snprintf (pop_error + pop_error_len, ERROR_MAX - pop_error_len, " [server says '%s']", *err_ret->e_text); #endif if (err_ret) |