* .emacs.d/init.el: Small cleanups.

[~bandali/configs] / .emacs.d / init.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 0fd70e5..ce05ab4 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -194,24 +194,16 @@
 
 (setq
  ;; line-spacing 3
- ;; completion case sensitivity
  completion-ignore-case t
  read-buffer-completion-ignore-case t
- ;; minibuffer
  enable-recursive-minibuffers t
  resize-mini-windows t
- ;; mode-line
  mode-line-compact t
+ ;; mouse-autoselect-window t
+ scroll-preserve-screen-position 1
  ;; i don't feel like jumping out of my chair every now and again;
  ;; so...don't *BEEP* at me, emacs =)
- ring-bell-function 'ignore
- ;; better scrolling
- ;; scroll-conservatively 101
- scroll-conservatively 15
- ;; scroll-preserve-screen-position 1
- ;; focus follows mouse
- ;; mouse-autoselect-window t
- )
+ ring-bell-function 'ignore)
 
 (setq-default
  ;; case-sensitive search (and `dabbrev-expand')
@@ -432,20 +424,11 @@
 ;; faces
 (when (display-graphic-p)
   (with-eval-after-load 'faces
-    (let* ((grey "#e7e7e7")
-           ;; (darker-grey "#d9d9d9")
-           ;; (box ;; 'unspecified
-           ;;      `(;; :line-width -1
-           ;;        :style released-button))
-           )
-      ;; (set-face-attribute 'fixed-pitch nil :family "Source Code Pro")
-      (set-face-attribute 'fixed-pitch nil :family "Inconsolata")
+    (let ((grey "#e7e7e7"))
+      (set-face-attribute 'fixed-pitch nil :family "Source Code Pro")
       (set-face-attribute 'mode-line nil
-                          :background grey ;; :box box
-                          :inherit 'fixed-pitch)
-      ;; (set-face-attribute 'mode-line-inactive nil
-      ;;                     :background darker-grey :box box)
-      )))
+                          :background grey
+                          :inherit 'fixed-pitch))))
 
 \f
 ;;; Useful utilities
@@ -812,11 +795,10 @@ Effectively a very simple light/dark theme toggle switch."
 (defun b/*scratch* ()
   "Switch to `*scratch*' buffer, creating it if it does not exist."
   (interactive)
-  (switch-to-buffer
-   (or (get-buffer "*scratch*")
-       (with-current-buffer (get-buffer-create "*scratch*")
-         (set-buffer-major-mode (current-buffer))
-         (current-buffer)))))
+  (let ((fun (if (functionp #'get-scratch-buffer-create)
+                 #'get-scratch-buffer-create ; (version<= "29" emacs-version)
+               #'startup--get-buffer-create-scratch))) ; (version< emacs-version "29")
+    (switch-to-buffer (funcall fun))))
 (global-set-key (kbd "C-c s") #'b/*scratch*)
 
 ;; ,----