Merge branch 'master' into v3

config/fg42.user.el

@@ -13,7 +13,7 @@
 ;; ABILITIES
 ;; =========
 ;; 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
          'dired+ 'guru 'emoji 'elpy 'github
          'versioned-backup)

lib/extensions/editor.el

@@ -50,6 +50,11 @@
               (depends-on 'ivy)
               (depends-on 'counsel))
 
+(with-ability selectrum
+              (depends-on 'selectrum)
+              (depends-on 'selectrum-prescient)
+              (depends-on 'ctrlf))
+
 (with-ability ido
               (depends-on 'ido)
               (depends-on 'ido-completing-read+)

lib/extensions/editor/init.el

@@ -248,6 +248,7 @@
 
   ;; expand-region -------------------------------------------
   (global-set-key (kbd "C-=") 'er/expand-region)
+  (global-set-key (kbd "C-+") 'er/contract-region)
 
   ;; Multiple cursor -----------------------------------------
   ;; multiple cursor configurations
@@ -300,6 +301,18 @@
            (setq ido-enable-flex-matching t)
            (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 ()
            "Completion using ivy."

lib/extensions/serene/serene-simple-mode.el

@@ -41,12 +41,13 @@
   :group 'simple-serene-mode)
 
 (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
   '("=" ">" "<" ">=" "<=" "and" "or" "not" "first" "rest" "println"
-    "quit" "+" "*" "/" "-" "conj" "mod" "new"))
+    "quit" "+" "*" "/" "-" "conj" "mod" "new" "pr" "prn" "print"))
 
 
 (defconst serene-simple-mode-builtin-types