Fix some byte-compiler warnings and remove some version workarounds

diff --git a/early-init.el b/early-init.el
index 512068a..3ee38c2 100644 (file)
--- a/early-init.el
+++ b/early-init.el
@@ -1 +1,3 @@
+;; No package.el (for emacs 27 and later).  See
+;; https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b

 (setq package-enable-at-startup nil)
 (setq package-enable-at-startup nil)

diff --git a/init.el b/init.el
index 171ec5d..2df0724 100644 (file)
--- a/init.el
+++ b/init.el
@@ -106,14 +106,6 @@
 \f
 ;;; Package management
 
 \f
 ;;; Package management
 

-;; No package.el  (for emacs 26 and before)
-(when (version< emacs-version "27")
-  (setq package-enable-at-startup nil)
-  ;; (package-initialize)
-  )
-;; for emacs 27 and later, we use early-init.el.  see
-;; https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b
-

 (progn ;   `borg'
   (add-to-list 'load-path
                (expand-file-name "lib/borg" user-emacs-directory))
 (progn ;   `borg'
   (add-to-list 'load-path
                (expand-file-name "lib/borg" user-emacs-directory))


@@ -211,7 +203,7 @@
 (defun b/add-elisp-section ()
   (interactive)
   (insert "\n")
 (defun b/add-elisp-section ()
   (interactive)
   (insert "\n")

-  (previous-line)
+  (forward-line -1)

   (insert "\n\f\n;;; "))
 
 ;; (defvar b/fill-column 47
   (insert "\n\f\n;;; "))
 
 ;; (defvar b/fill-column 47


@@ -468,9 +460,7 @@ For disabling the behaviour for certain buffers and/or modes."
   :config
   ;; ask for GPG passphrase in minibuffer
   ;; this will fail if gpg>=2.1 is not available
   :config
   ;; ask for GPG passphrase in minibuffer
   ;; this will fail if gpg>=2.1 is not available

-  (if (version< "27" emacs-version)
-      (setq epg-pinentry-mode 'loopback)
-    (setq epa-pinentry-mode 'loopback))
+  (setq epg-pinentry-mode 'loopback)

   :custom
   (epg-gpg-program (executable-find "gpg")))
 
   :custom
   (epg-gpg-program (executable-find "gpg")))
 

diff --git a/lisp/bandali-org.el b/lisp/bandali-org.el
index 957417f..9e45fa4 100644 (file)
--- a/lisp/bandali-org.el
+++ b/lisp/bandali-org.el
@@ -9,9 +9,6 @@
         org-startup-folded 'content
         org-catch-invisible-edits 'show-and-error
         org-log-done 'time)
         org-startup-folded 'content
         org-catch-invisible-edits 'show-and-error
         org-log-done 'time)

-  (when (version< org-version "9.3")
-    (setq org-email-link-description-format
-          org-link-email-description-format))

   (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
   (add-to-list 'org-modules 'org-habit)
   :bind
   (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
   (add-to-list 'org-modules 'org-habit)
   :bind