From ba905609c428309e4ac96f6a5ca78aab19ee6a37 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Tue, 4 Aug 2009 17:52:22 +1000 Subject: [PATCH] Fix incorrectly formatted key strings in |key-sequence| help. --- vimperator/locale/en-US/map.txt | 36 ++++++++++++++++----------------- xulmus/locale/en-US/map.txt | 36 ++++++++++++++++----------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index 91e6650b..04e67f50 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -140,38 +140,38 @@ For most keys, the key-sequence is the same as the character you see when you type that key, however there are some exceptions which allow for a much larger number of keys to be used in mappings. - * [c][c], [c]\<[c], [c][c], [c]\ [c] allow a literal [c]<[c] or space character. - * [c]\'[c], [c]\"[c] and [c]\\[c] must be used to avoid escaping issues when mapping a quote or backslash. - * [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] (for carriage return/enter) - * [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] (for a backspace) - * [c][c] through [c][c] work as expected + * **, *\<*, **, *\ * allow a literal *<* or space character. + * *\'*, *\"* and *\\* must be used to avoid escaping issues when mapping a quote or backslash. + * ** ** ** ** ** ** ** ** (for carriage return/enter) + * ** ** ** ** ** ** (for a backspace) + * ** through ** work as expected Most keyboards have some modifiers such as the control, alt or meta keys. In order to create a mapping that uses these keys the correct prefix must be used within the angle brackets. - * [c][c]: The control or ctrl key. - * [c][c]: The alt key. - * [c][c]: The meta key, windows key, or command key - * [c][c]: The shift key. + * **: The control or ctrl key. + * **: The alt key. + * **: The meta key, windows key, or command key + * **: The shift key. These prefixes can be combined however you see fit, though you should note that within angle brackets all alphabetic characters are read as lowercase. In order to force them to be uppercase, you must specify the S- prefix as well. -Additionally, you should never use the S- prefix with a number of piece of +Additionally, you should never use the S- prefix with a number or piece of punctuation, even if you require a shift to type that character; doing so will give you a mapping that cannot be typed. With non-character keys, tab and space, the S- modifier works just like C- A- and M-. Some examples may clarify the situation: - * [c]xc[c]: type x, and then type c - * [c]c[c]: hold control and type x, then type c without control - * [c][c]: type 2 while holding control - * [c][c]: type @ while holding control - * [c][c]: press space while holding shift - * [c][c]: press j while holding control and alt - * [c][c]: exactly the same as above - * [c][c]: press J while holding control and alt + * *xc*: type x, and then type c + * *c*: hold control and type x, then type c without control + * **: type 2 while holding control + * **: type @ while holding control + * **: press space while holding shift + * **: press j while holding control and alt + * **: exactly the same as above + * **: press J while holding control and alt subsection:Special{nbsp}characters[:map-special-chars] diff --git a/xulmus/locale/en-US/map.txt b/xulmus/locale/en-US/map.txt index fc91c76c..f6e272be 100644 --- a/xulmus/locale/en-US/map.txt +++ b/xulmus/locale/en-US/map.txt @@ -140,38 +140,38 @@ For most keys, the key-sequence is the same as the character you see when you type that key, however there are some exceptions which allow for a much larger number of keys to be used in mappings. - * [c][c], [c]\<[c], [c][c], [c]\ [c] allow a literal [c]<[c] or space character. - * [c]\'[c], [c]\"[c] and [c]\\[c] must be used to avoid escaping issues when mapping a quote or backslash. - * [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] (for carriage return/enter) - * [c][c] [c][c] [c][c] [c][c] [c][c] [c][c] (for a backspace) - * [c][c] through [c][c] work as expected + * **, *\<*, **, *\ * allow a literal *<* or space character. + * *\'*, *\"* and *\\* must be used to avoid escaping issues when mapping a quote or backslash. + * ** ** ** ** ** ** ** ** (for carriage return/enter) + * ** ** ** ** ** ** (for a backspace) + * ** through ** work as expected Most keyboards have some modifiers such as the control, alt or meta keys. In order to create a mapping that uses these keys the correct prefix must be used within the angle brackets. - * [c][c]: The control or ctrl key. - * [c][c]: The alt key. - * [c][c]: The meta key, windows key, or command key - * [c][c]: The shift key. + * **: The control or ctrl key. + * **: The alt key. + * **: The meta key, windows key, or command key + * **: The shift key. These prefixes can be combined however you see fit, though you should note that within angle brackets all alphabetic characters are read as lowercase. In order to force them to be uppercase, you must specify the S- prefix as well. -Additionally, you should never use the S- prefix with a number of piece of +Additionally, you should never use the S- prefix with a number or piece of punctuation, even if you require a shift to type that character; doing so will give you a mapping that cannot be typed. With non-character keys, tab and space, the S- modifier works just like C- A- and M-. Some examples may clarify the situation: - * [c]xc[c]: type x, and then type c - * [c]c[c]: hold control and type x, then type c without control - * [c][c]: type 2 while holding control - * [c][c]: type @ while holding control - * [c][c]: press space while holding shift - * [c][c]: press j while holding control and alt - * [c][c]: exactly the same as above - * [c][c]: press J while holding control and alt + * *xc*: type x, and then type c + * *c*: hold control and type x, then type c without control + * **: type 2 while holding control + * **: type @ while holding control + * **: press space while holding shift + * **: press j while holding control and alt + * **: exactly the same as above + * **: press J while holding control and alt subsection:Special{nbsp}characters[:map-special-chars]