upd to emacs 31

customize.el

@@ -1,3 +1,4 @@
+;;   -*- lexical-binding: nil; -*-
 ;; If I  ever use custom-group  to customize a  mode, then I  create a
 ;; manual config  section for  it using the  values, custom  has added
 ;; here. So, in normal times this should be empty, but needs to exist.

init.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; ** .emacs config version
 
 ;; My emacs  config has a  version (consisting  of a timestamp  with a

lisp/init-ansiterm.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** ANSI-TERM (inferior shells/interpreters and REPLs)
 
 ;; I use ansi term for inferior shells only.

lisp/init-audio.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 (use-package emms
   :defer nil
 

lisp/init-autoscratch.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; ** More scratch space
 ;; *** Text scratch
 ;; Sometimes  I need  a  text  mode scratch  buffer  while scratch  is

lisp/init-avy.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; see https://karthinks.com/software/avy-can-do-anything/
 
 (use-package avy

lisp/init-c.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** C
 
 ;; doesn't work in emacs 30 anymore

lisp/init-cisco.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Cisco Mode
 
 ;; Written by myself  many years ago, but I'm still  using it daily to

lisp/init-completion.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** IDO mode
 
 ;; There are other completion  enhancement packages available like ivy

lisp/init-conf.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** conf-mode
 
 ;; conf-mode annoyingly overwrites the  global keybinding C-c C-c with

lisp/init-config-general.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Config::General mode
 ;; **** Config and doc
 ;; [[https://github.com/TLINDEN/config-general-mode][config-general-mode]] (also on Melpa).

lisp/init-csv.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 (defun tvd/csv-mode-setup ()
   (csv-align-mode t)
   (toggle-truncate-lines 1)

lisp/init-daemonde.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; maintain daemon.de hugo website
 
 ;; (require 'subr-x)

lisp/init-dictcc.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 (use-package dictcc
   :config
   (defalias 'dict 'dictcc))

lisp/init-dired.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Dired
 
 ;; I use dired  for two things: from inside magit  as a convenient way

lisp/init-display.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;;; Display settings
 
 ;; better visibility of cursor in console sessions

lisp/init-dumpjump.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Dumpjump
 ;; https://github.com/jacktasia/dumb-jump/raw/master/dumb-jump.el
 (use-package dumb-jump

lisp/init-ediff.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Ediff Config
 
 ;; Force ediff to use  1 frame (the current) and not  open a new frame
@@ -36,45 +37,6 @@
 
 
 
-;; *** Smerge Config
-
-;; smerge-mode is being issued during editing of conflicts from magit,
-;; however, I  hate its default  prefix, but don't have  any practical
-;; prefixes  left AND  am using  it far  too rare  to deserve  its own
-;; prefix. So just a hydra will do.
-
-(when (fboundp 'defhydra)
-  (defhydra hydra-smerge (:timeout 30.0 :exit nil)
-    "
-^Smerge Mode^
-^^--------------------------------------------------------------
-_n_: next conflict          _u_: keep upper         _s_: swap
-_p_: prev conflict          _l_: keep lower         _h_: highlight
-_e_: Ediff                  _b_: keep base          _r_: resolve
-_q_: quit                 _RET_: keep hunk@point    _R_: revert
-
-^^--------------------------------------------------------------
-Reach this hydra with <C-x m>
-^^--------------------------------------------------------------
-
-"
-
-    ("n"  smerge-next         nil)
-    ("p"  smerge-prev         nil)
-    ("u"  smerge-keep-upper   nil)
-    ("l"  smerge-keep-lower   nil)
-    ("b"  smerge-keep-base    nil)
-    ("RET"  smerge-keep-current nil)
-    ("h"  smerge-refine       nil)
-    ("s"  smerge-swap         nil)
-    ("r"  smerge-resolve      nil)
-    ("R"  undo-tree-undo      nil)
-    ("e"  smerge-ediff        nil :color blue)
-    ("q"  nil                 nil :color blue))
-
-  (global-set-key (kbd "C-x m") 'hydra-smerge/body)
-  (defalias 'merge      'hydra-smerge/body))
-
 
 (provide 'init-ediff)
 ;;; init-ediff.el ends here

lisp/init-editorconfig.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** https://github.com/editorconfig/editorconfig-emacs#readme
 
 (use-package editorconfig

lisp/init-elget.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;;; setup el-get for non-package modes
 
 ;; This MUST be the first init file to be loaded.

lisp/init-elisp.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Emacs LISP interactive
 
 ;; General configuration for all things elisp.

lisp/init-elvish.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 
 (use-package elvish-mode
   :mode "\\.elv\\'"

lisp/init-eshell.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** eShell stuff, or if interactive stuff is needed, use ansi-term
 
 ;; I am  a hardcore bash  user, but from time  to time eshell  is good

lisp/init-ewww.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** EWW browser stuff
 
 ;; Emacs has a builtin browser, which is not too bad.

lisp/init-flymake.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; FIXME: how to force bash mode?
 
 (use-package flymake

lisp/init-followcursor.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Followcursor Mode
 
 ;; [[https://github.com/TLINDEN/followcursor-mode][source on github]]

lisp/init-functions.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; * Productivity Functions
 ;; --------------------------------------------------------------------------------
 ;; ** goto line with tmp line numbers

lisp/init-globalbindings.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;;; * Global Key Bindings
 ;; --------------------------------------------------------------------------------
 ;; ** c-h != delete

lisp/init-go.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Go Lang
 
 (use-package go-mode

lisp/init-grep.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; https://github.com/leoliu/ack-el
 
 (defun tvd-kill-ack()

lisp/init-help.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Help Mode
 
 ;; I even customize help windows! ... at least a little :)

lisp/init-hydra.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; Used here and there below, loaded as early as possible
 (use-package hydra)
 

lisp/init-ibuffer.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** iBuffer mode
 
 ;; iBuffer is a great interactive buffer management tool included with

lisp/init-imenu.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;;; ** load imenu
 (require 'imenu)
 (define-key global-map [C-down-mouse-2] 'imenu)

lisp/init-indentation.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Highlighting Indentation
 ;; provides: highlight-indentation-mode and highlight-indentation-current-column-mode
 (use-package highlight-indentation

lisp/init-info.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** INFO Mode
 
 (require 'info)

lisp/init-kubernetes.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 (defun tvd-kill-ro-buffer()
   (interactive)
   (when buffer-read-only

lisp/init-lsp.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; LSP mode
 (use-package lsp-mode
   :config

lisp/init-lua.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 
 (use-package lua-mode
   :mode "\\.lua\\'"

lisp/init-macros.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** MACROs
 
 ;; help: [[https://www.emacswiki.org/emacs/KeyboardMacrosTricks][emacswiki macro tricks]].
@@ -138,6 +139,9 @@ last kbd-macro will be executed."
                (if (not (get-buffer "macros.el"))
                    (find-file tvd-macro-file))
                (with-current-buffer "macros.el"
+                 (goto-char (point-min))
+                 (insert ";; -*- lexical-binding: nil; -*-")
+                 (newline)
                  (goto-char (point-max))
                  (newline)
                  (insert ";;")

lisp/init-magit.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Magit
 
 (when (fboundp 'defhydra)

lisp/init-marginalia.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; Enable rich annotations using the Marginalia package
 (use-package marginalia
   ;; Either bind `marginalia-cycle' globally or only in the minibuffer

lisp/init-markdown.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Markdown
 
 ;; I rarely use markdown, but sometimes I stumble upon such a file and

lisp/init-matrix.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 (use-package ement
   :custom
   (ement-save-sessions t)

lisp/init-mmm.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** MMM Mode
 (use-package mmm-mode
              :config

lisp/init-modeline.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; ** mode-line setup (must be the last mode)
 
 ;; I just append the current version  of my emacs config and leave out

lisp/init-narrow.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** narrowing (no mode but fits here)
 
 ;; I use narrowing quite frequently, so here are some enhancements.

lisp/init-novel.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Novel Mode - Screen Reader
 
 ;; my own emacs screen reader, very handy to read docs on the road.

lisp/init-occur.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Occur
 ;; https://oremacs.com/2015/01/26/occur-dwim/
 ;; https://github.com/abo-abo/hydra/wiki/Emacs

lisp/init-org-present.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 
 (use-package org-present
   :config

lisp/init-org.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** org mode
 
 ;; I use org mode to take notes  mostly at work. I also track projects

lisp/init-orgagenda.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** org agenda mode
 
 ;; I use org mode  for along time now, primarily at  work, but did not

lisp/init-orgalist.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; https://elpa.gnu.org/packages/orgalist.html
 (use-package orgalist)
 

lisp/init-orgtable.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** org table mode
 
 ;; I'm so used to lovely org mode tables, I need them everywhere!

lisp/init-outline.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** outline mode
 
 ;; I use the very same cycle style  as in org mode: when on a heading,

lisp/init-perl.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** cperl mode
 
 ;; I am  a perl addict. I  love it, therefore, emacs  must be prepared

lisp/init-pod.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** POD mode
 
 ;; I LOVE POD!  POD is the  documentation format of perl and there's a

lisp/init-printing.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Printing
 ;; overwrites printing default menu, access via menu File => Print
 ;; or:

lisp/init-projectile.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Projectile
 (use-package projectile
   :defer nil

lisp/init-python.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 (use-package python
   :mode ("\\.py\\'" . python-mode)
   :interpreter ("python" . python-mode)

lisp/init-recentfiles.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;;; *** Recent Files
 
 ;; You know the  file you edited yesterday had "kri"  in its name, but

lisp/init-rust.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** rust  mode
 (use-package rust-mode
              :config

lisp/init-sgml.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** sgml
 
 ;; Used for XML and the likes.

lisp/init-shellscript.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Shell-Script Mode
 
 ;; C-c C-c [un-]comments everywhere, force in shell-script-mode as well

lisp/init-smarter-than-emacs.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;;; *** Smarter M-x Mode (smex)
 
 ;; This is really cool and I don't know how I could ever live without it.
@@ -214,7 +215,7 @@ targets."
 
   :config
   (when (fboundp 'persp-new)
-    (consult-customize consult--source-buffer :hidden t :default nil)
+    (consult-customize consult-source-buffer :hidden t :default nil)
 
     (defvar consult--source-perspective
       (list :name     "Perspective"

lisp/init-smartparens.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; I'm trying  to migrate  to smart-parens, since  it supports  all of
 ;; paredit but can do more
 

lisp/init-smerge.el

@@ -0,0 +1,44 @@
+;; -*- lexical-binding: nil; -*-
+
+;; *** Smerge Config
+
+;; smerge-mode is being issued during editing of conflicts from magit,
+;; however, I  hate its default  prefix, but don't have  any practical
+;; prefixes  left AND  am using  it far  too rare  to deserve  its own
+;; prefix. So just a hydra will do.
+
+(when (fboundp 'defhydra)
+  (defhydra hydra-smerge (:exit nil)
+    "
+^Smerge Mode^
+^^--------------------------------------------------------------
+_n_: next conflict          _u_: keep upper         _s_: swap
+_p_: prev conflict          _l_: keep lower         _h_: highlight
+_e_: Ediff                  _b_: keep base          _r_: resolve
+_q_: quit                 _RET_: keep hunk@point    _R_: revert
+
+^^--------------------------------------------------------------
+Reach this hydra with <C-x m>
+^^--------------------------------------------------------------
+
+"
+
+    ("n"  smerge-next         nil)
+    ("p"  smerge-prev         nil)
+    ("u"  smerge-keep-upper   nil)
+    ("l"  smerge-keep-lower   nil)
+    ("b"  smerge-keep-base    nil)
+    ("RET"  smerge-keep-current nil)
+    ("h"  smerge-refine       nil)
+    ("s"  smerge-swap         nil)
+    ("r"  smerge-resolve      nil)
+    ("R"  undo-tree-undo      nil)
+    ("e"  smerge-ediff        nil :color blue)
+    ("q"  nil                 nil :color blue))
+
+  (global-set-key (kbd "C-x m") 'hydra-smerge/body)
+  (defalias 'merge      'hydra-smerge/body))
+
+
+(provide 'init-smerge)
+;;; init-smerge.el ends here

lisp/init-suggest.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Suggest Mode
 
 ;; [[https://github.com/Wilfred/suggest.el][suggest mode]] is a great

lisp/init-system.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;;; Backup Config
 
 ;; I save backup files in a  central location below the init dir, that

lisp/init-tablist.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Tabulated List Mode
 ;; built-in, used by many interactive major modes
 

lisp/init-test.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 (message (format "DEBUG: default-text-scale installed: %s" (package-installed-p 'default-text-scale)))
 (package-install 'default-text-scale)
 

lisp/init-textmanipulation.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; ** Text Manupilation
 ;; *** expand-region
 

lisp/init-textscale.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;;; ** increase fontsize with ctrl-+ and ctrl--
 
 ;; I use  those bindings everywhere  (firefox, terminal, etc),  and in

lisp/init-tramp.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** tramp mode
 
 ;; Edit remote files, one of the best things in emacs. I use it every day heavily.

lisp/init-typst.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; https://codeberg.org/meow_king/typst-ts-mode
 
 

lisp/init-ui.el

@@ -1,3 +1,4 @@
+;;   -*- lexical-binding: nil; -*-
 ;;; *** highlight todo keywords (such as FIXME)
 
 ;; Absolutely needed!

lisp/init-webmode.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** web-mode (JS, HTML, CSS combined)
 
 ;; Web development is shit. Tech involved is a mess, and in most cases

lisp/init-windowmgmt.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; NOTDONE
 ;;; ** WINDOW management stuff
 ;; *** resize windows by keyboard

lisp/init-workspaces.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Eyebrowse Workspaces
 ;; workspace configuration, like desktops. Seems to be a good implementation, w/o save though
 

lisp/init-xmodmap.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Xmodmap Mode
 
 ;; the shortest mode ever, [[https://www.emacswiki.org/emacs/XModMapMode][via emacswiki]].

lisp/init-yaml.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 ;; *** Yaml Mode
 
 (use-package yaml-mode

lisp/kubernetes.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 (defun tvd-kill-ro-buffer()
   (interactive)
   (when buffer-read-only