README.org

@@ -941,7 +941,7 @@ minibuffer completion]].
 #+caption: Set =minibuffer= options.
 #+name: lst:set-minibuffer-options
 #+begin_src emacs-lisp -n :results silent
-(with-eval-after-load 'minibuffer
+(when (require 'minibuffer nil 'noerror)
   ;; https://www.masteringemacs.org/article/understanding-minibuffer-completion
   (setopt
    completion-category-overrides '((file (styles basic substring)))
@@ -1009,11 +1009,12 @@ Emacs.  Try {{{kbd(C-h o)}}} instead of {{{kbd(C-h f)}}} or {{{kbd(C-h v)}}}.
 :CUSTOM_ID: sec:shortdoc-display-group
 :END:
 
-Listing [[lst:setup-shortdoc]] binds {{{kbd(C-h y)}}} to =shortdoc-display-group=.
+Listing [[lst:configure-shortdoc]] binds {{{kbd(C-h y)}}} to
+=shortdoc-display-group=.
 
-#+caption[Setup =shortdoc=]:
-#+caption: Setup =shortdoc=.
-#+name: lst:setup-shortdoc
+#+caption[Configure =shortdoc=]:
+#+caption: Configure =shortdoc=.
+#+name: lst:configure-shortdoc
 #+begin_src emacs-lisp -n :results silent
 (when (fboundp 'shortdoc-display-group)
   (keymap-set help-map "y" #'shortdoc-display-group))
@@ -1367,7 +1368,7 @@ histories.
 #+caption: Enable =savehist-mode= and =vertico-mode=.
 #+name: lst:enable-vertico-mode
 #+begin_src emacs-lisp -n :results silent
-(with-eval-after-load 'savehist
+(when (require 'savehist nil 'noerror)
   (setopt savehist-additional-variables '(kill-ring search-ring))
   (savehist-mode +1))
 (when (and (ensure-package-installation 'vertico)