[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112069: * src/dispnew.c (bitch_at_us
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112069: * src/dispnew.c (bitch_at_user): Use `user-error'. |
Date: |
Sun, 17 Mar 2013 18:49:50 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112069
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2013-03-17 18:49:50 -0400
message:
* src/dispnew.c (bitch_at_user): Use `user-error'.
modified:
src/ChangeLog
src/dispnew.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-03-17 14:34:18 +0000
+++ b/src/ChangeLog 2013-03-17 22:49:50 +0000
@@ -1,3 +1,7 @@
+2013-03-17 Stefan Monnier <address@hidden>
+
+ * dispnew.c (bitch_at_user): Use `user-error'.
+
2013-03-17 Ken Brown <address@hidden>
* 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.
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2013-03-13 07:27:34 +0000
+++ b/src/dispnew.c 2013-03-17 22:49:50 +0000
@@ -5725,7 +5725,11 @@
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));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112069: * src/dispnew.c (bitch_at_user): Use `user-error'.,
Stefan Monnier <=