[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117323: * src/keymap.c (silly_event_symbol_error):
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r117323: * src/keymap.c (silly_event_symbol_error): Don't recommend the use of strings. |
Date: |
Thu, 12 Jun 2014 14:55:56 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117323
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2014-06-12 10:55:48 -0400
message:
* src/keymap.c (silly_event_symbol_error): Don't recommend the use of strings.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/keymap.c keymap.c-20091113204419-o5vbwnq5f7feedwu-219
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-06-11 19:33:14 +0000
+++ b/src/ChangeLog 2014-06-12 14:55:48 +0000
@@ -1,3 +1,8 @@
+2014-06-12 Stefan Monnier <address@hidden>
+
+ * keymap.c (silly_event_symbol_error): Don't recommend the use
+ of strings.
+
2014-06-11 Eli Zaretskii <address@hidden>
* xdisp.c (set_cursor_from_row): Fix an off-by-one error when
@@ -12,7 +17,7 @@
* nsterm.m (run): Always compile for Cocoa. Use runtime check to
determine 10.9 (Bug#17751).
- * macfont.m (macfont_draw): positions where not freed.
+ * macfont.m (macfont_draw): Positions were not freed.
2014-06-10 Dmitry Antipov <address@hidden>
@@ -650,8 +655,8 @@
was moved to Fgarbage_collect.
(Fgarbage_collect): Calculate the end address of the stack portion
that needs to be examined by mark_stack, and pass that address to
- garbage_collect_1, which will pass it to mark_stack. See
- http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00270.html
+ garbage_collect_1, which will pass it to mark_stack.
+ See http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00270.html
for more details about the underlying problems. In particular,
this avoids dumping Emacs with the large hash-table whose value is
held in purify-flag for most of the time loadup.el runs.
=== modified file 'src/keymap.c'
--- a/src/keymap.c 2014-04-05 19:30:36 +0000
+++ b/src/keymap.c 2014-06-12 14:55:48 +0000
@@ -1383,9 +1383,7 @@
c = reorder_modifiers (c);
keystring = concat2 (build_string (new_mods), XCDR (assoc));
- error ((modifiers & ~meta_modifier
- ? "To bind the key %s, use [?%s], not [%s]"
- : "To bind the key %s, use \"%s\", not [%s]"),
+ error ("To bind the key %s, use [?%s], not [%s]",
SDATA (SYMBOL_NAME (c)), SDATA (keystring),
SDATA (SYMBOL_NAME (c)));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117323: * src/keymap.c (silly_event_symbol_error): Don't recommend the use of strings.,
Stefan Monnier <=