procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/keymap.c (silly_event_symbol_error): Don't recommend the use of strings.

Browse source
This commit is contained in:
Stefan Monnier 2014-06-12 10:55:48 -04:00
parent de825bbb74
commit 2baa734e24
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-06-12 Stefan Monnier <monnier@iro.umontreal.ca>
* keymap.c (silly_event_symbol_error): Don't recommend the use
of strings.
2014-06-11 Eli Zaretskii <eliz@gnu.org>
* 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 <dmantipov@yandex.ru>
@ -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.

4
src/keymap.c
View file

@ -1383,9 +1383,7 @@ silly_event_symbol_error (Lisp_Object c)
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)));
}