Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Stefan Monnier 2013-03-17 18:49:50 -04:00
parent 8194a70532
commit 81519fd2fb
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ChangeLog
View file

@ -1,3 +1,7 @@
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>
* 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.

6
src/dispnew.c
View file

@ -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));
}