[elpa] externals/eev 6dddb0e 06/10: Several small changes in intros and docs.

[Stefan Monnier]

branch: externals/eev
commit 6dddb0ec670f6419723c4d9643110ad628ec9d98
Author: Eduardo Ochs <address@hidden>
Commit: Eduardo Ochs <address@hidden>

    Several small changes in intros and docs.
---
 ChangeLog     |  19 +++++++++++
 VERSION       |   4 +--
 eev-blinks.el |  16 +++++++--
 eev-elinks.el |   4 ++-
 eev-intro.el  | 103 +++++++++++++++++++++++++++++++++++++++++++++-------------
 eev-mode.el   |  18 +++++-----
 eev-tlinks.el |   4 ++-
 7 files changed, 132 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 03359f3..6fc9003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2019-10-16  Eduardo Ochs  <address@hidden>
+
+       * eev-blinks.el (find-esubstitutecommandkeys): new function.
+       (ee-find-eejumps-header): small changes.
+
+       * eev-mode.el (eev-mode-help): small changes.
+
+2019-10-15  Eduardo Ochs  <address@hidden>
+
+       * eev-intro.el (find-audiovideo-intro): new section: "4.3. A
+       demo".
+
+2019-10-04  Eduardo Ochs  <address@hidden>
+
+       * eev-elinks.el (ee-find-efunction-links): added two links that
+       refer to `load-history'.
+
+       * eev-intro.el (find-brxxx-intro): small changes.
+
 2019-10-03  Eduardo Ochs  <address@hidden>
 
        * eev-intro.el (find-brxxx-intro): added several new sections.
diff --git a/VERSION b/VERSION
index 385311a..cf57bc3 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Thu Oct  3 08:10:10 GMT 2019
-Thu Oct  3 05:10:10 -03 2019
+Wed Oct 23 14:10:28 GMT 2019
+Wed Oct 23 11:10:28 -03 2019
diff --git a/eev-blinks.el b/eev-blinks.el
index 70eaf06..ad1e66b 100644
--- a/eev-blinks.el
+++ b/eev-blinks.el
@@ -21,7 +21,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2019sep27
+;; Version:    2019oct16
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-blinks.el>
@@ -834,6 +834,17 @@ LIBRARY is converted to an absolute file name using 
`locate-library'."
 ;;   (find-etpat)
 ;;   (find-etpat0)
 
