diff --git a/core/core-projects.el b/core/core-projects.el index ab2303507..9af5b90a1 100644 --- a/core/core-projects.el +++ b/core/core-projects.el @@ -18,6 +18,10 @@ (add-hook 'find-file-hook #'doom|init-project-mode) (projectile-mode +1) + (define-key! + [remap evil-jump-to-tag] #'projectile-find-tag + [remap find-tag] #'projectile-find-tag) + ;; a more generic project root file (push ".project" projectile-project-root-files-bottom-up) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index c7b1b8b7b..e4e8363cf 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -77,8 +77,8 @@ immediately runs it on the current candidate (ending the ivy session)." :commands (ivy-dispatching-done-hydra ivy--matcher-desc) :init (define-key! ivy-minibuffer-map - "\C-o" #'+ivy-coo-hydra/body - (kbd "M-o") #'ivy-dispatching-done-hydra))) + "C-o" #'+ivy-coo-hydra/body + "M-o" #'ivy-dispatching-done-hydra))) (def-package! ivy-rich diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index d4caaf18f..ae0f578a0 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -17,9 +17,6 @@ "M-;" #'eval-expression "A-;" #'eval-expression) - [remap evil-jump-to-tag] #'projectile-find-tag - [remap find-tag] #'projectile-find-tag - ;; Smart tab :i [tab] (general-predicate-dispatch nil ; fall back to nearest keymap (and (featurep! :feature snippets) diff --git a/modules/config/default/config.el b/modules/config/default/config.el index dceb73ddc..bbc4660b5 100644 --- a/modules/config/default/config.el +++ b/modules/config/default/config.el @@ -131,12 +131,12 @@ :prefix doom-leader-key "u" #'universal-argument-more :prefix doom-leader-alt-key "u" #'universal-argument-more)) -(defun +default|setup-input-decode-map () +(defun +default|init-input-decode-map () "Ensure TAB and [tab] are treated the same in TTY Emacs." (define-key input-decode-map [tab] (kbd "TAB")) (define-key input-decode-map [return] (kbd "RET")) (define-key input-decode-map [escape] (kbd "ESC"))) -(add-hook 'tty-setup-hook #'+default|setup-input-decode-map) +(add-hook 'tty-setup-hook #'+default|init-input-decode-map) ;; A Doom convention where C-s on popups and interactive searches will invoke ;; ivy/helm for their superior filtering. diff --git a/modules/feature/evil/autoload/evil.el b/modules/feature/evil/autoload/evil.el index 8eb6638ea..cac9a022e 100644 --- a/modules/feature/evil/autoload/evil.el +++ b/modules/feature/evil/autoload/evil.el @@ -50,10 +50,10 @@ (call-interactively #'evil-paste-after))) (defun +evil--window-swap (direction) - "Move current window to the next window in DIRECTION. If there are no windows -there and there is only one window, split in that direction and place this -window there. If there are no windows and this isn't the only window, use -evil-window-move-* (e.g. `evil-window-move-far-left')" + "Move current window to the next window in DIRECTION. +If there are no windows there and there is only one window, split in that +direction and place this window there. If there are no windows and this isn't +the only window, use evil-window-move-* (e.g. `evil-window-move-far-left')." (when (window-dedicated-p) (user-error "Cannot swap a dedicated window")) (let* ((this-window (selected-window)) diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el index 661d6d8ef..b3f6f37dd 100644 --- a/modules/lang/emacs-lisp/autoload.el +++ b/modules/lang/emacs-lisp/autoload.el @@ -98,17 +98,17 @@ library/userland functions" (defun +emacs-lisp|extend-imenu () "Improve imenu support with better expression regexps and Doom-specific forms." (setq imenu-generic-expression - '(("Evil Commands" "^\\s-*(evil-define-\\(?:command\\|operator\\|motion\\) +\\(\\_<[^ ()\n]+\\_>\\)" 1) + '(("Evil commands" "^\\s-*(evil-define-\\(?:command\\|operator\\|motion\\) +\\(\\_<[^ ()\n]+\\_>\\)" 1) ("Unit tests" "^\\s-*(\\(?:ert-deftest\\|describe\\) +\"\\([^\")]+\\)\"" 1) ("Package" "^\\s-*(\\(?:def-\\)?package! +\\(\\_<[^ ()\n]+\\_>\\)" 1) - ("Package" "^\\s-*;; `\\(\\_<[^ ()\n]+\\_>\\)'$" 1) + ("Package" "^\\s-*;;;###package\\s-+\\(\\_<[^ ()\n]+\\_>\\)$" 1) ("Major modes" "^\\s-*(define-derived-mode +\\([^ ()\n]+\\)" 1) ("Modelines" "^\\s-*(def-modeline! +\\([^ ()\n]+\\)" 1) - ("Modeline Segments" "^\\s-*(def-modeline-segment! +\\([^ ()\n]+\\)" 1) + ("Modeline segments" "^\\s-*(def-modeline-segment! +\\([^ ()\n]+\\)" 1) ("Advice" "^\\s-*(def\\(?:\\(?:ine-\\)?advice\\))") ("Modes" "^\\s-*(define-\\(?:global\\(?:ized\\)?-minor\\|generic\\|minor\\)-mode +\\([^ ()\n]+\\)" 1) ("Macros" "^\\s-*(\\(?:cl-\\)?def\\(?:ine-compile-macro\\|macro\\) +\\([^ )\n]+\\)" 1) - ("Inline Functions" "\\s-*(\\(?:cl-\\)?defsubst +\\([^ )\n]+\\)" 1) + ("Inline functions" "\\s-*(\\(?:cl-\\)?defsubst +\\([^ )\n]+\\)" 1) ("Functions" "^\\s-*(\\(?:cl-\\)?def\\(?:un\\|un\\*\\|method\\|generic\\|-memoized!\\) +\\([^ ,)\n]+\\)" 1) ("Variables" "^\\s-*(\\(def\\(?:c\\(?:onst\\(?:ant\\)?\\|ustom\\)\\|ine-symbol-macro\\|parameter\\|var\\(?:-local\\)?\\)\\)\\s-+\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)" 2) ("Types" "^\\s-*(\\(cl-def\\(?:struct\\|type\\)\\|def\\(?:class\\|face\\|group\\|ine-\\(?:condition\\|error\\|widget\\)\\|package\\|struct\\|t\\(?:\\(?:hem\\|yp\\)e\\)\\)\\)\\s-+'?\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)" 2)))) diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el index 7d1baa578..c741fa931 100644 --- a/modules/lang/emacs-lisp/config.el +++ b/modules/lang/emacs-lisp/config.el @@ -60,7 +60,7 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.") (font-lock-add-keywords 'emacs-lisp-mode (append `(;; custom Doom cookies - ("^;;;###\\(autodef\\|if\\)[ \n]" (1 font-lock-warning-face t))) + ("^;;;###\\(autodef\\|if\\|package\\)[ \n]" (1 font-lock-warning-face t))) ;; highlight defined, special variables & functions (when +emacs-lisp-enable-extra-fontification `((+emacs-lisp-highlight-vars-and-faces . +emacs-lisp--face))))) diff --git a/modules/ui/doom-dashboard/config.el b/modules/ui/doom-dashboard/config.el index a0be1f422..f06158d7c 100644 --- a/modules/ui/doom-dashboard/config.el +++ b/modules/ui/doom-dashboard/config.el @@ -429,7 +429,11 @@ controlled by `+doom-dashboard-pwd-policy'." (with-temp-buffer (save-excursion (insert (key-description key))) (while (re-search-forward "<\\([^>]+\\)>" nil t) - (replace-match (upcase (substring (match-string 1) 0 3)))) + (let ((str (match-string 1))) + (replace-match + (upcase (if (< (length str) 3) + str + (substring str 0 3)))))) (propertize (buffer-string) 'face 'font-lock-constant-face))) "")))) (if (display-graphic-p)