changelog shortlog graph tags branches files raw help

Mercurial > core / changeset: capf fixes

changeset 621: d7f04a773c60
parent 620: 671f87e36e07
child 622: c0062541039f
author: Richard Westhaver <ellis@rwest.io>
date: Fri, 23 Aug 2024 19:03:17 -0400
files: emacs/default.el
description: capf fixes
     1.1--- a/emacs/default.el	Fri Aug 23 19:01:57 2024 -0400
     1.2+++ b/emacs/default.el	Fri Aug 23 19:03:17 2024 -0400
     1.3@@ -44,19 +44,22 @@
     1.4  shr-use-xwidgets-for-media t
     1.5  which-key-mode t
     1.6  view-read-only t)
     1.7-(add-to-list 'treesit-extra-load-path "/usr/local/lib/")
     1.8+
     1.9+;;; Treesitter
    1.10+
    1.11+;;(add-to-list 'treesit-extra-load-path "/usr/local/lib/")
    1.12 
    1.13-(let ((grammar-dir "/usr/local/share/tree-sitter/"))
    1.14-  (when (file-exists-p grammar-dir)
    1.15-    (setq treesit-extra-load-path
    1.16-          (append
    1.17-           (flatten
    1.18-            (mapcar
    1.19-             (lambda (f)
    1.20-               (unless (or (string= "." f) (string= ".." f))
    1.21-                 (concat grammar-dir f)))
    1.22-             (directory-files "/usr/local/share/tree-sitter")))
    1.23-           treesit-extra-load-path))))
    1.24+;; (let ((grammar-dir "/usr/local/share/tree-sitter/"))
    1.25+;;   (when (file-exists-p grammar-dir)
    1.26+;;     (setq treesit-extra-load-path
    1.27+;;           (append
    1.28+;;            (flatten
    1.29+;;             (mapcar
    1.30+;;              (lambda (f)
    1.31+;;                (unless (or (string= "." f) (string= ".." f))
    1.32+;;                  (concat grammar-dir f)))
    1.33+;;              (directory-files "/usr/local/share/tree-sitter")))
    1.34+;;            treesit-extra-load-path))))
    1.35 
    1.36 ;;; Variables
    1.37 (defvar user-emacs-lib-directory (expand-file-name (join-paths user-emacs-directory "lib")))
    1.38@@ -124,7 +127,7 @@
    1.39 (add-to-list 'exec-path "/usr/local/share/lisp/bin/")
    1.40 
    1.41 ;;; Completions
    1.42-(use-package cape)
    1.43+(use-package cape :ensure t)
    1.44 (use-package orderless
    1.45   :ensure t
    1.46   :init
    1.47@@ -151,6 +154,7 @@
    1.48   (add-to-list 'completion-at-point-functions #'cape-abbrev t))
    1.49 
    1.50 (use-package vertico
    1.51+  :ensure t
    1.52   :config (vertico-mode)
    1.53   (keymap-set vertico-map "M-q" #'vertico-quick-insert)
    1.54   (keymap-set vertico-map "C-q" #'vertico-quick-exit))
    1.55@@ -181,8 +185,7 @@
    1.56 ;;; Lisp
    1.57 (use-package slime
    1.58   :ensure t
    1.59-  :hook ((slime-repl-mode . #'slime-cape-maybe-enable)
    1.60-         (slime-mode . #'slime-cape-maybe-enable)
    1.61+  :hook ((slime-mode . #'slime-cape-maybe-enable)
    1.62          (sldb . #'slime-cape-maybe-enable))
    1.63   :init
    1.64   (require 'slime-cape)