+;; Test: (find-esubstitutecommandkeys eev-mode-help)
+;;       (find-estring                eev-mode-help)
+;;       (find-esubstitutecommandkeys (documentation 'eev-mode 'raw))
+;;       (find-estring                (documentation 'eev-mode 'raw))
+;;       (find-estring                (documentation 'eev-mode))
+(defun find-esubstitutecommandkeys (string &rest pos-spec-list)
+  "Hyperlink to the result of running `substitute-command-keys' on STRING."
+  ;; To do: add buttons and links.
+  (apply 'find-estring (substitute-command-keys string)
+        pos-spec-list))
+
 ;; Test: (find-ekeymapdescr isearch-mode-map "toggle-regexp")
 (defun find-ekeymapdescr (keymap &rest pos-spec-list)
   "Hyperlink to the list of bindings in KEYMAP.
@@ -967,8 +978,9 @@ Hint: install the Debian package \"unicode-data\".")
 
 (defun ee-find-eejumps-header ()
   ";; Generated by: (find-eejumps)
-;; See: (find-eev-quick-intro \"7.1. `eejump'\")
+;; See: (find-eev-quick-intro \"7.1. `eejump'\" \"`M-j'\")
 ;;      (find-emacs-keys-intro \"1. Basic keys (eev)\")
+;;      (find-emacs-keys-intro \"2. Key sequences\")
 ;; For example,
 ;;     M-1 M-j  runs:  (find-fline \"~/TODO\")
 ;;     M-2 M-j  runs:  (find-emacs-keys-intro)
diff --git a/eev-elinks.el b/eev-elinks.el
index b9254cd..5852631 100644
--- a/eev-elinks.el
+++ b/eev-elinks.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2019sep27
+;; Version:    2019oct04
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-elinks.el>
@@ -260,6 +260,8 @@ This is an internal function used by `find-efunction-links' 
and
     (where-is ',f)
     (symbol-file ',f 'defun)
     (find-fline (symbol-file ',f 'defun))
+    (find-epp (assoc (symbol-file ',f 'defun) load-history))
+    (find-estring (mapconcat 'identity (mapcar 'car load-history) "\n"))
     (find-estring (documentation ',f))
     (find-estring (documentation ',f t))
     (describe-function ',f)
diff --git a/eev-intro.el b/eev-intro.el
index 842bed2..19455ee 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2019oct03
+;; Version:    2019oct15
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-intro.el>
@@ -1774,13 +1774,13 @@ Some other keys that create buffers with elisp 
hyperlinks:
 2. Key sequences and how to abort them
 ======================================
 See: (find-enode \"Keys\" \"key sequence\")
-     (find-enode \"User Input\" \"`Control-a'\" \"usually written `C-a'\")
+     (find-enode \"User Input\" \"Control-a\" \"C-a\")
      (find-enode \"User Input\" \"<META> key\")
      (find-enode \"Completion\" \"<TAB>\")
      (find-enode \"Minibuffer History\" \"<UP>\" \"<DOWN>\")
 
 <ESC> <ESC> <ESC>                (find-enode \"Quitting\")
-C-g   keyboard-quit              (find-enode \"Quitting\" \"`C-g'\")
+C-g   keyboard-quit              (find-enode \"Quitting\" \"C-g\")
 M-x   execute-extended-command   (find-enode \"M-x\" \"Running Commands by 
Name\")
 
 More about the minibuffer:       (find-enode \"Minibuffer\")
@@ -1793,6 +1793,7 @@ More about modes:                (find-enode \"Major 
Modes\")
 
 See also: (find-enode \"Mode Line\" \"(MAJOR MINOR)\")
           (find-enode \"Mode Line\" \" MAJOR is the name\")
+          (find-enode \"Mode Line\" \" MINOR is a list\")
           (find-enode \"Mode Line\" \" BUF \")
           (find-enode \"Mode Line\" \" BUF \" \"name of the buffer\")
 
@@ -1961,12 +1962,21 @@ described in these sections,
   (find-pdf-like-intro \"7. Shorter hyperlinks to PDF files\")
 
 and people can execute sexps with `C-x C-e'. People using the
-expert setup can turn eev-mode - i.e., its keybindings - on and
-off with `M-x eev-mode', and they can go to the tutorials using
-`M-x find-eev-quick-intro', or `M-5 M-j', or `M-j'... I try to
-assume that long-time Emacsers are too busy with their other
-things, and that it's ok if they only spend 5 minutes per month
-playing with the eev tutorials.
+expert setup can turn eev-mode on and off - i.e., activate and
+disactivate its keybindings - with `M-x eev-mode', and when
+`eev-mode' is on they can go to the main tutorials with:
+
+  `M-5 M-j'  -  (find-eev-quick-intro)
+  `M-2 M-j'  -  (find-emacs-keys-intro)
+
+or by following the links at the header of the page displayed by
+`M-j'. Try:
+
+      `M-j'  -  (find-eejumps)
+
+I try to assume that long-time Emacsers are too busy with their
+other things, and that it's ok if they only spend 5 minutes per
+month playing with the eev tutorials.
 
 
 
@@ -2403,21 +2413,22 @@ These are etcs:
   20. (find-multiwindow-intro)
   21. (find-templates-intro)
   22. (find-videos-intro)
+  23. (find-what-sexps-can-do-intro)
 
 These ones explain advanced features that require extra setup:
 
-  23. (find-prepared-intro)
-  24. (find-bounded-intro)
-  25. (find-channels-intro)
+  24. (find-prepared-intro)
+  25. (find-bounded-intro)
+  26. (find-channels-intro)
 
 This one is used in a video:
 
-  26. (find-three-main-keys-intro)
+  27. (find-three-main-keys-intro)
 
 These ones are obsolete:
 
-  27. (find-emacs-intro)
-  28. (find-defun-intro)
+  28. (find-emacs-intro)
+  29. (find-defun-intro)
 
 Item 22 is an index of the (old) video tutorials, with scripts
 for downloading local copies of them and links to important
@@ -6512,14 +6523,14 @@ changes if you use \"edrx\" as your username...
 ===================
 After creating `brg' and `brff' I created variants of them that
 would open the local copy of the URL at point instead of the
-original URL... or, more precisely, that would open the result of
+original URL - or, more precisely, that would open the result of
 applying `ee-url-to-local-url' to the original URL. Try:
 
   (ee-url-to-local-url
    \"http://www.gnu.org/software/emacs/emacs-paper.html\";)
 
 These variants were called `brgl' and `brffl' - I used the
-convention that the suffix `l' meant \"open the local copy\".
+convention that the suffix `l' meant \"use the local copy\".
 
 
 
@@ -6532,17 +6543,16 @@ If we visit a directory - for example, this one,
   (find-fline \"$S/http/www.gnu.org/software/emacs/\")
 
 and we put the point in a line with an HTML on it - for example,
-on the line with the \"emacs-paper.html\", then typing `M-x brgd'
-there converts the full pathname of the file at point to a
+on the line with the \"emacs-paper.html\" - then typing `M-x
+brgd' there converts the full pathname of the file at point to a
 \"file:///\" URL, like this,
 
                           $S/http/www.gnu.org/software/emacs/emacs-paper.html
   -> file:///home/edrx/snarf/http/www.gnu.org/software/emacs/emacs-paper.html
 
-and opens the resulting \"file:///\" url with `brg' or `brff'.
+and opens the resulting \"file:///\" url with `brg'.
 
-These variants were called `brgd' and `brffd' - I used the
-convention that the suffix `d' meant \"open in Dired\".
+The suffix `d' means \"use the file in this line in dired\".
 
 
 
@@ -7265,6 +7275,55 @@ each call to a short hyperlink of the form 
`find-xxxaudio' or
 
 
 
+4.3. A demo
+-----------
+Here's some code to test `find-video' and `code-video'. Make sure
+that you have mpv installed, and run this escript block:
+
+ (eepitch-shell)
+ (eepitch-kill)
+ (eepitch-shell)
+  # http://www.youtube.com/watch?v=K6LmZ0A1s9U
+  # http://angg.twu.net/eev-videos/Punch_and_Judy_Mark_Poulton-K6LmZ0A1s9U.mp4
+  mkdir ~/eev-videos/
+  cd    ~/eev-videos/
+  wget -nc 
http://angg.twu.net/eev-videos/Punch_and_Judy_Mark_Poulton-K6LmZ0A1s9U.mp4
+
+It will download a copy of a video from youtube; I prepared the
+.mp4 by running \"youtube-dl -f 18\" on the youtube URL and
+renaming the result.
+
+Then try:
+
+  (find-video \"~/eev-videos/Punch_and_Judy_Mark_Poulton-K6LmZ0A1s9U.mp4\")
+  (code-video \"punchandjudyvideo\" 
\"~/eev-videos/Punch_and_Judy_Mark_Poulton-K6LmZ0A1s9U.mp4\")
+  (find-punchandjudyvideo)
+  (find-punchandjudyvideo \"0:00\")
+  (find-punchandjudyvideo \"0:10\" \"calls the baby\")
+  (find-punchandjudyvideo \"0:40\" \"where's the baby\")
+  (find-punchandjudyvideo \"1:04\" \"right position\")
+  (find-punchandjudyvideo \"1:17\" \"he will sing the baby to sleep\")
+  (find-punchandjudyvideo \"1:33\" \"1-2-3\")
+  (find-punchandjudyvideo \"1:48\" \"baby downstairs\")
+  (find-punchandjudyvideo \"3:12\" \"slaps\")
+  (find-punchandjudyvideo \"3:50\" \"1-2-3\")
+  (find-punchandjudyvideo \"4:34\" \"you keep an eye on mr Punch\")
+  (find-punchandjudyvideo \"4:46\" \"hat\")
+  (find-punchandjudyvideo \"5:03\" \"hat\")
+  (find-punchandjudyvideo \"5:25\" \"did you see him?\")
+  (find-punchandjudyvideo \"5:55\" \"clown\")
+  (find-punchandjudyvideo \"6:14\" \"slaps\")
+  (find-punchandjudyvideo \"6:52\" \"sausages\")
+  (find-punchandjudyvideo \"7:24\" \"crocodile\")
+  (find-punchandjudyvideo \"8:07\" \"crocodile + sausages\")
+  (find-punchandjudyvideo \"8:32\" \"another scene\")
+  (find-punchandjudyvideo \"8:39\" \"fight\")
+  (find-punchandjudyvideo \"9:03\" \"clown\")
+  (find-punchandjudyvideo \"9:45\" \"mr punch\")
+
+
+
+
 5. Passing options to mplayer
 =============================
 By default mplayer is called with just a few command-line options,
diff --git a/eev-mode.el b/eev-mode.el
index 417e3b2..34641bf 100644
--- a/eev-mode.el
+++ b/eev-mode.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2019aug15
+;; Version:    2019oct16
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-mode.el>
@@ -212,7 +212,7 @@ and: (find-eval-intro \"`M-k'\")"
 (defvar eev-mode-lighter " eev")
 (defvar eev-mode-help "Toggle eev mode, i.e, activate or deactivate the 
`eev-mode-map' keymap.
 With a prefix argument ARG, turn eev-mode on if positive, else off.
-See: (find-eev-intro)
+See: (find-emacs-keys-intro \"1. Basic keys (eev)\")
 \\<eev-mode-map>
 Commands to follow hyperlinks:
   \\[ee-eval-sexp-eol] -- go to the end of line, then do \\[ee-eval-last-sexp]
@@ -244,12 +244,6 @@ Commands to convert the current line into hyperlinks:
     See: (find-wrap-intro)
 Commands to generate pages with lists of hyperlinks:
   \\[find-here-links]  -- \"hyperlinks to here\", which supersedes all these:
-    \\[find-file-links]   -- hyperlinks to the current file
-    \\[find-find-eintro-or-einfo-links] -- hyperlinks to the current intro, or 
Info node
-    \\[find-grep-links] -- hyperlinks to `find-xxxgrep' sexps
-    \\[find-manpage-links] -- hyperlinks to a manpage (ask for name)
-    \\[find-last-manpage-links]   -- hyperlinks to a manpage (being viewed)
-    See: (find-links-intro \"`find-here-links'\")
   \\[find-efunction-links] -- hyperlinks to an Emacs function
   \\[find-ekey-links] -- hyperlinks to a key sequence and to the function
              associated to it
@@ -290,6 +284,14 @@ Other commands:
 
 ;; Deleted code:
 ;;
+;;  \\[find-here-links]  -- \"hyperlinks to here\", which supersedes all these:
+;;    \\[find-file-links]   -- hyperlinks to the current file
+;;    \\[find-find-eintro-or-einfo-links] -- hyperlinks to the current intro, 
or Info node
+;;    \\[find-grep-links] -- hyperlinks to `find-xxxgrep' sexps
+;;    \\[find-manpage-links] -- hyperlinks to a manpage (ask for name)
+;;    \\[find-last-manpage-links]   -- hyperlinks to a manpage (being viewed)
+;;    See: (find-links-intro \"`find-here-links'\")
+
 ;; Run the default bounded action (usually `eev-bounded'):
 ;; (define-key eev-mode-map [f3]   'eeb-default)
 ;; Steppers:
diff --git a/eev-tlinks.el b/eev-tlinks.el
index dd80388..56b84e1 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2019sep23
+;; Version:    2019oct14
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-tlinks.el>
@@ -884,6 +884,8 @@ Example:
     (if (>= (length hash) 11)
        (substring hash -11))))
 
+;; Test: (find-youtubedl-links nil nil "K6LmZ0A1s9U")
+;;
 (defun find-youtubedl-links (&optional dir title hash ext- stem &rest rest)
   "Visit a temporary buffer containing hyperlinks for youtube-dl."
   (interactive)