Mercurial > emacs
comparison src/keyboard.c @ 90384:c156f6a9e7b5
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-56
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 204-225)
- Update from CVS
- Sync from erc--emacs--0
- Merge from gnus--rel--5.10
- Improve tq.el.
- Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.
* gnus--rel--5.10 (patch 81-85)
- Update from CVS
- Merge from emacs--devo--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 17 Apr 2006 08:41:12 +0000 |
parents | 1ad066d533a9 d5629ae481f1 |
children | 146cd8369025 |
comparison
equal
deleted
inserted
replaced
90383:ab20fb198dda | 90384:c156f6a9e7b5 |
---|---|
1416 int lose; | 1416 int lose; |
1417 int nonundocount; | 1417 int nonundocount; |
1418 Lisp_Object keybuf[30]; | 1418 Lisp_Object keybuf[30]; |
1419 int i; | 1419 int i; |
1420 int no_direct; | 1420 int no_direct; |
1421 int prev_modiff; | 1421 int prev_modiff = 0; |
1422 struct buffer *prev_buffer = NULL; | 1422 struct buffer *prev_buffer = NULL; |
1423 #ifdef MULTI_KBOARD | 1423 #ifdef MULTI_KBOARD |
1424 int was_locked = single_kboard; | 1424 int was_locked = single_kboard; |
1425 #endif | 1425 #endif |
1426 int already_adjusted; | 1426 int already_adjusted; |
9476 unbind_to (count, Qnil); | 9476 unbind_to (count, Qnil); |
9477 | 9477 |
9478 /* Don't downcase the last character if the caller says don't. | 9478 /* Don't downcase the last character if the caller says don't. |
9479 Don't downcase it if the result is undefined, either. */ | 9479 Don't downcase it if the result is undefined, either. */ |
9480 if ((dont_downcase_last || first_binding >= nmaps) | 9480 if ((dont_downcase_last || first_binding >= nmaps) |
9481 && t > 0 | |
9481 && t - 1 == original_uppercase_position) | 9482 && t - 1 == original_uppercase_position) |
9482 keybuf[t - 1] = original_uppercase; | 9483 keybuf[t - 1] = original_uppercase; |
9483 | 9484 |
9484 /* Occasionally we fabricate events, perhaps by expanding something | 9485 /* Occasionally we fabricate events, perhaps by expanding something |
9485 according to function-key-map, or by adding a prefix symbol to a | 9486 according to function-key-map, or by adding a prefix symbol to a |