Merge remote-tracking branch 'origin/build64-par' into gluglugt60-par

Conflicts:
	.config/systemd/user/default.target.wants/emacs-daemon.service

1 files changed, 14 insertions, 2 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 246ea6a..fabe70e 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -117,6 +117,7 @@
   page-break-lines
   ;; Major modes
   apel flim semi wanderlust
+  graphviz-dot-mode
   markdown-mode
   nginx-mode
   ;;nxhtml ; nxhtml is invasive, only enable if actively using
@@ -128,8 +129,19 @@
 
 (when (fboundp 'tool-bar-mode) (tool-bar-mode -1))
 
-(defadvice align-regexp (around lukeshu-align-with-spaces)
-  (let ((indent-tabs-mode nil)) ad-do-it))
+(defun align-regexp--use-spaces (orig-fun &rest args)
+  "Use spaces for alignment"
+  (let ((indent-tabs-mode nil))
+    (apply orig-fun args)))
+(advice-add 'align-regexp :around #'align-regexp--use-spaces)
+
+(defun sh-smie-sh-rules--fix (args)
+  "Replace :after \"then\" with :after \"if\" because Emacs 24
+sh-script.el is broken."
+  (if (equal args (list :after "then"))
+      (list :after "if")
+    args))
+(advice-add 'sh-smie-sh-rules :filter-args #'sh-smie-sh-rules--fix)
 
 (require 'go-mode-load nil t)