From 81519fd2fbb027e66604fdb39803ef0262ac7bb3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 17 Mar 2013 18:49:50 -0400 Subject: [PATCH] * src/dispnew.c (bitch_at_user): Use `user-error'. --- src/ChangeLog | 12 ++++++------ src/dispnew.c | 6 +++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4ece7400276..257fdb3af96 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-03-17 Stefan Monnier + + * dispnew.c (bitch_at_user): Use `user-error'. + 2013-03-17 Ken Brown * dispextern.h (RGB_PIXEL_COLOR): Move here from image.c. Use it @@ -12,8 +16,8 @@ * nsterm.h (EmacsSavePanel, EmacsOpenPanel): Add getFilename and getDirectory. - * nsfns.m (ns_filename_from_panel, ns_directory_from_panel): New - functions. + * nsfns.m (ns_filename_from_panel, ns_directory_from_panel): + New functions. (Fns_read_file_name): ret is BOOL. If ! dir_only_p, don't choose directories. If filename is nil, get directory name (Bug#13932). Use getFilename and getDirectory. @@ -46,10 +50,6 @@ (syms_of_coding): Declare disable-ascii-optimization as a Lisp variable. - * global.h (struct emacs_globals): New member - f_disable_ascii_optimization. - (disable_ascii_optimization): New macro. - * lisp.h (adjust_after_replace): Cancel externing it. (insert_from_gap): Adjust prototype. diff --git a/src/dispnew.c b/src/dispnew.c index 47adab6b8f7..f23562cb97a 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -5725,7 +5725,11 @@ bitch_at_user (void) if (noninteractive) putchar (07); else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ - error ("Keyboard macro terminated by a command ringing the bell"); + { + const char *msg + = "Keyboard macro terminated by a command ringing the bell"; + Fsignal (Quser_error, Fcons (build_string (msg), Qnil)); + } else ring_bell (XFRAME (selected_frame)); } -- 2.39.2