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
4a00eaca
Commit
4a00eaca
authored
Jan 12, 2010
by
YAMAMOTO Mitsuharu
Browse files
* keyboard.c (read_char): Don't apply previous change when current
buffer is unchanged by command execution.
parent
60abb287
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
src/ChangeLog
src/ChangeLog
+5
-0
src/keyboard.c
src/keyboard.c
+11
-4
No files found.
src/ChangeLog
View file @
4a00eaca
2010-01-12 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* keyboard.c (read_char): Don't apply previous change when current
buffer is unchanged by command execution.
2010-01-12 Jan Djärv <jan.h.d@swipnet.se>
* keyboard.c (read_char): Return after executing from special map.
...
...
src/keyboard.c
View file @
4a00eaca
...
...
@@ -3155,6 +3155,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
if (!NILP (tem))
{
struct buffer *prev_buffer = current_buffer;
#if 0 /* This shouldn't be necessary anymore. --lorentey */
int was_locked = single_kboard;
int count = SPECPDL_INDEX ();
...
...
@@ -3178,10 +3179,16 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
unbind_to (count, Qnil);
#endif
/* The command may have changed the keymaps. Pretend there is input
in another keyboard and return. This will recalculate keymaps. */
c = make_number (-2);
goto exit;
if (current_buffer != prev_buffer)
{
/* The command may have changed the keymaps. Pretend there
is input in another keyboard and return. This will
recalculate keymaps. */
c = make_number (-2);
goto exit;
}
else
goto retry;
}
/* Handle things that only apply to characters. */
...
...
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