/[emacs]/emacs/src/keyboard.c
ViewVC logotype

Diff of /emacs/src/keyboard.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.753 by monnier, Sun Jul 6 19:29:26 2003 UTC revision 1.753.2.1 by handa, Mon Sep 8 12:48:11 2003 UTC
# Line 32  Boston, MA 02111-1307, USA.  */ Line 32  Boston, MA 02111-1307, USA.  */
32  #include "window.h"  #include "window.h"
33  #include "commands.h"  #include "commands.h"
34  #include "buffer.h"  #include "buffer.h"
35  #include "charset.h"  #include "character.h"
36  #include "disptab.h"  #include "disptab.h"
37  #include "dispextern.h"  #include "dispextern.h"
38  #include "syntax.h"  #include "syntax.h"
# Line 1633  command_loop_1 () Line 1633  command_loop_1 ()
1633                            : (lose >= 0x20 && lose < 0x7f))                            : (lose >= 0x20 && lose < 0x7f))
1634                        /* To extract the case of continuation on                        /* To extract the case of continuation on
1635                           wide-column characters.  */                           wide-column characters.  */
1636                        && (WIDTH_BY_CHAR_HEAD (FETCH_BYTE (PT_BYTE)) == 1)                        && ASCII_BYTE_P (lose)
1637                        && (XFASTINT (XWINDOW (selected_window)->last_modified)                        && (XFASTINT (XWINDOW (selected_window)->last_modified)
1638                            >= MODIFF)                            >= MODIFF)
1639                        && (XFASTINT (XWINDOW (selected_window)->last_overlay_modified)                        && (XFASTINT (XWINDOW (selected_window)->last_overlay_modified)
# Line 1690  command_loop_1 () Line 1690  command_loop_1 ()
1690                  {                  {
1691                    unsigned int c                    unsigned int c
1692                      = translate_char (Vtranslation_table_for_input,                      = translate_char (Vtranslation_table_for_input,
1693                                        XFASTINT (last_command_char), 0, 0, 0);                                        XFASTINT (last_command_char));
1694                    int value;                    int value;
1695                    if (NILP (Vexecuting_macro)                    if (NILP (Vexecuting_macro)
1696                        && !EQ (minibuf_window, selected_window))                        && !EQ (minibuf_window, selected_window))
# Line 2920  read_char (commandflag, nmaps, maps, pre Line 2920  read_char (commandflag, nmaps, maps, pre
2920             && SCHARS (Vkeyboard_translate_table) > (unsigned) XFASTINT (c))             && SCHARS (Vkeyboard_translate_table) > (unsigned) XFASTINT (c))
2921            || (VECTORP (Vkeyboard_translate_table)            || (VECTORP (Vkeyboard_translate_table)
2922                && XVECTOR (Vkeyboard_translate_table)->size > (unsigned) XFASTINT (c))                && XVECTOR (Vkeyboard_translate_table)->size > (unsigned) XFASTINT (c))
2923            || (CHAR_TABLE_P (Vkeyboard_translate_table)            || CHAR_TABLE_P (Vkeyboard_translate_table))
               && CHAR_VALID_P (XINT (c), 0)))  
2924          {          {
2925            Lisp_Object d;            Lisp_Object d;
2926            d = Faref (Vkeyboard_translate_table, c);            d = Faref (Vkeyboard_translate_table, c);
# Line 6327  modify_event_symbol (symbol_num, modifie Line 6326  modify_event_symbol (symbol_num, modifie
6326            else if (sizeof (long) == sizeof (EMACS_INT))            else if (sizeof (long) == sizeof (EMACS_INT))
6327              sprintf (buf, "%s-%ld", SDATA (name_alist_or_stem),              sprintf (buf, "%s-%ld", SDATA (name_alist_or_stem),
6328                       XINT (symbol_int) + 1);                       XINT (symbol_int) + 1);
6329              else
6330                abort ();
6331            value = intern (buf);            value = intern (buf);
6332          }          }
6333        else if (name_table != 0 && name_table[symbol_num])        else if (name_table != 0 && name_table[symbol_num])
# Line 9376  read_key_sequence (keybuf, bufsize, prom Line 9377  read_key_sequence (keybuf, bufsize, prom
9377        if (first_binding >= nmaps        if (first_binding >= nmaps
9378            && fkey.start >= t && keytran.start >= t            && fkey.start >= t && keytran.start >= t
9379            && INTEGERP (key)            && INTEGERP (key)
9380            && ((((XINT (key) & 0x3ffff)            && ((CHARACTERP (make_number (XINT (key) & ~CHAR_MODIFIER_MASK))
9381                  < XCHAR_TABLE (current_buffer->downcase_table)->size)                 && UPPERCASEP (XINT (key) & ~CHAR_MODIFIER_MASK))
                && UPPERCASEP (XINT (key) & 0x3ffff))  
9382                || (XINT (key) & shift_modifier)))                || (XINT (key) & shift_modifier)))
9383          {          {
9384            Lisp_Object new_key;            Lisp_Object new_key;
# Line 9389  read_key_sequence (keybuf, bufsize, prom Line 9389  read_key_sequence (keybuf, bufsize, prom
9389            if (XINT (key) & shift_modifier)            if (XINT (key) & shift_modifier)
9390              XSETINT (new_key, XINT (key) & ~shift_modifier);              XSETINT (new_key, XINT (key) & ~shift_modifier);
9391            else            else
9392              XSETINT (new_key, (DOWNCASE (XINT (key) & 0x3ffff)              XSETINT (new_key, (DOWNCASE (XINT (key) & ~CHAR_MODIFIER_MASK)
9393                                 | (XINT (key) & ~0x3ffff)));                                 | (XINT (key) & ~CHAR_MODIFIER_MASK)));
9394    
9395            /* We have to do this unconditionally, regardless of whether            /* We have to do this unconditionally, regardless of whether
9396               the lower-case char is defined in the keymaps, because they               the lower-case char is defined in the keymaps, because they

Legend:
Removed from v.1.753  
changed lines
  Added in v.1.753.2.1

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26