[elpa] externals/eev a334821 08/64: `ee-mplayer-{audio, video}-options', `find-here-links'

[Stefan Monnier]

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

    `ee-mplayer-{audio,video}-options', `find-here-links'
---
 VERSION           |  4 ++--
 eev-audiovideo.el | 12 ++++++++----
 eev-elinks.el     | 20 +++++++++++---------
 eev-intro.el      | 21 +++++++++++++++++++++
 eev-mode.el       | 13 ++++++++-----
 eev-rcirc.el      | 14 +++++++++-----
 eev-tlinks.el     |  6 ++++--
 7 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/VERSION b/VERSION
index b6cbaf2..fcd53a2 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Mon Sep 30 20:56:42 GMT 2013
-Mon Sep 30 17:56:42 BRT 2013
+Thu Nov  7 14:56:18 GMT 2013
+Thu Nov  7 12:56:18 BRST 2013
diff --git a/eev-audiovideo.el b/eev-audiovideo.el
index 8c1ba70..a4820d2 100644
--- a/eev-audiovideo.el
+++ b/eev-audiovideo.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2013aug17
+;; Version:    2013oct18
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-audiovideo.el>
@@ -193,11 +193,12 @@ See: (find-audiovideo-intro \"`eev-avadj-mode'\")"
   (interactive "sFile name: ")
   (find-bgprocess (ee-find-mplayer fname pos)))
 (defvar     ee-mplayer-options '("-fs" "-osdlevel" "2" "-zoom"))
+(defun ee-mplayer-video-options () ee-mplayer-options)
 (defun ee-find-mplayer (fname &optional pos &rest rest)
   `("mplayer"
     ,fname
     ,@(if pos `("-ss" ,(ee-secs-to-mm:ss pos)))
-    ,@ee-mplayer-options
+    ,@(ee-mplayer-video-options)
     ))
 
 (defun      code-mplayer (c fname)
@@ -237,12 +238,13 @@ See: (find-audiovideo-intro \"`eev-avadj-mode'\")"
 ;;
 (defvar     ee-termplayer-term-options '("xterm" "-geometry" "+200+100" "-e"))
 (defvar     ee-termplayer-options ())
+(defun ee-mplayer-audio-options () ee-termplayer-options)
 (defun ee-find-termplayer (fname &optional pos &rest rest)
   `(,@ee-termplayer-term-options
     "mplayer"
     ,fname
     ,@(if pos `("-ss" ,(ee-secs-to-mm:ss pos)))
-    ,@ee-termplayer-options
+    ,@(ee-mplayer-audio-options)
     ))
 (defun    find-termplayer (fname &optional pos &rest rest)
   "Open FNAME with mplayer, without a GUI (in a terminal - for audio files)."
@@ -260,7 +262,9 @@ See: (find-audiovideo-intro \"`eev-avadj-mode'\")"
     (defun find-{c} (&optional time &rest rest)
       (interactive (list (ee-time-around-point)))
       (setq ee-audiovideo-last 'find-{c})
-      (find-termplayer {(ee-S fname)} time))
+      (if (eq time t)
+        \"Just setting the default audio\"
+        (find-termplayer {(ee-S fname)} time)))
   "))
 
 (defalias      'find-audio      'find-termplayer)
diff --git a/eev-elinks.el b/eev-elinks.el
index 5374a5b..603534d 100644
--- a/eev-elinks.el
+++ b/eev-elinks.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2013sep30
+;; Version:    2013nov07
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-elinks.el>
@@ -760,6 +760,7 @@ This needs a temporary directory; see: 
(find-prepared-intro)"
 ;;; |_| |_|_| |_|\__,_|     |_| |_|\___|_|  \___|     |_|_|_| |_|_|\_\___/
 ;;;                                                                       
 ;; �find-here-links� (to ".find-here-links")
+;; TO DO: DOCUMENT THIS!
 
 ;; (find-efunction 'find-grep-links)
 ;; (find-efunction 'find-einfo-links)
@@ -791,14 +792,14 @@ This needs a temporary directory; see: 
(find-prepared-intro)"
   `((find-man ,mp)))
 
 (defun ee-find-here-links ()
-  (cond ((ee-info-bufferp)     (cons "" (ee-find-info-links)))
-       ((ee-intro-bufferp)    (cons "" (ee-find-intro-links)))
-       ((ee-man-bufferp)      (cons "" (ee-find-man-links)))
-       ((ee-grep-bufferp)     (cons "" (ee-find-grep-links)))
-       ((ee-freenode-bufferp) (cons "" (ee-find-freenode-links)))
-       ((ee-dired-bufferp)    (cons "" (ee-find-file-links)))
-       ((ee-wdired-bufferp)   (cons "" (ee-find-file-links)))
-       ((ee-file-bufferp)     (cons "" (ee-find-file-links)))
+  (cond ((ee-info-bufferp)     (cons "" (ee-find-info-links)))     ; M-h M-i
+       ((ee-intro-bufferp)    (cons "" (ee-find-intro-links)))    ; M-h M-i
+       ((ee-man-bufferp)      (cons "" (ee-find-man-links)))      ; ?
+       ((ee-grep-bufferp)     (cons "" (ee-find-grep-links)))     ; M-h M-g
+       ((ee-freenode-bufferp) (cons "" (ee-find-freenode-links))) ; ?
+       ((ee-dired-bufferp)    (cons "" (ee-find-file-links)))     ; M-h f
+       ((ee-wdired-bufferp)   (cons "" (ee-find-file-links)))     ; M-h f
+       ((ee-file-bufferp)     (cons "" (ee-find-file-links)))     ; M-h f
        (t (list "hello" "you"))))
 
 (defun find-here-links-test (sexp)
@@ -820,6 +821,7 @@ This needs a temporary directory; see: 
(find-prepared-intro)"
      ;; (find-efunction 'find-here-links)
      ,(ee-H "See: ")
      (find-links-intro "`find-here-links'")
+     (find-efunctiondescr 'eev-mode "M-h M-h")
      ;; ""
      ,@(ee-find-here-links)
      )
diff --git a/eev-intro.el b/eev-intro.el
index d702786..3a7c6ee 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -2789,6 +2789,27 @@ each call to a short hyperlink of the form 
`find-xxxaudio' or
 
 
 
+Passing options to mplayer
+==========================
+By default mplayer is called with just a few command-line options,
+besides the ones that tell it at what position to start playing -
+typically just these for videos,
+
+  -fs -osdlevel 2
+
+to make it run in full-screen mode with an on-screen display
+showing the current position, and no options for audio.
+
+If you want to change this you should redefine these functions:
+
+  (ee-mplayer-video-options)
+  (ee-mplayer-audio-options)
+
+
+  
+
+
+
 `eev-avadj-mode'
 ================
 \"avadj-mode\" is a shorthand for \"audio/video adjust mode\".
diff --git a/eev-mode.el b/eev-mode.el
index 2730359..c8cc397 100644
--- a/eev-mode.el
+++ b/eev-mode.el
@@ -166,16 +166,18 @@ Commands to convert the current line into hyperlinks:
   \\[eewrap-audiovideo]  -- generate audio/video hyperlinks
     See: (find-wrap-intro)
 Commands to generate pages with lists of hyperlinks:
-  \\[find-file-links]   -- hyperlinks to the current file
-  \\[find-grep-links] -- hyperlinks to `find-xxxgrep' sexps
+  \\[find-here-links]  -- \"hyperlinks to here\", which supersedes all these:
+    \\[find-file-links]   -- hyperlinks to the current file
+    \\[find-einfo-links] -- hyperlinks to the current Info node (or intro)
+    \\[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-einfo-links] -- hyperlinks to the current Info node (or intro)
   \\[find-ekey-links] -- hyperlinks to a key sequence and to the function
              associated to it
   \\[find-evariable-links] -- hyperlinks to an Emacs variable
   \\[find-eface-links] -- hyperlinks to a face (default: face at point)
-  \\[find-manpage-links] -- hyperlinks to a manpage (ask for name)
-  \\[find-last-manpage-links]   -- hyperlinks to a manpage (being viewed)
   \\[find-debpkg-links] -- hyperlinks about a Debian package
   \\[find-ecolor-links]   -- hyperlinks to a color
 Commands to edit hyperlinks:
@@ -183,6 +185,7 @@ Commands to edit hyperlinks:
   \\[ee-yank-pos-spec] -- yank into pos-spec-list
   \\[ee-shrink-hyperlink-at-eol] -- shrink `find-xxxfile' to `find-xxx'
   \\[eewrap-vldi-list-line]     -- transform filename into hyperlink
+  See: (find-eval-intro \"Producing and refining hyperlinks\")
 Other commands:
   \\[find-eev-mode-links] -- show this help about eev-mode, or some links
   \\[describe-char] -- lots of info about the character at point
diff --git a/eev-rcirc.el b/eev-rcirc.el
index 865367e..bbe557e 100644
--- a/eev-rcirc.el
+++ b/eev-rcirc.el
@@ -117,6 +117,15 @@ CHANNEL."
 
 
 
+
+;; (find-find-links-links "{k}" "freenode" "channel")
+;;
+(defun ee-irc-channel-around-point ()
+  (ee-stuff-around-point "#A-Za-z0-9_"))
+
+
+
+
 ;; High-level
 ;;
 (defvar ee-freenode-server "irc.freenode.net")
@@ -132,11 +141,6 @@ CHANNEL."
 (defun find-freenode-3a (channel)
   (find-3a nil '(find-freenode) '(find-freenode channel)))
 
-;; (find-find-links-links "{k}" "freenode" "channel")
-;;
-(defun ee-irc-channel-around-point ()
-  (ee-stuff-around-point "#A-Za-z0-9_"))
-
 (defun ee-find-freenode-links (&optional channel)
   (setq channel (or channel (replace-regexp-in-string
                             "^\\(.*\\).irc\\.freenode\\.net" "\\1"
diff --git a/eev-tlinks.el b/eev-tlinks.el
index d55e1a6..7ba99ed 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <address@hidden>
 ;; Maintainer: Eduardo Ochs <address@hidden>
-;; Version:    2013aug29
+;; Version:    2013oct13
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-tlinks.el>
@@ -1062,7 +1062,7 @@ cd {dir}
 
 # {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  --write-thumbnail 
'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}\")
@@ -1325,6 +1325,7 @@ echo     '{url}' >> ~/.psne.log
        ""
        (setq ee-git-dir ,ee-git-dir)
        (setq ee-git-dir "~/usrc/")
+       (setq ee-git-dir "~/bigsrc/")
        (setq ee-git-dir "/tmp/")
        ""
        (find-fline ,ee-git-dir)
@@ -1338,6 +1339,7 @@ echo     '{url}' >> ~/.psne.log
 cd      {ee-git-dir}
 git clone --depth 1 {url}
 cd      {dir}
+git pull --depth 1
 # git pull
 # (find-fline \"{ee-git-dir}\")
 # (find-fline \"{dir}\")