Commit 81519fd2 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* src/dispnew.c (bitch_at_user): Use `user-error'.

parent 8194a705
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
* 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
* global.h (struct emacs_globals): New member
(disable_ascii_optimization): New macro.
* lisp.h (adjust_after_replace): Cancel externing it.
(insert_from_gap): Adjust prototype.
......@@ -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));
ring_bell (XFRAME (selected_frame));
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment