Merge branch 'develop' into loadConditions

modules/lang/org/contrib/roam.el

@@ -33,14 +33,16 @@
           :desc "Tomorrow"       "m" #'org-roam-tomorrow
           :desc "Yesterday"      "y" #'org-roam-yesterday))
   :config
-  (unless org-roam-directory
+  (setq org-roam-directory (expand-file-name (or org-roam-directory "")
-    (setq org-roam-directory org-directory))
+                                             org-directory)
-  (setq org-roam-completion-system
+        org-roam-verbose nil  ; https://youtu.be/fn4jIlFwuLU
+        org-roam-completion-system
         (cond ((featurep! :completion helm) 'helm)
               ((featurep! :completion ivy) 'ivy)
               ((featurep! :completion ido) 'ido)
               ('default))))
 
+
 ;; Since the org module lazy loads org-protocol (waits until an org URL is
 ;; detected), we can safely chain `org-roam-protocol' to it.
 (use-package! org-roam-protocol

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)

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)))
+    (when buffer-file-name
-           (file (buffer-file-name buffer)))
+      (if (buffer-modified-p (current-buffer))
-      (if (or (buffer-modified-p buffer)
-              (and file (file-exists-p file)))
           (when (bound-and-true-p vc-mode)
-            (vc-refresh-state))
+            (vc-refresh-state)
+            (force-mode-line-update))
         (revert-buffer t t)))))
 
 ;;;###autoload