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 <monnier@iro.umontreal.ca>
* dispnew.c (bitch_at_user): Use `user-error'.
2013-03-17 Ken Brown <kbrown@cornell.edu> 2013-03-17 Ken Brown <kbrown@cornell.edu>
   
* dispextern.h (RGB_PIXEL_COLOR): Move here from image.c. Use it * dispextern.h (RGB_PIXEL_COLOR): Move here from image.c. Use it
...@@ -12,8 +16,8 @@ ...@@ -12,8 +16,8 @@
* nsterm.h (EmacsSavePanel, EmacsOpenPanel): Add getFilename * nsterm.h (EmacsSavePanel, EmacsOpenPanel): Add getFilename
and getDirectory. and getDirectory.
   
* nsfns.m (ns_filename_from_panel, ns_directory_from_panel): New * nsfns.m (ns_filename_from_panel, ns_directory_from_panel):
functions. New functions.
(Fns_read_file_name): ret is BOOL. If ! dir_only_p, don't choose (Fns_read_file_name): ret is BOOL. If ! dir_only_p, don't choose
directories. If filename is nil, get directory name (Bug#13932). directories. If filename is nil, get directory name (Bug#13932).
Use getFilename and getDirectory. Use getFilename and getDirectory.
...@@ -46,10 +50,6 @@ ...@@ -46,10 +50,6 @@
(syms_of_coding): Declare disable-ascii-optimization as a Lisp (syms_of_coding): Declare disable-ascii-optimization as a Lisp
variable. 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. * lisp.h (adjust_after_replace): Cancel externing it.
(insert_from_gap): Adjust prototype. (insert_from_gap): Adjust prototype.
   
......
...@@ -5725,7 +5725,11 @@ bitch_at_user (void) ...@@ -5725,7 +5725,11 @@ bitch_at_user (void)
if (noninteractive) if (noninteractive)
putchar (07); putchar (07);
else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ 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 else
ring_bell (XFRAME (selected_frame)); 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