[emacs][wip] fix up some breakages due to use-package-always-defer

[~bandali/configs] / init.org

diff --git a/init.org b/init.org
index 52c1437..1f3d721 100644 (file)
--- a/init.org
+++ b/init.org
@@ -729,6 +729,7 @@ for this.
 ** Bindings
 
 #+begin_src emacs-lisp
 ** Bindings
 
 #+begin_src emacs-lisp

+(require 'bind-key)

 (bind-keys
  ("C-c a i" . ielm)
 
 (bind-keys
  ("C-c a i" . ielm)
 


@@ -879,6 +880,7 @@ And here's where my actual Org configurations begin:
                t))
 
 (use-feature ox-beamer
                t))
 
 (use-feature ox-beamer

+  :demand

   :after ox)
 #+end_src
 
   :after ox)
 #+end_src
 


@@ -896,9 +898,12 @@ file.
   (defvar a/show-async-tangle-time nil
     "Show the time spent tangling the file.")
 
   (defvar a/show-async-tangle-time nil
     "Show the time spent tangling the file.")
 

-  (defvar a/async-tangle-post-compile "make ti"
+  (defvar a/async-tangle-post-compile nil

     "If non-nil, pass to `compile' after successful tangle.")
 
     "If non-nil, pass to `compile' after successful tangle.")
 

+  (defvar a/async-tangle-byte-recompile t
+    "If non-nil, byte-recompile the file on successful tangle.")
+

   (defun a/async-babel-tangle ()
     "Tangle org file asynchronously."
     (interactive)
   (defun a/async-babel-tangle ()
     "Tangle org file asynchronously."
     (interactive)


@@ -906,7 +911,7 @@ file.
            (file (buffer-file-name))
            (file-nodir (file-name-nondirectory file))
            ;; (async-quiet-switch "-q")
            (file (buffer-file-name))
            (file-nodir (file-name-nondirectory file))
            ;; (async-quiet-switch "-q")

-           )
+           (file-noext (file-name-sans-extension file)))

       (async-start
        `(lambda ()
           (require 'org)
       (async-start
        `(lambda ()
           (require 'org)


@@ -915,6 +920,7 @@ file.
          `(lambda (result)
             (if result
                 (progn
          `(lambda (result)
             (if result
                 (progn

+                  (setq byte-compile-warnings '(not noruntime unresolved))

                   (message "Tangled %s%s"
                            ,file-nodir
                            (if a/show-async-tangle-time
                   (message "Tangled %s%s"
                            ,file-nodir
                            (if a/show-async-tangle-time


@@ -923,7 +929,9 @@ file.
                                                                   ',file-tangle-start-time)))
                              ""))
                   (when a/async-tangle-post-compile
                                                                   ',file-tangle-start-time)))
                              ""))
                   (when a/async-tangle-post-compile

-                    (compile a/async-tangle-post-compile)))
+                    (compile a/async-tangle-post-compile))
+                  (when a/async-tangle-byte-recompile
+                    (byte-recompile-file (concat ,file-noext ".el"))))

               (message "Tangling %s failed" ,file-nodir))))))))
 
 (add-to-list
               (message "Tangling %s failed" ,file-nodir))))))))
 
 (add-to-list


@@ -1183,6 +1191,7 @@ There's no way I could top that, so I won't attempt to.
   ;; https://oremacs.com/2017/03/18/dired-ediff/
   (defun dired-ediff-files ()
     (interactive)
   ;; https://oremacs.com/2017/03/18/dired-ediff/
   (defun dired-ediff-files ()
     (interactive)

+    (require 'dired-aux)

     (defvar ediff-after-quit-hook-internal)
     (let ((files (dired-get-marked-files))
           (wnd (current-window-configuration)))
     (defvar ediff-after-quit-hook-internal)
     (let ((files (dired-get-marked-files))
           (wnd (current-window-configuration)))


@@ -1202,6 +1211,7 @@ There's no way I could top that, so I won't attempt to.
                         (set-window-configuration wnd))))
         (error "no more than 2 files should be marked"))))
   :bind (:map dired-mode-map
                         (set-window-configuration wnd))))
         (error "no more than 2 files should be marked"))))
   :bind (:map dired-mode-map

+              ("b"  . dired-up-directory)

               ("e"  . dired-ediff-files)
               ("E"  . dired-toggle-read-only)
               ("\\" . dired-hide-details-mode)
               ("e"  . dired-ediff-files)
               ("E"  . dired-toggle-read-only)
               ("\\" . dired-hide-details-mode)


@@ -1402,7 +1412,8 @@ Automatically save place in each file.
 ** [[https://coq.inria.fr][Coq]] (with [[https://github.com/ProofGeneral/PG][Proof General]])
 
 #+begin_src emacs-lisp
 ** [[https://coq.inria.fr][Coq]] (with [[https://github.com/ProofGeneral/PG][Proof General]])
 
 #+begin_src emacs-lisp

-(use-package proof-general)
+(use-package proof-site
+  :straight proof-general)

 #+end_src
 
 ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]])
 #+end_src
 
 ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]])


@@ -1830,6 +1841,7 @@ Emacs package that displays available keybindings in popup
 
 #+begin_src emacs-lisp
 (use-package smart-mode-line
 
 #+begin_src emacs-lisp
 (use-package smart-mode-line

+  :commands (sml/apply-theme)

   :config
   (sml/setup))
 #+end_src
   :config
   (sml/setup))
 #+end_src


@@ -2004,7 +2016,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 
 #+begin_src emacs-lisp
 (use-package shrink-path
 
 #+begin_src emacs-lisp
 (use-package shrink-path

-  :after eshell
+  :defer 2

   :config
   (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
         eshell-prompt-function #'+eshell/prompt)
   :config
   (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
         eshell-prompt-function #'+eshell/prompt)


@@ -2035,6 +2047,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 
 #+begin_src emacs-lisp
 (use-package eshell-up
 
 #+begin_src emacs-lisp
 (use-package eshell-up

+  :commands eshell-up

   :after eshell)
 #+end_src
 
   :after eshell)
 #+end_src
 


@@ -2340,6 +2353,7 @@ Convenient footnotes in =message-mode=.
 
 (use-feature ebdb-gnus
   :after ebdb
 
 (use-feature ebdb-gnus
   :after ebdb

+  :demand

   :custom
   (ebdb-gnus-window-configuration
    '(article
   :custom
   (ebdb-gnus-window-configuration
    '(article


@@ -2351,6 +2365,7 @@ Convenient footnotes in =message-mode=.
 
 (use-feature ebdb-mua
   :after ebdb
 
 (use-feature ebdb-mua
   :after ebdb

+  :demand

   ;; :custom (ebdb-mua-pop-up nil)
   )
 
   ;; :custom (ebdb-mua-pop-up nil)
   )
 


@@ -2428,6 +2443,6 @@ Display how long it took to load the init file.
 
 * COMMENT Local Variables                                           :ARCHIVE:
 # Local Variables:
 
 * COMMENT Local Variables                                           :ARCHIVE:
 # Local Variables:

-# eval: ;; (add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)
+# eval: (add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)

 # eval: (typo-mode -1)
 # End:
 # eval: (typo-mode -1)
 # End: