Rename Vim style related variable to vim-style-xxxxx

Update the documentation
Define alias for backward compatibility
This commit is contained in:
syl20bnr 2018-06-08 01:33:03 -04:00
parent e39b3495bd
commit 9539e4206d
5 changed files with 32 additions and 34 deletions

View File

@ -226,19 +226,6 @@ emacs.")
"Default font, or prioritized list of fonts. This setting has no effect when "Default font, or prioritized list of fonts. This setting has no effect when
running Emacs in terminal.") running Emacs in terminal.")
(defvar dotspacemacs-remap-Y-to-y$ nil
"If non nil `Y' is remapped to `y$' in Evil states.")
(defvar dotspacemacs-retain-visual-state-on-shift t
"If non-nil, the shift mappings `<' and `>' retain visual state
if used there.")
(defvar dotspacemacs-visual-line-move-text nil
"If non-nil, J and K move lines up and down when in visual mode.")
(defvar dotspacemacs-ex-substitute-global nil
"If non nil, inverse the meaning of `g' in `:substitute' Evil ex-command.")
(defvar dotspacemacs-folding-method 'evil (defvar dotspacemacs-folding-method 'evil
"Code folding method. Possible values are `evil' and `origami'.") "Code folding method. Possible values are `evil' and `origami'.")

View File

@ -238,21 +238,6 @@ It should only modify the values of Spacemacs settings."
;; works in the GUI. (default nil) ;; works in the GUI. (default nil)
dotspacemacs-distinguish-gui-tab nil dotspacemacs-distinguish-gui-tab nil
;; If non-nil `Y' is remapped to `y$' in Evil states. (default nil)
dotspacemacs-remap-Y-to-y$ nil
;; If non-nil, the shift mappings `<' and `>' retain visual state if used
;; there. (default t)
dotspacemacs-retain-visual-state-on-shift t
;; If non-nil, `J' and `K' move lines up and down when in visual mode.
;; (default nil)
dotspacemacs-visual-line-move-text nil
;; If non-nil, inverse the meaning of `g' in `:substitute' Evil ex-command.
;; (default nil)
dotspacemacs-ex-substitute-global nil
;; Name of the default layout (default "Default") ;; Name of the default layout (default "Default")
dotspacemacs-default-layout-name "Default" dotspacemacs-default-layout-name "Default"

View File

@ -756,15 +756,23 @@ When setting the Vim style you can pass any variable supported by =evil-mode=
with the keyword =:variables=. Spacemacs also supports the followgin editing with the keyword =:variables=. Spacemacs also supports the followgin editing
style variables for Vim: style variables for Vim:
| Variable | Description | | Variables | Description |
|-----------------------------+---------------------------------------------| |------------------------------------------+-------------------------------------------------------------------------|
| =vim-style-visual-feedback= | If non-nil then brief highlights on objects | | =vim-style-visual-feedback= | If non-nil then objects are briefly highlighted |
| =vim-style-remap-Y-to-y$= | If non-nil ~Y~ is remapped to ~y$~ in Evil states |
| =vim-style-retain-visual-state-on-shift= | If non-nil, the shift mappings ~<~ and ~>~ retain visual state |
| =vim-style-visual-line-move-text= | If non-nil, ~J~ and ~K~ move lines up and down when in visual mode |
| =vim-style-ex-substitute-global= | If non-nil, inverse the meaning of ~g~ in =:substitute= Evil ex-command |
Default configuration is: Default configuration is:
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(setq-default dotspacemacs-editing-style '(vim :variables (setq-default dotspacemacs-editing-style '(vim :variables
vim-style-visual-feedback t) vim-style-visual-feedback t
vim-style-remap-Y-to-y$ nil
vim-style-retain-visual-state-on-shift t
vim-style-visual-line-move-text nil
vim-style-ex-substitute-global nil)
#+END_SRC #+END_SRC
*** Emacs *** Emacs

View File

@ -46,6 +46,24 @@ to a major mode, a list of such symbols, or the symbol t,
acting as default. The values are either integers, symbols acting as default. The values are either integers, symbols
or lists of these.") or lists of these.")
(defvar vim-style-remap-Y-to-y$ nil
"If non nil `Y' is remapped to `y$' in Evil states.")
(defvaralias 'dotspacemacs-remap-Y-to-y$ 'vim-style-remap-Y-to-y$)
(defvar vim-style-retain-visual-state-on-shift t
"If non-nil, the shift mappings `<' and `>' retain visual state
if used there.")
(defvaralias 'dotspacemacs-retain-visual-state-on-shift
'vim-style-retain-visual-state-on-shift)
(defvar vim-style-visual-line-move-text nil
"If non-nil, J and K move lines up and down when in visual mode.")
(defvaralias 'dotspacemacs-visual-line-move-text 'vim-style-visual-line-move-text)
(defvar vim-style-ex-substitute-global nil
"If non nil, inverse the meaning of `g' in `:substitute' Evil ex-command.")
(defvaralias 'dotspacemacs-ex-substitute-global 'vim-style-ex-substitute-global)
;; State cursors ;; State cursors
(defvar spacemacs-evil-cursors '(("normal" "DarkGoldenrod2" box) (defvar spacemacs-evil-cursors '(("normal" "DarkGoldenrod2" box)
("insert" "chartreuse3" (bar . 2)) ("insert" "chartreuse3" (bar . 2))

View File

@ -119,7 +119,7 @@
evil-goggles-blocking-duration 0.05) evil-goggles-blocking-duration 0.05)
(if vim-style-visual-feedback (if vim-style-visual-feedback
(evil-goggles-mode) (evil-goggles-mode)
(evil-googles-mode -1))) (evil-goggles-mode -1)))
:config :config
(spacemacs|hide-lighter evil-goggles-mode))) (spacemacs|hide-lighter evil-goggles-mode)))