Merge branch 'master' into v3
This commit is contained in:
commit
b523b507ba
|
@ -13,7 +13,7 @@
|
||||||
;; ABILITIES
|
;; ABILITIES
|
||||||
;; =========
|
;; =========
|
||||||
;; Disable abilities which you don't want.
|
;; Disable abilities which you don't want.
|
||||||
(disable 'rbenv 'helm 'spell 'linum 'tabbar
|
(disable 'rbenv 'helm 'spell 'linum 'tabbar 'ido 'ivy
|
||||||
'smart-mode-line 'desktop-mode 'jedi
|
'smart-mode-line 'desktop-mode 'jedi
|
||||||
'dired+ 'guru 'emoji 'elpy 'github
|
'dired+ 'guru 'emoji 'elpy 'github
|
||||||
'versioned-backup)
|
'versioned-backup)
|
||||||
|
|
|
@ -50,6 +50,11 @@
|
||||||
(depends-on 'ivy)
|
(depends-on 'ivy)
|
||||||
(depends-on 'counsel))
|
(depends-on 'counsel))
|
||||||
|
|
||||||
|
(with-ability selectrum
|
||||||
|
(depends-on 'selectrum)
|
||||||
|
(depends-on 'selectrum-prescient)
|
||||||
|
(depends-on 'ctrlf))
|
||||||
|
|
||||||
(with-ability ido
|
(with-ability ido
|
||||||
(depends-on 'ido)
|
(depends-on 'ido)
|
||||||
(depends-on 'ido-completing-read+)
|
(depends-on 'ido-completing-read+)
|
||||||
|
|
|
@ -248,6 +248,7 @@
|
||||||
|
|
||||||
;; expand-region -------------------------------------------
|
;; expand-region -------------------------------------------
|
||||||
(global-set-key (kbd "C-=") 'er/expand-region)
|
(global-set-key (kbd "C-=") 'er/expand-region)
|
||||||
|
(global-set-key (kbd "C-+") 'er/contract-region)
|
||||||
|
|
||||||
;; Multiple cursor -----------------------------------------
|
;; Multiple cursor -----------------------------------------
|
||||||
;; multiple cursor configurations
|
;; multiple cursor configurations
|
||||||
|
@ -300,6 +301,18 @@
|
||||||
(setq ido-enable-flex-matching t)
|
(setq ido-enable-flex-matching t)
|
||||||
(ido-vertical-mode 1))
|
(ido-vertical-mode 1))
|
||||||
|
|
||||||
|
(ability selectrum ()
|
||||||
|
"Selectrum is a better replacement for IDO and Ivy"
|
||||||
|
(require 'selectrum)
|
||||||
|
(require 'selectrum-prescient)
|
||||||
|
|
||||||
|
(selectrum-mode +1)
|
||||||
|
(selectrum-prescient-mode +1)
|
||||||
|
(prescient-persist-mode +1)
|
||||||
|
(when-not-wm
|
||||||
|
(require 'ctrlf)
|
||||||
|
(ctrlf-mode +1))
|
||||||
|
(setq prescient-filter-method '(literal fuzzy regexp initialism)))
|
||||||
|
|
||||||
(ability ivy ()
|
(ability ivy ()
|
||||||
"Completion using ivy."
|
"Completion using ivy."
|
||||||
|
|
|
@ -41,12 +41,13 @@
|
||||||
:group 'simple-serene-mode)
|
:group 'simple-serene-mode)
|
||||||
|
|
||||||
(defvar serene-simple-mode-special-forms
|
(defvar serene-simple-mode-special-forms
|
||||||
'("do" "let" "def" "fn" "quote" "cond" "if"))
|
'("do" "let" "def" "fn" "quote" "cond" "if"
|
||||||
|
"defn" "defmacro" "list" "ns"))
|
||||||
|
|
||||||
|
|
||||||
(defconst serene-simple-mode-builtin-fns
|
(defconst serene-simple-mode-builtin-fns
|
||||||
'("=" ">" "<" ">=" "<=" "and" "or" "not" "first" "rest" "println"
|
'("=" ">" "<" ">=" "<=" "and" "or" "not" "first" "rest" "println"
|
||||||
"quit" "+" "*" "/" "-" "conj" "mod" "new"))
|
"quit" "+" "*" "/" "-" "conj" "mod" "new" "pr" "prn" "print"))
|
||||||
|
|
||||||
|
|
||||||
(defconst serene-simple-mode-builtin-types
|
(defconst serene-simple-mode-builtin-types
|
||||||
|
|
Loading…
Reference in New Issue