[elpa] externals/eev 5c4799d 12/64: Small fixes in `find-*-intro' functions

[Stefan Monnier]

branch: externals/eev
commit 5c4799d943db5e6f20cb294ab2ebea0bfc621155
Author: Eduardo Ochs <address@hidden>
Commit: Eduardo Ochs <address@hidden>

    Small fixes in `find-*-intro' functions
---
 VERSION            |   4 +-
 eev-blinks.el      |   6 +-
 eev-elinks.el      |   1 +
 eev-intro.el       | 252 ++++++++++++++++++++++++++++++++++++++++-------------
 eev-multiwindow.el |  12 ++-
 eev-pdflike.el     |   5 +-
 eev-pkg.el         |   5 ++
 eev-rcirc.el       |   6 +-
 eev-readme.el      |   8 +-
 eev-tlinks.el      |  20 +++--
 eev-wrap.el        |   6 +-
 11 files changed, 238 insertions(+), 87 deletions(-)

diff --git a/VERSION b/VERSION
index 48896da..6ab8380 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Mon Nov 18 17:27:46 GMT 2013
-Mon Nov 18 15:27:46 BRST 2013
+Fri Oct 10 02:31:19 GMT 2014
+Thu Oct  9 23:31:19 BRT 2014
diff --git a/eev-blinks.el b/eev-blinks.el
index 6532d93..a495666 100644
--- a/eev-blinks.el
+++ b/eev-blinks.el
@@ -3,7 +3,7 @@
 ;;; and that are not created by `code-c-d' and friends.
 
 ;; Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,
-;; 2009,2010,2011,2012,2013 Free Software Foundation, Inc.
+;; 2009,2010,2011,2012,2013,2014 Free Software Foundation, Inc.
 ;;
 ;; This file is (not yet) part of GNU eev.
 ;;
@@ -22,7 +22,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2013nov18
+;; Version:    2014oct10
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-blinks.el>
@@ -722,6 +722,8 @@ Example: (find-eminorkeymapdescr 'eev-mode)"
   (apply 'find-ekeymapdescr (ee-minor-mode-keymap mode-symbol)
         pos-spec-list))
 
+(defalias 'find-eminormodekeymapdescr 'find-eminorkeymapdescr)
+
 (defun ee-minor-mode-keymap (mode-symbol)
   "An auxiliary function used by `find-eminorkeymapdescr'.
 Example: (find-ekeymapdescr (ee-minor-mode-keymap 'eev-mode))"
diff --git a/eev-elinks.el b/eev-elinks.el
index 35a1b24..0210fa1 100644
--- a/eev-elinks.el
+++ b/eev-elinks.el
@@ -793,6 +793,7 @@ See the comments in the source code."
      (find-epp (mapcar (lambda (face) (cons (face-id face) face)) (face-list)))
      (find-ecolors)
      (find-efaces)
+     (find-efaces ,(symbol-name face-symbol))
      )
    pos-spec-list))
 
diff --git a/eev-intro.el b/eev-intro.el
index 8c331d1..cdef811 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -1,6 +1,6 @@
 ;;; eev-intro.el --- intro scripts for eev
 
-;; Copyright (C) 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2013,2014 Free Software Foundation, Inc.
 ;;
 ;; This file is (not yet?) part of GNU eev.
 ;;
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2013nov18
+;; Version:    2014aug23
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-intro.el>
@@ -38,13 +38,16 @@
 ;;   (find-code-c-d-intro)
 ;;
 ;; Note (2013nov12):
