From 31a11abd54a26c19798c09658e602b64787dd39d Mon Sep 17 00:00:00 2001 From: Kristoffer Haugsbakk Date: Thu, 24 Nov 2016 21:38:44 +0100 Subject: [PATCH] Use `RET` instead of `return` for return key It is an Emacs-wide convention to use `RET` when referring to the act of pressing the return key. Spacemacs seems to follow that convention as well. So fix some Org files that were deviating from this convention. In particular, replace usages of `` and `return` with `RET`. Also update the description of an `M-RET` keybinding[1] based on the docstring of `ido-select-text`. [1]: Suggested-by: bmag --- doc/DOCUMENTATION.org | 4 ++-- layers/+completion/auto-completion/README.org | 2 +- layers/+tools/rebox/README.org | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/DOCUMENTATION.org b/doc/DOCUMENTATION.org index 6bac32ed9..e8918d597 100644 --- a/doc/DOCUMENTATION.org +++ b/doc/DOCUMENTATION.org @@ -2173,8 +2173,8 @@ Basic =ido= operations can be done with ~Ctrl~ key: | Key Binding | Description | |--------------------+---------------------------------------------------| -| ~C-~ | open a =dired buffer= | -| ~M-~ | open a =dired buffer= in terminal | +| ~C-RET~ | open a =dired buffer= | +| ~M-RET~ | select the buffer or file named by the prompt | | ~C-d~ | delete selected file (ask for confirmation) | | ~C-h~ | go to parent directory | | ~C-j~ | select next file or directory | diff --git a/layers/+completion/auto-completion/README.org b/layers/+completion/auto-completion/README.org index 52db213a6..069012bcf 100644 --- a/layers/+completion/auto-completion/README.org +++ b/layers/+completion/auto-completion/README.org @@ -230,7 +230,7 @@ Emacs style: | ~C-k~ | select previous candidate | | ~TAB~ | expand selection or select next candidate | | ~S-TAB~ | select previous candidate | -| ~return~ | complete word, if word is already completed insert a carriage return | +| ~RET~ | complete word, if word is already completed insert a carriage return | ** Yasnippet diff --git a/layers/+tools/rebox/README.org b/layers/+tools/rebox/README.org index 1feb3cce6..7eab52ed8 100644 --- a/layers/+tools/rebox/README.org +++ b/layers/+tools/rebox/README.org @@ -26,7 +26,7 @@ A nice video demonstration by the package author can be found [[https://www.yout - Auto-wrap correctly in comments, - Auto-fill correctly in comments, - Boxes auto-adapt as text is inserted or deleted, -- ~S-return~ to continue a comment on the next line, +- ~S-RET~ to continue a comment on the next line, - Kill/yank within the box, - Apparently works well with ancient ~filladpt-mode~ (see authors video). @@ -339,4 +339,4 @@ These templates are added by the Spacemacs layer. | ~SPC x b b~ | Draw next box defined in =rebox-style-loop= | | ~SPC x b B~ | Draw previous box defined in =rebox-style-loop= | | ~SPC x b c~ | Center box (point must be around left side of the box) | -| ~S-return~ | rebox-indent-new-line | +| ~S-RET~ | rebox-indent-new-line |