summaryrefslogtreecommitdiff
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorLeo Liu <sdl.web@gmail.com>2014-10-09 06:05:48 +0800
committerLeo Liu <sdl.web@gmail.com>2014-10-09 06:05:48 +0800
commit2dbd7a37a809e2dcef6c8e7323ac15c98b051cd9 (patch)
tree3325d872642948f831a9acb971a2c06ce7d10b4d /src/keyboard.c
parent289a43910e29999f125d76a48602b63cea7ed9b9 (diff)
downloademacs-2dbd7a37a809e2dcef6c8e7323ac15c98b051cd9.tar.gz
Enhance terpri to allow conditionally output a newline
* doc/lispref/streams.texi (Output Functions): Document new argument ENSURE to terpri. * doc/misc/cl.texi (Porting Common Lisp): Remove parse-integer. * lisp/emacs-lisp/cl-extra.el (cl-fresh-line): New function. * src/keymap.c (describe_vector_princ): * src/keyboard.c (Fcommand_error_default_function): Adapt to change to Fterpri. * src/print.c (printchar_stdout_last): Declare. (printchar): Record the last char written to stdout. (Fterpri): Add optional argument ENSURE. * test/automated/print-tests.el: New file. (terpri): Tests for terpri. (Bug#18652)
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 0d042132d8e..6730536dc1d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1126,7 +1126,7 @@ Default value of `command-error-function'. */)
{
print_error_message (data, Qexternal_debugging_output,
SSDATA (context), signal);
- Fterpri (Qexternal_debugging_output);
+ Fterpri (Qexternal_debugging_output, Qnil);
Fkill_emacs (make_number (-1));
}
else