From baab7a06390f8e56b8dea01cf37fdd574aae5d53 Mon Sep 17 00:00:00 2001
From: Gerard Vermeulen <gerard.vermeulen@posteo.net>
Date: Tue, 11 Jun 2024 10:11:26 +0200
Subject: [PATCH] Merge "lst:set-org-link-options" into "lst:set-org-options"

---
 README.org | 47 +++++++++++++++--------------------------------
 1 file changed, 15 insertions(+), 32 deletions(-)

diff --git a/README.org b/README.org
index c84f384..47f65e7 100644
--- a/README.org
+++ b/README.org
@@ -2206,29 +2206,27 @@ Links to Org-mode videos are:
 :ID:       0D725DA1-7431-40BD-85FF-EFF4F7E4EC95
 :END:
 
-I have split the initial [[https://orgmode.org/][Org-mode]] setup over thirteen listings.  Here, follows a
+I have split the initial [[https://orgmode.org/][Org-mode]] setup over twelve listings.  Here, follows a
 list detailing and motivating each listing:
 1. Listing [[lst:set-org-options]] handles basic [[https://orgmode.org/][Org-mode]] options.
 2. Listing [[lst:org-capture-templates]] initializes a simple capture template.
 3. Listing [[lst:setup-org-babel]] sets ~ob-core~, ~ob-latex~, and ~ob-lisp~ options.
    See [[info:org#Working with Source Code][working with source code (info)]] for Org Babel information.
-4. Listing [[lst:set-org-link-options]] handles [[https://orgmode.org/][Org-mode]] options specific to
-   [[info:org#Hyperlinks][hyperlinks (info)]].
-5. Listing [[lst:looking-at-org-id]] enables recent ~org-id~ features.
-6. Listing [[lst:setup-org-mode-map-1]] and [[lst:setup-org-mode-map-2]] extend the
+4. Listing [[lst:looking-at-org-id]] enables recent ~org-id~ features.
+5. Listing [[lst:setup-org-mode-map-1]] and [[lst:setup-org-mode-map-2]] extend the
    =org-mode-map= with useful key-bindings.
-7. Listing [[lst:setup-org-src]] facilitates [[info:org#Editing Source Code][editing source code blocks]], and it
+6. Listing [[lst:setup-org-src]] facilitates [[info:org#Editing Source Code][editing source code blocks]], and it
    provides functions to change the indentation of all =org-src-mode= blocks.
-8. Listing [[lst:setup-ob-python]] allows to pretty-print Python session source
+7. Listing [[lst:setup-ob-python]] allows to pretty-print Python session source
    block values with [[https://github.com/psf/black#readme][black]] instead of [[https://docs.python.org/3/library/pprint.html][pprint]].  This snippet may break in the
    future, because it sets =org-babel-python--def-format-value= which is a
    constant declared "private" by two dashes in its name!
-9. Listing [[lst:set-org-export-options]] selects the =non-intrusive= expert user
+8. Listing [[lst:set-org-export-options]] selects the =non-intrusive= expert user
    interface for export dispatching.
-10. Listing [[lst:setup-org-for-lualatex-export]] and
-    [[lst:set-ox-latex-options-for-lualatex-export]] configure [[https://orgmode.org/][Org-mode]] to generate
-    output for the LuaLaTeX compiler.
-11. Listing [[lst:setup-org-latex-classes]] defines [[info:org#LaTeXspecificexportsettings][org-latex-classes (info)]] for
+9. Listing [[lst:setup-org-for-lualatex-export]] and
+   [[lst:set-ox-latex-options-for-lualatex-export]] configure [[https://orgmode.org/][Org-mode]] to generate
+   output for the LuaLaTeX compiler.
+10. Listing [[lst:setup-org-latex-classes]] defines [[info:org#LaTeXspecificexportsettings][org-latex-classes (info)]] for
     backward compatibility.  For an explanation of the code in listing
     [[lst:setup-org-latex-classes]], type {{{kbd(C-h v org-latex-classes)}}}.
 
@@ -2264,13 +2262,11 @@ list detailing and motivating each listing:
                    ("\\.mm\\'" . default)
                    ("\\.x?html?\\'" . default)
                    ("\\.pdf\\'" . emacs))
-   org-modules '(ol-bibtex
-                 ol-doi
-                 ol-eww
-                 ol-info
-                 org-id
-                 org-protocol
-                 org-tempo)
+   ;; Set `org-link-descriptive' interactively by `org-toggle-link-display'.
+   org-link-descriptive t
+   org-link-file-path-type 'adaptive
+   org-modules (list 'ol-bibtex 'ol-doi 'ol-eww 'ol-info
+                     'org-id 'org-protocol 'org-tempo)
    org-use-property-inheritance t))
 #+end_src
 
@@ -2304,19 +2300,6 @@ list detailing and motivating each listing:
     (setopt org-babel-lisp-eval-fn #'sly-eval)))
 #+end_src
 
-#+caption[Set =org-link= options]:
-#+caption: Set =org-link= options.
-#+name: lst:set-org-link-options
-#+begin_src emacs-lisp -n :results silent
-(with-eval-after-load 'ol
-  ;; Setting `org-link-descriptive' to `t' has caused worse `isearch'
-  ;; behavior.  Set `org-link-descriptive' interactively by calling
-  ;; `org-toggle-link-display'.
-  (setopt org-link-descriptive t
-          org-link-file-path-type 'adaptive
-          org-link-search-must-match-exact-headline nil))
-#+end_src
-
 #+caption[Looking at =org-id=]:
 #+caption: Looking at =org-id=.
 #+name: lst:looking-at-org-id