From f8ae98f1bfb0de8fb90e86d40d0a5c8a1c7a8bd9 Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Mon, 4 Jan 2021 20:52:11 +0000 Subject: [PATCH] Wrap the ctrlf mode in a when-not-wm --- lib/extensions/editor/init.el | 5 +++-- lib/extensions/serene/serene-simple-mode.el | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/extensions/editor/init.el b/lib/extensions/editor/init.el index 39a402c..25b4117 100644 --- a/lib/extensions/editor/init.el +++ b/lib/extensions/editor/init.el @@ -304,12 +304,13 @@ "Selectrum is a better replacement for IDO and Ivy" (require 'selectrum) (require 'selectrum-prescient) - (require 'ctrlf) (selectrum-mode +1) (selectrum-prescient-mode +1) (prescient-persist-mode +1) - (ctrlf-mode +1) + (when-not-wm + (require 'ctrlf) + (ctrlf-mode +1)) (setq prescient-filter-method '(literal fuzzy regexp initialism))) (ability ivy () diff --git a/lib/extensions/serene/serene-simple-mode.el b/lib/extensions/serene/serene-simple-mode.el index be2b421..e43850d 100644 --- a/lib/extensions/serene/serene-simple-mode.el +++ b/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