diff --git a/lang/clang.el b/lang/clang.el index 7dd980b..421769a 100644 --- a/lang/clang.el +++ b/lang/clang.el @@ -3,7 +3,6 @@ ;;; Code: (require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") -(require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (defun +custom-lang-clang/activate-clang-mode () @@ -22,13 +21,7 @@ (defvar c-default-style "bsd")) (add-to-list (make-local-variable 'company-backends) - '(company-etags company-yasnippet)) - - (setq-local - ctags/refresh-command - (format - "ctags -e -R --languages=C -f %sTAGS %s/*" - (projectile-project-root) (projectile-project-root)))) + '(company-etags company-yasnippet))) (add-hook 'c-mode-hook '+custom-lang-clang/activate-clang-mode) diff --git a/lang/erlang.el b/lang/erlang.el index 96b1e8e..bdb60b4 100644 --- a/lang/erlang.el +++ b/lang/erlang.el @@ -2,7 +2,6 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (require 'icejam-lsp) diff --git a/lang/python.el b/lang/python.el index ab41623..32a0ad3 100644 --- a/lang/python.el +++ b/lang/python.el @@ -4,7 +4,6 @@ (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") -(require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") (transient-define-prefix +custom-lang-python/transient-context-menu () "Python Buffer Commands" diff --git a/lang/ruby.el b/lang/ruby.el index cc555ea..0c74f8f 100644 --- a/lang/ruby.el +++ b/lang/ruby.el @@ -4,7 +4,6 @@ (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") -(require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") (use-package rspec-mode :straight t :defer t) (use-package ruby-end :straight t :defer t) diff --git a/lang/ziglang.el b/lang/ziglang.el index 0aa30ba..cb76e8b 100644 --- a/lang/ziglang.el +++ b/lang/ziglang.el @@ -11,7 +11,6 @@ ;;; Code: (require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") -(require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (use-package zig-mode :straight t :defer t :requires (lsp)) diff --git a/lisp/icejam-init.el b/lisp/icejam-init.el index 69115ac..d7f70c6 100644 --- a/lisp/icejam-init.el +++ b/lisp/icejam-init.el @@ -43,8 +43,7 @@ (require '+custom-pkg-company-yasnippet "$HOME/.emacs.d/pkg/company-yasnippet.el") (require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") (require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") -(require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") -(require '+custom-pkg-ispell "$HOME/.emacs.d/pkg/ispell.el") +(require 'icejam-ispell) (require 'icejam-deft) (require 'icejam-lsp) (require 'icejam-dashboard) diff --git a/pkg/ispell.el b/lisp/icejam-ispell.el similarity index 94% rename from pkg/ispell.el rename to lisp/icejam-ispell.el index c988255..f26a7f6 100644 --- a/pkg/ispell.el +++ b/lisp/icejam-ispell.el @@ -20,5 +20,5 @@ (use-package flyspell-correct :straight t :after flyspell :defer t) (use-package flyspell-correct-ivy :straight :after flyspell-correct :defer t) -(provide '+custom-pkg-ispell) -;;; ispell.el ends here +(provide 'icejam-ispell) +;;; icejam-ispell.el ends here diff --git a/pkg/ctags.el b/pkg/ctags.el deleted file mode 100644 index fb95fd1..0000000 --- a/pkg/ctags.el +++ /dev/null @@ -1,56 +0,0 @@ -;;; pkg/ctags -- summary -*- lexical-binding: t; -*- -;;; Commentary: -;;; Old and rudimental completion framework. -;;; Code: -(require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") - -(setq tags-add-tables nil) - -(defvar ctags/refresh-command - (format "ctags -e -R -f %sTAGS %s." - default-directory default-directory)) - -;; Sentinel function for capturing ctags -(defun ctags/process-callback (process event) - "Show status of asynchronous ctags PROCESS after it send finished EVENT." - (cond - ((string-equal event "finished\n") - (message "Creating tag files...completed") - (kill-buffer (get-buffer "*ctags*")) - (visit-tags-table (format "%sTAGS" (projectile-project-root)))) - (t - (message "Creating tags file...failed") - (pop-to-buffer (get-buffer "*ctags*")) - ))) - -(cl-defun ctags/refresh-ctags (&key silent) - "Refresh ctags according to currently set command. With SILENT you can make it, uhh... silent." - (interactive) - - ;; Print message if not silent - (when (not silent) (message "Starting ctags process...")) - - ;; Return if a version of the process is already running - (when (not (get-process "ctags")) - (start-process-shell-command "ctags" "*ctags*" ctags/refresh-command) - (set-process-sentinel (get-process "ctags") 'ctags/process-callback))) - -;; Ctags bindings -(define-key prog-mode-map (kbd "C-c E") 'ctags/refresh-ctags) - -;; Automatically update tags on save, but be silent about it. -(defvar ctags/major-modes-to-update-on-save '()) -(defun ctags/update-tags-on-save () - "Update tags if current major mode is part of the list." - (interactive) - (when (member major-mode ctags/major-modes-to-update-on-save) - (ctags/refresh-ctags :silent t))) - -(defun ctags/update-this-mode-on-save (mode) - "Update MODE on save." - (add-to-list (make-local-variable 'ctags/major-modes-to-update-on-save) mode)) - -(add-hook 'after-save-hook 'ctags/update-tags-on-save) - -(provide '+custom-pkg-ctags) -;;; ctags.el ends here