From 3d38fa22fcd63d7cab08dcd967ed5944d1fdbb1b Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
Date: Tue, 5 Jan 2021 03:05:21 +0000
Subject: [PATCH] Use actual dash-functional.el version in manual

* dash-template.texi: Set version flag DASHFNVER for
dash-functional.el alongside that for dash.el.
(Using in a package): Use it.

* dev/examples-to-info.el (create-info-file): Substitute package
version of dash-functional.el alongside that of dash.el.

* dash.texi: Regenerate manual.
---
 dash-template.texi      | 5 +++--
 dash.texi               | 3 ++-
 dev/examples-to-info.el | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dash-template.texi b/dash-template.texi
index 72cc77c..e194078 100644
--- a/dash-template.texi
+++ b/dash-template.texi
@@ -1,7 +1,8 @@
 \input texinfo    @c -*- texinfo -*-
 @c %**start of header
 @setfilename dash.info
-@set DASHVER @c [[ version ]]
+@set DASHVER @c [[ dash-version ]]
+@set DASHFNVER @c [[ dash-functional-version ]]
 @settitle Dash: A modern list library for GNU Emacs.
 @documentencoding UTF-8
 @documentlanguage en
@@ -117,7 +118,7 @@ The same goes for the @file{dash-functional.el} library of function
 combinators:
 
 @lisp
-;; Package-Requires: ((dash "@value{DASHVER}") (dash-functional "1.2.0"))
+;; Package-Requires: ((dash "@value{DASHVER}") (dash-functional "@value{DASHFNVER}"))
 @end lisp
 
 @node Fontification of special variables
diff --git a/dash.texi b/dash.texi
index 19475a4..e847455 100644
--- a/dash.texi
+++ b/dash.texi
@@ -2,6 +2,7 @@
 @c %**start of header
 @setfilename dash.info
 @set DASHVER 2.17.0
+@set DASHFNVER 1.2.0
 @settitle Dash: A modern list library for GNU Emacs.
 @documentencoding UTF-8
 @documentlanguage en
@@ -132,7 +133,7 @@ The same goes for the @file{dash-functional.el} library of function
 combinators:
 
 @lisp
-;; Package-Requires: ((dash "@value{DASHVER}") (dash-functional "1.2.0"))
+;; Package-Requires: ((dash "@value{DASHVER}") (dash-functional "@value{DASHFNVER}"))
 @end lisp
 
 @node Fontification of special variables
diff --git a/dev/examples-to-info.el b/dev/examples-to-info.el
index f38eeff..67ee5af 100644
--- a/dev/examples-to-info.el
+++ b/dev/examples-to-info.el
@@ -195,8 +195,9 @@ FUNCTION may reference an elisp function, alias, macro or a subr."
     (with-temp-file "./dash.texi"
       (insert-file-contents-literally "./dash-template.texi")
 
-      (goto-and-remove "@c [[ version ]]")
-      (insert (lm-version "dash.el"))
+      (dolist (pkg '(dash dash-functional))
+        (goto-and-remove (format "@c [[ %s-version ]]" pkg))
+        (insert (lm-version (format "%s.el" pkg))))
 
       (goto-and-remove "@c [[ function-nodes ]]")
       (insert (mapconcat 'function-to-node