Merge branch 'master' into layer/magit-directors-cut

2025-11-23 11:41:18 -05:00 · 2020-08-17 18:41:22 +02:00
parent d0da22d077 27c28c2de8
commit d8ccb42f8b
13 changed files with 16 additions and 14 deletions
--- a/init.el
+++ b/init.el
@@ -18,8 +18,10 @@
  (setq inhibit-startup-echo-area-message "locutus")
  (setq initial-buffer-choice t)
  (setq initial-scratch-message "")
-  (scroll-bar-mode 0)
-  (tool-bar-mode 0)
+  (when (fboundp 'scroll-bar-mode)
+    (scroll-bar-mode 0))
+  (when (fboundp 'tool-bar-mode)
+    (tool-bar-mode 0))
  (menu-bar-mode 0))

 (progn ;    `borg'
--- a/lib/borg
+++ b/lib/borg
--- a/lib/closql
+++ b/lib/closql
--- a/lib/dash
+++ b/lib/dash
--- a/lib/diff-hl
+++ b/lib/diff-hl
--- a/lib/emacsql
+++ b/lib/emacsql
--- a/lib/epkg
+++ b/lib/epkg
--- a/lib/ghub
+++ b/lib/ghub
--- a/lib/magit
+++ b/lib/magit
--- a/lib/transient
+++ b/lib/transient
--- a/lib/treepy
+++ b/lib/treepy
--- a/lib/use-package
+++ b/lib/use-package
--- a/lib/with-editor
+++ b/lib/with-editor