-;; I am using this code to edit these intros:
-;;
-;; (defun ee-sexp-at (re) (save-excursion (re-search-forward re) 
(ee-last-sexp)))
-;; (setq ee-intro-end-re "\\(rest\\|pos-spec-list\\))))")
-;; (defun ee-intro-here () (eval (read (ee-sexp-at ee-intro-end-re))))
-;; (defun d0 () (funcall (ee-intro-here) (ee-last-kill)))
-;; (defun d () (interactive) (find-2b nil '(d0)))
+;; I am using the code below to edit these intros...
+;; Note that it is commented out - and HOW it is commented out!
+'
+(progn
+  (defun ee-sexp-at (re) (save-excursion (re-search-forward re) 
(ee-last-sexp)))
+  (setq ee-intro-end-re "\\(rest\\|pos-spec-list\\))))")
+  (defun ee-intro-here () (eval (read (ee-sexp-at ee-intro-end-re))))
+  (defun d0 () (funcall (ee-intro-here) (ee-last-kill)))
+  (defun d () (interactive) (find-2b nil '(d0)))
+  )
 
 
 
@@ -151,6 +154,47 @@ workshops, but that are not very eev-specific:
 
 
 
+Installation: way 1
+===================
+If you're a real beginner and you are reading this in a web browser
+then this is the easiest way to install eev and start playing with it.
+Mark the multi-line \"{ ... }\" block below, copy it to the clipboard
+with ctrl-C, and paste it to a shell running in a terminal to execute
+its commands. It will download the current version of eev and unpack
+it into ~/eev/.
+
+{
+  rm -Rv ~/eev/
+  mkdir  ~/eev/
+  cd     ~/eev/
+  rm -v eev2.tgz
+  wget http://angg.twu.net/eev-current/eev2.tgz
+  tar -xvzf eev2.tgz
+}
+
+Now do the same with this block:
+
+{
+  {
+    echo '#!/bin/sh'
+    echo 'cd ~/eev/ && emacs -l ./eev-readme.el --eval=\"(find-eval-intro)\"'
+  } > ~/e
+  chmod 755 ~/e
+}
+
+You now have a shell script that you can invoke with
+
+  ~/e
+
+that starts Emacs, loads eev, and opens this tutorial:
+
+  (find-eval-intro)
+
+Once you learn how to navigate the help system by following elisp
+hyperlinks and going back, the rest is easy.
+
+
+
 The README
 ==========
 The README for eev2 is an elisp file,
@@ -251,6 +295,7 @@ For the full lists of keybindings, see:
 \(Re)generate: (find-eval-intro)
 Source code:  (find-eev \"eev-intro.el\" \"find-eval-intro\")
 More intros:  (find-eev-intro)
+              (find-eepitch-intro)
 This buffer is _temporary_ and _editable_.
 It is meant as both a tutorial and a sandbox.
 
@@ -1740,13 +1785,9 @@ access the values the `c' and the `d' that were passed to
 `ee-code-c-d' (due to dynamic scoping), so `c' and `d' do not
 need to be passed down explicitly as arguments.
 
-
+Try:
 
   (find-code-c-d      \"CODE\" \"/DIR/\" :info \"INFO\")
-  (find-code-pdf      \"CODE\" \"FILE.pdf\")
-  (find-code-pdf-text \"CODE\" \"FILE.pdf\")
-  (find-code-audio    \"CODE\" \"FILE\")
-  (find-code-video    \"CODE\" \"FILE\")
 
 
 
@@ -1756,6 +1797,11 @@ Other similar functions
 See: (find-brxxx-intro)
      (find-pdf-like-intro)
      (find-audiovideo-intro)
+
+Try: (find-code-pdf      \"CODE\" \"FILE.pdf\")
+     (find-code-pdf-text \"CODE\" \"FILE.pdf\")
+     (find-code-audio    \"CODE\" \"FILE.mp3\")
+     (find-code-video    \"CODE\" \"FILE.mp4\")
 " rest)))
 
 ;; (find-TH "eev-article")
@@ -2008,25 +2054,33 @@ A first example
 Let's define two trivial base functions, one that expects a URL,
 and another one that expects a file name:
 
-  (defun foo-url  (url)      (format \"Got URL: %s\" url))
+  (defun foo-url  (url)      (format \"Got URL: %s\"      url))
   (defun foo-file (filename) (format \"Got filename: %s\" filename))
 
-These two calls
+Note that they don't do much - they just return explanatory
+strings.
+
+These two calls,
 
   (code-brurl  'foo-url  :remote 'brshowu :local 'brshowul)
   (code-brfile 'foo-file                  :local 'brshowfl)
 
-define three brxxx-functions - `brshowu' and `brshowul' for the
+define three brxxx-functions: `brshowu' and `brshowul' for the
 base function `foo-url', and `brshowfl' for the base function
-`foo-file'.
+`foo-file'. You can inspect the definitions by running these
+sexps,
 
-You can try the new brxxx-functions by typing `M-x brshowu', `M-x
-brshowul' and `M-x brshowfl' with the point on the URL below:
+  (find-code-brurl  'foo-url  :remote 'brshowu :local 'brshowul)
+  (find-code-brfile 'foo-file                  :local 'brshowfl)
 
-  http://a/b
+and you can test what `foo-url', `foo-file', `brshowu',
+`brshowul', and `brshowfl' do by running the sexps below.
 
-On each case you will see on the echo area how the base function
-was called, and what it returned.
+  (foo-url \"http://a/b\";)
+    => \"Got URL: http://a/b\";
+
+  (foo-file \"/c/d/e/f\")
+    => \"Got filename: /c/d/e/f\"
 
   (brshowu  \"http://a/b\";)
     => `(foo-url \"http://a/b\";) -> \"Got URL: http://a/b\";'
@@ -2039,6 +2093,17 @@ was called, and what it returned.
     => `(foo-file \"/home/edrx/snarf/http/a/b\") ->
         \"Got filename: /home/edrx/snarf/http/a/b\"'
 
+Now let's go to what matters. Put the point on the URL below, and
+run `M-x brshowu', `M-x brshowul' and `M-x brshowfl':
+
+  http://a/b
+
+you will see that `brshowu', `brshowul', and `brshowfl' can be
+called interactively, and when they are called interactively they
+use as their argument either the URL around point, or something
+obtained from it - the local file name or a local URL associated
+to that URL.
+
 
 
 
@@ -3259,14 +3324,14 @@ is not enough; other setups, like these,
 
    ______________________
   |          |           |        _________________________ 
-  |          |  shell A  |              |            |            |
-  |          |___________|      |   script   |     GDB    |
-  |  script  |           |      |            |            |
-  |          |  shell B  |      |____________|____________|
-  |          |___________|      |            |            |
-  |          |           |      |   program  |   program  |
-  |          |  shell C  |      |     I/O    |    source  |
-  |__________|___________|      |____________|____________|
+  |          |  shell A  |       |            |            |
+  |          |___________|       |   script   |     GDB    |
+  |  script  |           |       |            |            |
+  |          |  shell B  |       |____________|____________|
+  |          |___________|       |            |            |
+  |          |           |       |   program  |   program  |
+  |          |  shell C  |       |     I/O    |    source  |
+  |__________|___________|       |____________|____________|
 
 may be necessary. Eev comes with a few _low-level_ tools for
 creating these setups; they are not very smart, but they should
@@ -3283,12 +3348,12 @@ configuration with A at the left, and with the buffers 
B and C
 stacked on one another at the right. That is:
 
    ___________           ___________ 
-  |           |                |     |     |
-  |           |                |     |  B  |
+  |           |         |     |     |
+  |           |         |     |  B  |
   |     A     |   -->   |  A  |_____|
-  |           |                |     |     |
-  |           |                |     |  C  |
-  |___________|                |_____|_____|
+  |           |         |     |     |
+  |           |         |     |  C  |
+  |___________|         |_____|_____|
 
 To do that from the keyboard we could type this:
 
@@ -3311,11 +3376,11 @@ that makes it easy to replace later the `C-x b B RET' 
and the
 `C-x b C RET' by arbitrary sexp hyperlinks. We get:
 
   (progn (eek \"C-x 1 C-x 3 C-x o\")
-        (find-ebuffer \"B\")
+         (find-ebuffer \"B\")
          (eek \"C-x 2 C-x o\")
-        (find-ebuffer \"C\")
-        (eek \"C-x o\")
-        )
+         (find-ebuffer \"C\")
+         (eek \"C-x o\")
+         )
 
 When I started to rewrite my window configurations into that form
 I realized that the `eek's were being used in a very limited way
@@ -3352,12 +3417,12 @@ High-level words
 Very often we want to create window setups like
 
    _______________            _______________ 
-  |       |       |         |       |       |
-  |       |       |         |       |   B   |
+  |       |       |          |       |       |
+  |       |       |          |       |   B   |
   |   A   |   B   |    or    |   A   |_______| ;
-  |       |       |         |       |       |
-  |       |       |         |       |   C   |
-  |_______|_______|         |_______|_______|
+  |       |       |          |       |       |
+  |       |       |          |       |   C   |
+  |_______|_______|          |_______|_______|
 
 there are shorthands for that. If you run
 
@@ -3488,7 +3553,7 @@ Non-trivial examples
 See:
 
   (find-prepared-intro \"An `ee' for Python\")
-
+  (find-rcirc-intro \"The server buffer and the channel buffers\")
 
 
 
@@ -3677,6 +3742,74 @@ support for Rcirc (and no support for ERC).
 
 
 
+The server buffer and the channel buffers
+=========================================
+If you type `M-6 M-6 M-j' - or `M-e' on the line below - then eev
+runs this,
+
+  (find-freenode-3a \"#eev\")
+
+which tells Emacs to connect to Freenode and to the channel #eev,
+using this window setting:
+
+   _________________________
+  |           |             |
+  |           |   Freenode  |
+  |           |    server   |
+  |           |   messages  |
+  |  current  |_____________|    
+  |  buffer   |             |
+  |           |    #eev     |
+  |           |   channel   |
+  |           |             |
+  |___________|_____________|
+
+You will then be able to watch the process of connecting to
+Freenode, which takes about 20s on my machine, by the messages
+that will appear at the Freenode server buffer; at some point
+rcirc will be allowed by the server to connect to channels, it
+will request to connect to the channel #eev, and some login
+messages, plus at list of all users connected to #eev and a
+prompt, will appear at the #eev channel buffer.
+
+`M-66j' is mostly for establishing a connection to an IRC server
+and watching if any errors occur; once we know that we are
+connected we can use `M-6j' - with just one `M-6' - which just
+takes us to the #eev channel without changing the current window
+configuration. A mnemonic: `M-66j', which is one keypress longer,
+is to be used less often - essentially only once per session, or
+when we want to check the status of our connection to Freenode.
+
+
+
+
+Messages and commands
+=====================
+IRC is a command-line-ish protocol, in which lines starting with
+\"/\" are treated as commands and other lines as messages. A
+message typed at the #eev channel buffer is broadcast to all
+other users also connected to #eev; some commands, like
+
+  /join #emacs
+
+work in the same way no matter where they are typed, while
+others, like for example \"/part\", work differently when typed
+in #eev than when in #emacs. See:
+
+  (find-rcircnode \"rcirc commands\" \"/join #emacs\")
+  (find-rcircnode \"rcirc commands\" \"/part\")
+
+
+
+Other channels
+==============
+
+where `find-freenode-3a' is based on `find-3a', described here:
+
+  (find-multiwindow-intro \"High-level words\")
+
+  (find-eev \"eev-rcirc.el\")
+
 If you are new to IRC
 =====================
 Most of the discussions between Free Software developers still
@@ -3689,14 +3822,12 @@ to try this first:
 IRC is a command-line-ish protocol, in which lines starting with
 \"/\" are treated as commands and other lines are messages to be
 broadcast. Try to \"/join\" the channels \"#emacs\" and \"#eev\",
-with \"/join #emacs\" and \"/join #eev\"; 
-
- in that
-webchat, try to switch between the channels you're connected to
-by clicking on the tabs at the top - and note that there is also
-a tab for a channel-ish thing that has only messages from the
-server. Try also to leave these channels with \"/part\", \"/part
-#emacs\", \"/part #eev\".
+with \"/join #emacs\" and \"/join #eev\"; in that webchat, try to
+switch between the channels you're connected to by clicking on
+the tabs at the top - and note that there is also a tab for a
+channel-ish thing that has only messages from the server. Try
+also to leave these channels with \"/part\", \"/part #emacs\",
+\"/part #eev\".
 
 In Rcirc each one of these channels, including the server
 channel, becomes an Emacs buffer. The names of these buffers will
@@ -3706,6 +3837,8 @@ be:
   address@hidden
   address@hidden
 
+  (defun eejump-66 () (find-freenode-3a \"#eev\"))
+
 For more information see:
 
   (find-node \"(rcirc)Top\")
@@ -3717,13 +3850,6 @@ For more information see:
   (find-node \"(erc)Top\")
   http://www.emacswiki.org/emacs/ErC
 
-
-
-Eev and 
-
-Not yet!
-========
-See: (find-eev \"eepitch.el\" \"eepitch-freenode\")
 " pos-spec-list)))
 
 ;; (find-rcirc-intro)
@@ -5263,7 +5389,9 @@ The most basic keys of eev are:
         `M-2j' takes you to this help page.
         `M-5j' takes you to: (find-eev-intro)
          See: (find-eejump-intro \"Families\")
-  M-h M-h - hyperlinks to here, plus help
+  M-h M-h - hyperlinks to here, plus help.
+         See: (find-links-intro \"`find-here-links'\")
+
 
 The mnemonics are:
   M-e   - evaluate/execute
diff --git a/eev-multiwindow.el b/eev-multiwindow.el
index 0d8aef0..abcf46c 100644
--- a/eev-multiwindow.el
+++ b/eev-multiwindow.el
@@ -101,21 +101,25 @@ that. This is mainly for `find-wset'."
 (defun find-wset-! () (ee-here-reset (car sexps)) (setq sexps (cdr sexps)))
 (defun find-wset-O () (other-window -1))
 
-;; Mnemonic: "e" and "E" are both to prepare eepitch windows;
-;; "E" is more aggressive. See:
+;; Mnemonic: "e" and "E" are both to prepare eepitch windows,
+;; and "E" is more aggressive than "e". See:
+;; (find-multiwindow-intro)
 (defun find-wset-e () (ee-here       (car sexps)) (setq sexps (cdr sexps)))
 (defun find-wset-E () (ee-here-reset (car sexps)) (setq sexps (cdr sexps)))
 
 
 
-;; (find-multiwindow-intro)
-;; Temporary hacks
+;; Temporary hacks (?)
+;; See: (find-multiwindow-intro "High-level words")
 (defun find-2a (a b)   (find-wset "13_o_o" a b))
 (defun find-2b (a b)   (find-wset "13_o_"  a b))
 (defun find-3a (a b c) (find-wset "13_o2_o_o"  a b c))
 (defun find-3b (a b c) (find-wset "13_o2_o_oo" a b c))
 (defun find-3c (a b c) (find-wset "13_o2_o_"   a b c))
 
+;; See:
+;; (find-multiwindow-intro "Several eepitch targets")
+;; (find-multiwindow-intro "Restarting eepitch targets")
 (defun find-3ee (b c) (find-wset "13o2=o=o" b c))
 (defun find-3EE (b c) (find-wset "13o2!o!o" b c))
 
diff --git a/eev-pdflike.el b/eev-pdflike.el
index 8f9e6d7..76fa18c 100644
--- a/eev-pdflike.el
+++ b/eev-pdflike.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2013jun16
+;; Version:    2014mar05
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-pdflike.el>
@@ -150,7 +150,8 @@
 (defun  ee-find-evince-page (fname &optional page)
   `("evince"
     ,@ee-find-evince-page-options
-    ,@(if page `(,(format "--page-label=%d" page)))
+    ;; ,@(if page `(,(format "--page-label=%d" page)))
+    ,@(if page `(,(format "--page-index=%d" page)))
     ,fname))
 
 (defun      code-evince (c fname &rest rest)
diff --git a/eev-pkg.el b/eev-pkg.el
new file mode 100644
index 0000000..aba2d6b
--- /dev/null
+++ b/eev-pkg.el
@@ -0,0 +1,5 @@
+(define-package "eev" "20140823" "Support for e-scripts (eepitch blocks, elisp 
hyperlinks, etc)")
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/eev-rcirc.el b/eev-rcirc.el
index bbe557e..20bdfe5 100644
--- a/eev-rcirc.el
+++ b/eev-rcirc.el
@@ -19,14 +19,14 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2013sep08
+;; Version:    2013nov27
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-rcirc.el>
 ;;       htmlized: <http://angg.twu.net/eev-current/eev-rcirc.el.html>
 ;;       See also: <http://angg.twu.net/eev-current/eev-readme.el.html>
-;;                 <http://angg.twu.net/eev-intros/find-eev-intro.html>
-;;                                                (find-eev-intro)
+;;                 <http://angg.twu.net/eev-intros/find-rcirc-intro.html>
+;;                                                (find-rcirc-intro)
 
 ;;; Commentary:
 
diff --git a/eev-readme.el b/eev-readme.el
index d451474..e1f7c1e 100644
--- a/eev-readme.el
+++ b/eev-readme.el
@@ -1,6 +1,6 @@
 ;; eev-readme.el -- an executable README for eev2 (-> eev-0.96).
 
-;; Copyright (C) 2012 Free Software Foundation, Inc.
+;; Copyright (C) 2012,2014 Free Software Foundation, Inc.
 ;;
 ;; This file is (not yet?) part of GNU eev.
 ;;
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2012dec29
+;; Version:    2014aug17
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-readme.el>
@@ -93,4 +93,6 @@
   (eev-mode 1)
   )
 
-;; (insert-file "2.el")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/eev-tlinks.el b/eev-tlinks.el
index 7ba99ed..87b8dde 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -1,6 +1,6 @@
 ;;; eev-tlinks.el --- hyperlinks to temporary buffers generated by templates
 
-;; Copyright (C) 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2013,2014 Free Software Foundation, Inc.
 ;;
 ;; This file is (not yet?) part of GNU eev.
 ;;
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2013oct13
+;; Version:    2014oct09
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-tlinks.el>
@@ -1058,11 +1058,13 @@ Example:
 # http://www.youtube.com/watch?v={hash}#t=0m00s
 # http://www.youtube.com/watch?v={hash}#t=0h00m00s
 cd {dir}
-{ee-youtubedl-command} 'http://www.youtube.com/watch?v={hash}'
+{ee-youtubedl-command} -f 18 --restrict-filenames 
'http://www.youtube.com/watch?v={hash}'
 
-# {ee-youtubedl-command} -F    'http://www.youtube.com/watch?v={hash}'
-# {ee-youtubedl-command} -f 18 'http://www.youtube.com/watch?v={hash}'
-# {ee-youtubedl-command} -f 18 --restrict-filenames --write-thumbnail 
'http://www.youtube.com/watch?v={hash}'
+# Or:
+{ee-youtubedl-command}       'http://www.youtube.com/watch?v={hash}'
+{ee-youtubedl-command} -F    'http://www.youtube.com/watch?v={hash}'
+{ee-youtubedl-command} -f 18 'http://www.youtube.com/watch?v={hash}'
+{ee-youtubedl-command} -f 18 --restrict-filenames --write-thumbnail 
'http://www.youtube.com/watch?v={hash}'
 
 # (find-es \"video\" \"youtube-dl\")
 # (find-fline \"{dir}\" \"{hash}\")
@@ -1459,6 +1461,12 @@ echo     'http://angg.twu.net/eev-videos/{anggstem}.mp4' 
>> ~/.psne.log
 # Error messages:
 # (find-ebuffer \"*Messages*\")
 
+# See: (find-audiovideo-intro \"eev-avadj-mode\")
+#      (find-audiovideo-intro \"The time-from-bol\")
+# (eev-avadj-mode 1)
+# (find-{c} t)
+# 0:00
+
 # Links to the version at youtube:
 # http://www.youtube.com/watch?v={youtubehash}
 # http://www.youtube.com/watch?v={youtubehash}&t=0m00s
diff --git a/eev-wrap.el b/eev-wrap.el
index ebe305c..ec231bf 100644
--- a/eev-wrap.el
+++ b/eev-wrap.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2013nov18
+;; Version:    2013dec10
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-wrap.el>
@@ -391,8 +391,8 @@ cd     {dir}"))
   "An internal function used by `eewrap-audiovideo'."
   (ee-template0 "\
 ;; (find-fline {(ee-S (file-name-directory fname))})
-;; (find-audio \"{fname}\")})
-;; (find-video \"{fname}\")})
+;; (find-audio \"{fname}\")
+;; (find-video \"{fname}\")
 \(code-audio \"{stem}\" \"{fname}\")
 \(code-video \"{stem}\" \"{fname}\")
 ;; \(find-{stem})