Skip to content

Commit 314822b

Browse files
[Mapping change] Replace help mapping from ? to g? to avoid conflict with built in backward search. Fixes #106.
1 parent 96940da commit 314822b

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

DOCS.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ Use vim regex flag `\c` to make it case insensitive. See `:help vim.regex()` and
465465
Pressing `<TAB>` in filter prompt autocompletes categories and tags.
466466

467467
#### **org_agenda_show_help**
468-
*mapped to*: `?`<br />
468+
*mapped to*: `g?`<br />
469469
Show help popup with mappings
470470

471471
These mappings live under `mappings.agenda`, and can be changed like this:
@@ -498,7 +498,7 @@ Refile capture content to specific destination
498498
*mapped to*: `<Leader>ok`<br />
499499
Close capture window without saving anything
500500
#### **org_capture_show_help**
501-
*mapped to*: `?`<br />
501+
*mapped to*: `g?`<br />
502502
Show help popup with mappings
503503

504504
These mappings live under `mappings.capture`, and can be changed like this:
@@ -665,7 +665,7 @@ See [Clocking](#clocking) for more details.
665665
Set effort estimate property on for current headline.<br />
666666
See [Clocking](#clocking) for more details.
667667
#### **org_show_help**
668-
*mapped to*: `?`<br />
668+
*mapped to*: `g?`<br />
669669
Show help popup with mappings
670670

671671
These mappings live under `mappings.org`, and can be changed like this:
@@ -1036,7 +1036,11 @@ set statusline=%{v:lua.orgmode.statusline()}
10361036

10371037
## Changelog
10381038

1039-
#### 10 October
1039+
#### 24 October 2021
1040+
* Help mapping was changed from `?` to `g?` to avoid conflict with built in backward search. See issue [#106](https://github.com/kristijanhusak/orgmode.nvim/issues/106).
1041+
1042+
#### 10 October 2021
10401043
* Mappings `org_increase_date` and `org_decrease_date` are deprecated in favor of [org_timestamp_up](#org_timestamp_up) and [org_timestamp_down](#org_timestamp_down).<br />
10411044
If you have these mappings in your custom configuration, you will get a warning each time Orgmode is loaded. To remove the warning, rename the configuration properties accordingly.<br />
10421045
To return the old functionality where mappings increase only the day, add `org_timestamp_up_day`/`org_timestamp_down_day` to your configuration.
1046+

doc/orgmode.txt

+10-5
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ CONTENTS *orgmode-content
134134
1.8.8. Recalculating totals.........|orgmode-recalculating_totals|
135135
1.8.9. Statusline function...........|orgmode-statusline_function|
136136
1.9. Changelog.............................................|orgmode-changelog|
137-
1.9.1. 10 October.................................|orgmode-10_october|
137+
1.9.1. 24 October 2021.......................|orgmode-24_october_2021|
138+
1.9.2. 10 October 2021.......................|orgmode-10_october_2021|
138139

139140
================================================================================
140141
TABLE OF CONTENT *orgmode-table_of_content*
@@ -669,7 +670,7 @@ Pressing `<TAB>` in filter prompt autocompletes categories and tags.
669670

670671
ORG_AGENDA_SHOW_HELP *orgmode-org_agenda_show_help*
671672

672-
mapped to: `?`
673+
mapped to: `g?`
673674
Show help popup with mappings
674675

675676
These mappings live under `mappings.agenda`, and can be changed like this:
@@ -708,7 +709,7 @@ Close capture window without saving anything
708709

709710
ORG_CAPTURE_SHOW_HELP *orgmode-org_capture_show_help*
710711

711-
mapped to: `?`
712+
mapped to: `g?`
712713
Show help popup with mappings
713714

714715
These mappings live under `mappings.capture`, and can be changed like this:
@@ -956,7 +957,7 @@ See Clocking (#clocking) for more details.
956957

957958
ORG_SHOW_HELP *orgmode-org_show_help*
958959

959-
mapped to: `?`
960+
mapped to: `g?`
960961
Show help popup with mappings
961962

962963
These mappings live under `mappings.org`, and can be changed like this:
@@ -1356,7 +1357,11 @@ Show the currently clocked in headline (if any), with total clocked time / effor
13561357
--------------------------------------------------------------------------------
13571358
CHANGELOG *orgmode-changelog*
13581359

1359-
10 OCTOBER *orgmode-10_october*
1360+
24 OCTOBER 2021 *orgmode-24_october_2021*
1361+
1362+
* Help mapping was changed from `?` to `g?` to avoid conflict with built in backward search. See issue #106 (https://github.com/kristijanhusak/orgmode.nvim/issues/106).
1363+
1364+
10 OCTOBER 2021 *orgmode-10_october_2021*
13601365

13611366
* Mappings `org_increase_date` and `org_decrease_date` are deprecated in favor of org_timestamp_up (#org_timestamp_up) and org_timestamp_down (#org_timestamp_down).
13621367
If you have these mappings in your custom configuration, you will get a warning each time Orgmode is loaded. To remove the warning, rename the configuration properties accordingly.

lua/orgmode/config/defaults.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ return {
6666
org_agenda_clock_cancel = 'X',
6767
org_agenda_clockreport_mode = 'R',
6868
org_agenda_filter = '/',
69-
org_agenda_show_help = '?',
69+
org_agenda_show_help = 'g?',
7070
},
7171
capture = {
7272
org_capture_finalize = '<C-c>',
7373
org_capture_refile = '<Leader>or',
7474
org_capture_kill = '<Leader>ok',
75-
org_capture_show_help = '?',
75+
org_capture_show_help = 'g?',
7676
},
7777
org = {
7878
org_refile = '<Leader>or',
@@ -115,7 +115,7 @@ return {
115115
org_clock_cancel = '<leader>oxq',
116116
org_clock_goto = '<leader>oxj',
117117
org_set_effort = '<leader>oxe',
118-
org_show_help = '?',
118+
org_show_help = 'g?',
119119
},
120120
text_objects = {
121121
inner_heading = 'ih',

0 commit comments

Comments
 (0)