From f48b25196852f4cc77a1649739a435aeea460f37 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Mon, 21 Mar 2016 20:02:56 -0400 Subject: [PATCH] Delete `SPC j b` and move `SPC j u` to `SPC j b` By convention, jump back should be on `b`, not `u` Since `SPC j u` is free, move as well `SPC j U` to `SPC j u`. `SPC j b` for bookmark jump is already available under `SPC f b` --- CHANGELOG.next | 5 ++--- doc/DOCUMENTATION.org | 7 +++---- layers/+distribution/spacemacs-base/keybindings.el | 1 - layers/+spacemacs/spacemacs-editing/packages.el | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.next b/CHANGELOG.next index 2091a63f6..d456294c1 100644 --- a/CHANGELOG.next +++ b/CHANGELOG.next @@ -110,7 +110,7 @@ This file containes the change log for the next major version of Spacemacs. location in the line) - ~SPC j $~ to go to the end of line (and set a mark at the previous location in the line) - - ~SPC j b~ to jump to a bookmark + - ~SPC j b~ to undo a jump (go back to previous location) - ~SPC j d~ to jump to a listing of the current directory - ~SPC j D~ to jump to a listing of the current directory (other window) - ~SPC j f~ to jump to the definition of the function around point @@ -123,8 +123,7 @@ This file containes the change log for the next major version of Spacemacs. - ~SPC j n~ to split the current line at point, insert a new line and auto-indent - ~SPC j s~ to split a quoted string or s-expression in place - ~SPC j S~ to split a quoted string or s-expression, insert a new line and auto-indent - - ~SPC j u~ to undo a jump (go back to previous location) - - ~SPC j U~ to jump to a URL in the current buffer + - ~SPC j u~ to jump to a URL in the current buffer - ~SPC j v~ to jump to the definition/declaration of the variable around point - ~SPC j w~ to jump to a word in the current buffer (works as an evil motion) (thanks to justbur) diff --git a/doc/DOCUMENTATION.org b/doc/DOCUMENTATION.org index d5d64ac2b..65801ceca 100644 --- a/doc/DOCUMENTATION.org +++ b/doc/DOCUMENTATION.org @@ -1641,10 +1641,10 @@ selecting an avy candidate. | Key Binding | Description | |-------------+----------------------------------------------------| +| ~SPC j b~ | go back to the previous location (before the jump) | | ~SPC j j~ | initiate avy jump char | | ~SPC j w~ | initiate avy jump word | | ~SPC j l~ | initiate avy jump line | -| ~SPC j u~ | go back to the previous location (before the jump) | **** ace-link mode Similar to =avy=, [[https://github.com/abo-abo/ace-link][ace-link]] allows one to jump to any link in @@ -1693,7 +1693,7 @@ The ~SPC j~ prefix is for jumping, joining and splitting. |-------------+-----------------------------------------------------------------------------------| | ~SPC j 0~ | go to the beginning of line (and set a mark at the previous location in the line) | | ~SPC j $~ | go to the end of line (and set a mark at the previous location in the line) | -| ~SPC j b~ | jump to a bookmark | +| ~SPC j b~ | undo a jump (go back to previous location) | | ~SPC j d~ | jump to a listing of the current directory | | ~SPC j D~ | jump to a listing of the current directory (other window) | | ~SPC j f~ | jump to the definition of the function around point | @@ -1703,8 +1703,7 @@ The ~SPC j~ prefix is for jumping, joining and splitting. | ~SPC j J~ | jump to a suite of two characters in the buffer (works as an evil motion) | | ~SPC j k~ | jump to next line and indent it using auto-indent rules | | ~SPC j l~ | jump to a line with avy (works as an evil motion) | -| ~SPC j u~ | undo a jump (go back to previous location) | -| ~SPC j U~ | jump to a URL in the current buffer | +| ~SPC j u~ | jump to a URL in the current buffer | | ~SPC j v~ | jump to the definition/declaration of the variable around point | | ~SPC j w~ | jump to a word in the current buffer (works as an evil motion) | diff --git a/layers/+distribution/spacemacs-base/keybindings.el b/layers/+distribution/spacemacs-base/keybindings.el index 8d1eada78..beda2ddee 100644 --- a/layers/+distribution/spacemacs-base/keybindings.el +++ b/layers/+distribution/spacemacs-base/keybindings.el @@ -135,7 +135,6 @@ (spacemacs/set-leader-keys "j0" 'spacemacs/push-mark-and-goto-beginning-of-line "j$" 'spacemacs/push-mark-and-goto-end-of-line - "jb" 'bookmark-jump "jd" 'dired-jump "jD" 'dired-jump-other-window "jf" 'find-function-at-point diff --git a/layers/+spacemacs/spacemacs-editing/packages.el b/layers/+spacemacs/spacemacs-editing/packages.el index 83c49c4fe..768936f73 100644 --- a/layers/+spacemacs/spacemacs-editing/packages.el +++ b/layers/+spacemacs/spacemacs-editing/packages.el @@ -58,11 +58,11 @@ (setq avy-all-windows 'all-frames) (setq avy-background t) (spacemacs/set-leader-keys + "jb" 'avy-pop-mark "jj" 'evil-avy-goto-char "jJ" 'evil-avy-goto-char-2 "jl" 'evil-avy-goto-line - "ju" 'avy-pop-mark - "jU" 'spacemacs/avy-goto-url + "ju" 'spacemacs/avy-goto-url "jw" 'evil-avy-goto-word-or-subword-1 "xo" 'spacemacs/avy-open-url)) :config