summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-03-03 23:53:08 -0800
committerJohn Wiegley <johnw@newartisans.com>2016-03-03 23:53:08 -0800
commit692caf1e8d1657fbe4809294df6791c2879a7bb1 (patch)
tree0c6357b6325adbf0d675851d7a655ce9636b51e7 /lib-src
parent018bdf7528d0d4bb0560d86b84c21ae9fed1206a (diff)
parentb13cab683c6060e002906fc944680aaa5f4ac123 (diff)
downloademacs-692caf1e8d1657fbe4809294df6791c2879a7bb1.tar.gz
Merge from origin/emacs-25
b13cab6 Add a eww command to toggle paragraph direction 4e46128 * nextstep/WISHLIST: Merge into etc/TODO and remove. 9e078e5 Fix char signedness issue in bidi code 064adf6 * lib-src/pop.c (socket_connection): Fix format string. 14060a9 Avoid inflooping in thing-at-point-looking-at 098d47b * lisp/emacs-lisp/derived.el (define-derived-mode): Revert indent change. b5db8e0 etc/PROBLEMS: Mention problems with using file descriptors ec10ef9 * lisp/apropos.el (apropos-variable): Doc fix. (Bug#22813). d2dd614 Remove unneeded workaround in xftfont.c 9b7593c ; * etc/NEWS: Reflect latest changes in saveplace. fde0cd1 * lisp/saveplace.el (save-place-local-mode): New minor mode 06a872b Fix redisplay on a TTY after 'make-frame' 95f5a43 Make double-click-1 work with unbalanced parens in CC Mode. Fixes bug#5560. 7d206fc Input method polish-slash should not use keyboard translation 8be32cf Fix an assertion 040e0d6 Fix 'toggle-save-place' 5244db2 * src/keyboard.c: Don't inadvertently set immediate_echo (bug#22581)
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/pop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 57a5e529daf..812bd4ca24c 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1184,7 +1184,7 @@ socket_connection (char *host, int flags)
{
int errlen = err_ret->text.length;
snprintf (pop_error + pop_error_len, ERROR_MAX - pop_error_len,
- " [server says '.*%s']", errlen, err_ret->text.data);
+ " [server says '%.*s']", errlen, err_ret->text.data);
}
#elif defined HAVE_KRB5_ERROR_E_TEXT
if (err_ret && err_ret->e_text && **err_ret->e_text)