diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /lib-src/pop.c | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'lib-src/pop.c')
| -rw-r--r-- | lib-src/pop.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 1198 | } | 1198 | } |
| 1199 | #elif defined HAVE_KRB5_ERROR_E_TEXT | 1199 | #elif defined HAVE_KRB5_ERROR_E_TEXT |
| 1200 | if (err_ret && err_ret->e_text && **err_ret->e_text) | 1200 | if (err_ret && err_ret->e_text && **err_ret->e_text) |
| 1201 | snprintf (pop_error + pop_error_len, ERRMAX - pop_error_len, | 1201 | snprintf (pop_error + pop_error_len, ERROR_MAX - pop_error_len, |
| 1202 | " [server says '%s']", *err_ret->e_text); | 1202 | " [server says '%s']", *err_ret->e_text); |
| 1203 | #endif | 1203 | #endif |
| 1204 | if (err_ret) | 1204 | if (err_ret) |