diff --git a/.gitignore b/.gitignore index 032ae6f..526af10 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ flycheck_init.el local-init.el* *.elc +/elisp/loaddefs.el diff --git a/elisp/hs-preserve-mode.el b/elisp/hs-preserve-mode.el index 9c2df49..a72cf21 100644 --- a/elisp/hs-preserve-mode.el +++ b/elisp/hs-preserve-mode.el @@ -74,9 +74,10 @@ OV is the overlay to filter." PATH defaults to the current buffer's visited file. PATH must not have multiple separators between directories. That is \"a//b\" will result in invalid return values." - (expand-file-name - (string-replace "/" "%" (string-replace "%" "%%" (or path buffer-file-name))) - hs-preserve-mode-db-directory)) + (when (or path buffer-file-name) + (expand-file-name + (string-replace "/" "%" (string-replace "%" "%%" (or path buffer-file-name))) + hs-preserve-mode-db-directory))) (defun hs-preserve-mode--file-modification-time (path) "Return the modification time of PATH as an float." @@ -263,16 +264,17 @@ buffer-local changes in hook functions will be reflected." "Restore previous folds if the database is valid. If it is invalid, print a message explaining why and do nothing." (interactive) - (with-demoted-errors "`hs-preserve-mode' error: %s" - (let* ((db-path (hs-preserve-mode--db-file-path)) - (status (hs-preserve-mode--db-invalid-p db-path))) - (cond - ((eq status 'outdated) - (message "`hs-preserve-mode' error: Database outdated, not loading...")) - ((eq status 'modified) - (message "`hs-preserve-mode' error: Buffer modified, not loading...")) - ((not status) - (hs-preserve-mode--load-db-file db-path)))))) + (when buffer-file-name + (with-demoted-errors "`hs-preserve-mode' error: %s" + (let* ((db-path (hs-preserve-mode--db-file-path)) + (status (hs-preserve-mode--db-invalid-p db-path))) + (cond + ((eq status 'outdated) + (message "`hs-preserve-mode' error: Database outdated, not loading...")) + ((eq status 'modified) + (message "`hs-preserve-mode' error: Buffer modified, not loading...")) + ((not status) + (hs-preserve-mode--load-db-file db-path))))))) (provide 'hs-preserve-mode) ;;; hs-preserve-mode.el ends here diff --git a/elisp/ltex-eglot.el b/elisp/ltex-eglot.el index 2680f30..7069361 100644 --- a/elisp/ltex-eglot.el +++ b/elisp/ltex-eglot.el @@ -400,15 +400,12 @@ language setting in any file." (ltex-eglot--set-variable server 'ltex-eglot-language language)) (eglot-signal-didChangeConfiguration server))) -;;;###autoload (add-to-list 'eglot-server-programs (cons ltex-eglot-modes (list 'ltex-eglot-server ltex-eglot-server-binary "--server-type" "TcpSocket" "--no-endless" "--port" :autoport))) - -;;;###autoload (advice-add 'eglot--workspace-configuration-plist :around 'ltex-eglot--hack-server-config) diff --git a/init.el b/init.el index fc84d93..c7a2d93 100644 --- a/init.el +++ b/init.el @@ -3895,4 +3895,9 @@ one of the normal rainbow-delimiters-depth-N-face faces." :config (evil-set-initial-state 'mines-mode 'emacs)) +(let* ((user-lisp-directory (expand-file-name "elisp" user-emacs-directory)) + (loaddefs-file (expand-file-name "loaddefs.el" user-lisp-directory))) + (loaddefs-generate user-lisp-directory loaddefs-file) + (load loaddefs-file)) + ;;; init.el ends here