aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/locale.conf1
-rw-r--r--core/locales/locale.ru.conf1
-rw-r--r--doc/manual/14_Appendix.md1
-rw-r--r--modules/textadept/editing.lua14
-rw-r--r--modules/textadept/keys.lua5
-rw-r--r--modules/textadept/menu.lua1
6 files changed, 2 insertions, 21 deletions
diff --git a/core/locale.conf b/core/locale.conf
index cf9a3e86..88fe88bf 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -129,7 +129,6 @@ Select Word = Select _Word
Select Line = Select _Line
Select Paragraph = Select Para_graph
Select Indented Block = Select _Indented Block
-Select Style = Select St_yle
Selection = Selectio_n
Upper Case Selection = _Upper Case Selection
Lower Case Selection = _Lower Case Selection
diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf
index 0b349239..15417855 100644
--- a/core/locales/locale.ru.conf
+++ b/core/locales/locale.ru.conf
@@ -129,7 +129,6 @@ Select Word = Выделить с_лово
Select Line = Выделить ст_року
Select Paragraph = Выделить _параграф
Select Indented Block = Выделить блок с _отступом
-Select Style = Выбрать с_тиль
Selection = Выдел_ение
Upper Case Selection = Преобразовать выделение в _верхний регист
Lower Case Selection = Преобразовать выделение в _нижний регистр
diff --git a/doc/manual/14_Appendix.md b/doc/manual/14_Appendix.md
index 5ca4b9c6..71dacb1f 100644
--- a/doc/manual/14_Appendix.md
+++ b/doc/manual/14_Appendix.md
@@ -45,7 +45,6 @@ Ctrl+Shift+D |⌘⇧D |Select word
Ctrl+Shift+N |⌘⇧N |Select line
Ctrl+Shift+P |⌘⇧P |Select paragraph
Ctrl+Shift+I |⌘⇧I |Select indented block
-Ctrl+Y |⌘⇧Y |Select style
Ctrl+Alt+U |^U |Upper case selection
Ctrl+Alt+Shift+U |^⇧U |Lower case selection
Alt+< |^< |Enclose as XML tags
diff --git a/modules/textadept/editing.lua b/modules/textadept/editing.lua
index 83dd1fd1..4d885a81 100644
--- a/modules/textadept/editing.lua
+++ b/modules/textadept/editing.lua
@@ -426,20 +426,6 @@ function select_indented_block()
end
---
--- Selects all text with the same style as under the caret.
-function select_style()
- local buffer = buffer
- local start_pos, length = buffer.current_pos, buffer.length
- local base_style, style_at = buffer.style_at[start_pos], buffer.style_at
- local pos = start_pos - 1
- while pos >= 0 and style_at[pos] == base_style do pos = pos - 1 end
- local start_style = pos
- pos = start_pos + 1
- while pos < length and style_at[pos] == base_style do pos = pos + 1 end
- buffer:set_sel(start_style + 1, pos)
-end
-
----
-- Converts indentation between tabs and spaces.
function convert_indentation()
local buffer = buffer
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 77f269b0..f10b153c 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -101,7 +101,7 @@ if not RESETTING then constantize_menu_buffer_functions() end
Windows and Linux menu key commands.
Unassigned keys (~ denotes keys reserved by the operating system):
- c: A B C H p qQ ~ V X ) ] } * \n
+ c: A B C H p qQ ~ V X Y ) ] } * \n
a: aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpP QrRsStTuUvVwWxXyYzZ_ ) ] } *+-/=~~\n\s
ca: aAbBcCdDeE F jJkKlLmM N PqQ t xXy zZ_"'()[]{}<>* / ~~ \s
@@ -116,7 +116,7 @@ if not RESETTING then constantize_menu_buffer_functions() end
Mac OSX menu key commands.
Unassigned keys (~ denotes keys reserved by the operating system):
- m: A B C ~ JkK ~M p ~ t U V Xy ) ] } * ~~\n~~
+ m: A B C ~ JkK ~M p ~ t U V XyY ) ] } * ~~\n~~
c: cC D gG H J K L oO qQ xXyYzZ_ ) ] } * / \s
cm: aAbBcC~DeE F ~HiIjJkKlL~MnN pPq~rRsStTuUvVwWxXyYzZ_"'()[]{}<>*+-/=\t\n~~
@@ -172,7 +172,6 @@ keys[not OSX and 'cD' or 'mD'] = { m_editing.current_word, 'select' }
keys[not OSX and 'cN' or 'mN'] = m_editing.select_line
keys[not OSX and 'cP' or 'mP'] = m_editing.select_paragraph
keys[not OSX and 'cI' or 'mI'] = m_editing.select_indented_block
-keys[not OSX and 'cY' or 'mY'] = m_editing.select_style
-- Selection.
keys[not OSX and 'cau' or 'cu'] = _buffer.upper_case
keys[not OSX and 'caU' or 'cU'] = _buffer.lower_case
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index ddaf9aba..bbc632d5 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -80,7 +80,6 @@ menubar = {
{ L('Select Line'), m_editing.select_line },
{ L('Select Paragraph'), m_editing.select_paragraph },
{ L('Select Indented Block'), m_editing.select_indented_block },
- { L('Select Style'), m_editing.select_style },
},
{ title = L('Selection'),
{ L('Upper Case Selection'), _buffer.upper_case },