Mercurial > emacs
comparison src/keyboard.c @ 105914:7e842c6b6d18
Delete trailing whitespace.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 08 Nov 2009 15:42:32 +0000 |
| parents | 414b8a7a3334 |
| children | 1011707400d3 |
comparison
equal
deleted
inserted
replaced
| 105913:414b8a7a3334 | 105914:7e842c6b6d18 |
|---|---|
| 8066 The menu bar does not display equivalent key bindings anyway. | 8066 The menu bar does not display equivalent key bindings anyway. |
| 8067 ITEM_PROPERTY_DEF is already set up properly. */ | 8067 ITEM_PROPERTY_DEF is already set up properly. */ |
| 8068 if (inmenubar > 0) | 8068 if (inmenubar > 0) |
| 8069 return 1; | 8069 return 1; |
| 8070 | 8070 |
| 8071 | |
| 8072 /* If we only want to precompute equivalent key bindings (which we | 8071 /* If we only want to precompute equivalent key bindings (which we |
| 8073 don't even do any more anyway), stop here. */ | 8072 don't even do any more anyway), stop here. */ |
| 8074 if (notreal) | 8073 if (notreal) |
| 8075 return 1; | 8074 return 1; |
| 8076 | 8075 |
| 8106 (such as lmenu.el set it up), check if the | 8105 (such as lmenu.el set it up), check if the |
| 8107 original command matches the cached command. */ | 8106 original command matches the cached command. */ |
| 8108 && !(SYMBOLP (def) && EQ (tem, XSYMBOL (def)->function)))) | 8107 && !(SYMBOLP (def) && EQ (tem, XSYMBOL (def)->function)))) |
| 8109 keys = Qnil; | 8108 keys = Qnil; |
| 8110 } | 8109 } |
| 8111 | 8110 |
| 8112 if (NILP (keys)) | 8111 if (NILP (keys)) |
| 8113 keys = Fwhere_is_internal (def, Qnil, Qt, Qnil, Qnil); | 8112 keys = Fwhere_is_internal (def, Qnil, Qt, Qnil, Qnil); |
| 8114 | 8113 |
| 8115 if (!NILP (keys)) | 8114 if (!NILP (keys)) |
| 8116 { | 8115 { |
| 8117 tem = Fkey_description (keys, Qnil); | 8116 tem = Fkey_description (keys, Qnil); |
| 8118 if (CONSP (prefix)) | 8117 if (CONSP (prefix)) |
| 8119 { | 8118 { |
| 8129 keyeq = Qnil; | 8128 keyeq = Qnil; |
| 8130 } | 8129 } |
| 8131 | 8130 |
| 8132 /* If we have an equivalent key binding, use that. */ | 8131 /* If we have an equivalent key binding, use that. */ |
| 8133 ASET (item_properties, ITEM_PROPERTY_KEYEQ, keyeq); | 8132 ASET (item_properties, ITEM_PROPERTY_KEYEQ, keyeq); |
| 8134 } | 8133 } |
| 8135 | 8134 |
| 8136 /* Include this when menu help is implemented. | 8135 /* Include this when menu help is implemented. |
| 8137 tem = XVECTOR (item_properties)->contents[ITEM_PROPERTY_HELP]; | 8136 tem = XVECTOR (item_properties)->contents[ITEM_PROPERTY_HELP]; |
| 8138 if (!(NILP (tem) || STRINGP (tem))) | 8137 if (!(NILP (tem) || STRINGP (tem))) |
| 8139 { | 8138 { |