Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
2baa734e
Commit
2baa734e
authored
Jun 12, 2014
by
Stefan Monnier
Browse files
* src/keymap.c (silly_event_symbol_error): Don't recommend the use of strings.
parent
de825bbb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
src/ChangeLog
src/ChangeLog
+8
-3
src/keymap.c
src/keymap.c
+1
-3
No files found.
src/ChangeLog
View file @
2baa734e
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):
p
ositions w
h
ere not freed.
* macfont.m (macfont_draw):
P
ositions 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.
...
...
src/keymap.c
View file @
2baa734e
...
...
@@ -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
)));
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment