From 3622e36c75e997ef1c046501627dc672993457fa Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 10 Apr 2020 13:47:41 -0400 Subject: [PATCH 1/3] Fix 'buffer does not seem to be associated with any file' error Fixes #2869 Closes #2870 --- modules/tools/magit/autoload.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/tools/magit/autoload.el b/modules/tools/magit/autoload.el index 22259c480..f96b0ff9f 100644 --- a/modules/tools/magit/autoload.el +++ b/modules/tools/magit/autoload.el @@ -48,12 +48,11 @@ (defun +magit--revert-buffer (buffer) (with-current-buffer buffer (kill-local-variable '+magit--stale-p) - (let* ((buffer (or (buffer-base-buffer) (current-buffer))) - (file (buffer-file-name buffer))) - (if (or (buffer-modified-p buffer) - (and file (file-exists-p file))) + (when buffer-file-name + (if (buffer-modified-p (current-buffer)) (when (bound-and-true-p vc-mode) - (vc-refresh-state)) + (vc-refresh-state) + (force-mode-line-update)) (revert-buffer t t))))) ;;;###autoload From 88fc240d0f92e4fa0add2d33099a1e6b1d5de62e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 10 Apr 2020 14:40:14 -0400 Subject: [PATCH 2/3] org-roam-verbose = nil Silence 'files: 0, links: 0, titles: 0, refs: 0, deleted: 0' when starting up org-mode. --- modules/lang/org/contrib/roam.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/lang/org/contrib/roam.el b/modules/lang/org/contrib/roam.el index 961ea9b75..e55c839d1 100644 --- a/modules/lang/org/contrib/roam.el +++ b/modules/lang/org/contrib/roam.el @@ -33,8 +33,9 @@ :desc "Tomorrow" "m" #'org-roam-tomorrow :desc "Yesterday" "y" #'org-roam-yesterday)) :config - (unless org-roam-directory - (setq org-roam-directory org-directory))) + (setq org-roam-directory (expand-file-name (or org-roam-directory "") + org-directory) + org-roam-verbose nil)) ; https://youtu.be/fn4jIlFwuLU ;; Since the org module lazy loads org-protocol (waits until an org URL is From af3c7266d8f3405cbea77d04561a6f1e9d23f366 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 10 Apr 2020 23:20:25 -0400 Subject: [PATCH 3/3] Extend +web-django-mode to python-mode --- modules/lang/web/config.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/web/config.el b/modules/lang/web/config.el index e3a6a74b1..ea094a792 100644 --- a/modules/lang/web/config.el +++ b/modules/lang/web/config.el @@ -30,7 +30,7 @@ (web-mode-set-engine "django"))) (def-project-mode! +web-django-mode - :modes '(web-mode) + :modes '(web-mode python-mode) :files ("manage.py") :on-enter (when (derived-mode-p 'web-mode)