branch: externals/eev
commit e7bef852d3e886bf465e448acb4415522cb6f533
Author: Eduardo Ochs <edrx@circe.birdland>
Commit: Eduardo Ochs <edrx@circe.birdland>
Added `find-mpv-video' and `find-mpv-audio'.
---
ChangeLog | 18 +++++++++++
VERSION | 4 +--
eepitch.el | 5 +++-
eev-audiovideo.el | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
eev-intro.el | 19 +++++++-----
eev-tlinks.el | 4 +++
6 files changed, 128 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9a0fc01..beaa153 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,25 @@
+2019-08-12 Eduardo Ochs <eduardoo...@gmail.com>
+
+ * eepitch.el (eepitch-shell3, eepitch-lua52, eepitch-lua53): new
+ functions.
+
+ * eev-audiovideo.el (find-mpv-video, ee-find-mpv-video)
+ (code-mpv-video, find-code-mpv-video, ee-code-mpv-video)
+ (ee-find-mpv-audio, find-mpv-audio, code-mpv-audio)
+ (find-code-mpv-audio, ee-code-mpv-audio): new functions.
+ (ee-mpv-video-options, ee-mpv-term-options)
+ (ee-mpv-audio-options): new variables.
+
2019-08-11 Eduardo Ochs <eduardoo...@gmail.com>
+ * eev-audiovideo.el (ee-mpv-video-options): new variable.
+ (ee-mpv-video-options, ee-find-mpv-video): num funcions.
+
* eev-tlinks.el (find-apt-get-source-links): new function.
+ * eepitch.el (eepitch-lua52, eepitch-lua53, eepitch-shell3): new
+ functions.
+
2019-08-10 Eduardo Ochs <eduardoo...@gmail.com>
* eev-explain.el: new file.
diff --git a/VERSION b/VERSION
index 2536c89..03e53f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Sun Aug 11 04:03:31 GMT 2019
-Sun Aug 11 05:03:31 BST 2019
+Mon Aug 12 09:12:28 GMT 2019
+Mon Aug 12 10:12:28 BST 2019
diff --git a/eepitch.el b/eepitch.el
index 7d3b053..54e801c 100644
--- a/eepitch.el
+++ b/eepitch.el
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 2019mar15
+;; Version: 2019aug11
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eepitch.el>
@@ -425,6 +425,7 @@ scratch."
(eepitch '(shell)))
(defun eepitch-shell2 () (interactive) (eepitch '(shell "*shell 2*")))
+(defun eepitch-shell3 () (interactive) (eepitch '(shell "*shell 3*")))
(defun eepitch-eshell () (interactive) (eepitch '(eshell)))
@@ -710,6 +711,8 @@ This is useful for for running processes that use pagers
like
;; Main interpreted languages
(defun eepitch-lua51 () (interactive) (eepitch-comint "lua51" "lua5.1"))
+(defun eepitch-lua52 () (interactive) (eepitch-comint "lua52" "lua5.2"))
+(defun eepitch-lua53 () (interactive) (eepitch-comint "lua53" "lua5.3"))
(defun eepitch-python () (interactive) (eepitch-comint "python" "python"))
(defun eepitch-ruby () (interactive) (eepitch-comint "ruby" "irb"))
(defun eepitch-ruby () (interactive) (eepitch-comint "ruby" "irb
--simple-prompt"))
diff --git a/eev-audiovideo.el b/eev-audiovideo.el
index 72a5ca3..1d44a51 100644
--- a/eev-audiovideo.el
+++ b/eev-audiovideo.el
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 2019mar02
+;; Version: 2019aug12
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eev-audiovideo.el>
@@ -37,6 +37,11 @@
;;
;; but that needs to be rewritten...
+;; «.find-mpv-video» (to "find-mpv-video")
+;; «.find-mpv-audio» (to "find-mpv-audio")
+;; «.find-termplayer» (to "find-termplayer")
+
+
(require 'eev-code)
@@ -223,6 +228,87 @@ See: (find-audiovideo-intro \"`eev-avadj-mode'\")"
(find-mplayer {(ee-S fname)} time)))
"))
+
+
+;;; _ _
+;;; _ __ ___ _ ____ __ __ _(_) __| | ___ ___
+;;; | '_ ` _ \| '_ \ \ / /___\ \ / / |/ _` |/ _ \/ _ \
+;;; | | | | | | |_) \ V /_____\ V /| | (_| | __/ (_) |
+;;; |_| |_| |_| .__/ \_/ \_/ |_|\__,_|\___|\___/
+;;; |_|
+;;
+;; «find-mpv-video» (to ".find-mpv-video")
+;; Experimental! To use it run:
+;; (defun find-video (&rest rest) (apply 'find-mpv-video rest))
+;;
+(defun find-mpv-video (fname &optional pos &rest rest)
+ "Open FNAME with mpv, with a GUI (in fullscreen mode, for video files)."
+ (interactive "sFile name: ")
+ (find-bgprocess (ee-find-mpv-video fname pos)))
+(defvar ee-mpv-video-options '("--fs" "--osd-level=2"))
+(defun ee-find-mpv-video (fname &optional pos &rest rest)
+ `("mpv"
+ ,fname
+ ,@(if pos `("--start" ,(ee-secs-to-mm:ss pos)))
+ ,@ee-mpv-video-options
+ ))
+
+(defun code-mpv-video (c fname)
+ (eval (ee-read (ee-code-mpv-video c fname))))
+(defun find-code-mpv-video (c fname)
+ (find-estring-elisp (ee-code-mpv-video c fname)))
+(defun ee-code-mpv-video (c fname)
+ (ee-template0 "\
+ ;; {(ee-S `(find-code-mpv-video ,c ,fname))}
+ ;;
+ (defun find-{c} (&optional time &rest rest)
+ (interactive (list (ee-time-around-point)))
+ (setq ee-audiovideo-last 'find-{c})
+ (if (eq time t)
+ \"Just setting the default video\"
+ (find-mpv-video {(ee-S fname)} time)))
+ "))
+
+
+
+;; «find-mpv-audio» (to ".find-mpv-audio")
+;; (find-es "mplayer" "mpv-audio")
+;;
+(setq ee-mpv-term-options '("xterm" "-geometry" "+200+100" "-e"))
+(setq ee-mpv-audio-options '("--vid=no"))
+(defun ee-find-mpv-audio (fname &optional pos &rest rest)
+ `(,@ee-mpv-term-options
+ "mpv"
+ ,fname
+ ,@(if pos `("--start" ,(ee-secs-to-mm:ss pos)))
+ ,@(ee-mpv-audio-options)
+ ))
+(defun find-mpv-audio (fname &optional pos &rest rest)
+ "Open FNAME with mpv, without a GUI (in a terminal - for audio files)."
+ (interactive "sFile name: ")
+ (find-bgprocess (ee-find-mpv-audio fname pos)))
+
+(defun code-mpv-audio (c fname)
+ (eval (ee-read (ee-code-mpv-audio c fname))))
+(defun find-code-mpv-audio (c fname)
+ (find-estring-elisp (ee-code-mpv-audio c fname)))
+(defun ee-code-mpv-audio (c fname)
+ (ee-template0 "\
+ ;; {(ee-S `(find-code-mpv-audio ,c ,fname))}
+ ;;
+ (defun find-{c} (&optional time &rest rest)
+ (interactive (list (ee-time-around-point)))
+ (setq ee-audioaudio-last 'find-{c})
+ (if (eq time t)
+ \"Just setting the default audio\"
+ (find-mpv-audio {(ee-S fname)} time)))
+ "))
+
+
+
+
+
+
(defalias 'find-video 'find-mplayer)
(defalias 'code-video 'code-mplayer)
(defalias 'find-code-video 'find-code-mplayer)
@@ -240,6 +326,7 @@ See: (find-audiovideo-intro \"`eev-avadj-mode'\")"
;;; | (_| (_) | (_| | __/_____| (_| | |_| | (_| | | (_) |
;;; \___\___/ \__,_|\___| \__,_|\__,_|\__,_|_|\___/
+;; «find-termplayer» (to ".find-termplayer")
;; mplayer in an xterm, for audio files
;;
(defvar ee-termplayer-term-options '("xterm" "-geometry" "+200+100" "-e"))
diff --git a/eev-intro.el b/eev-intro.el
index 65f300b..2bea417 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -9889,9 +9889,10 @@ Also:
(insert \"HELLO\")
-\[In this video we will also use `M-3 M-e' to open a hyperlink in
-the right window.]
-
+\[In this video we will also use `M-2 M-e' and `M-3 M-e' - they
+create two-window settings with the \"target\" of the sexp in the
+right window... but the idea of the \"target\" of a sexp only
+makes sense when that sexp behaves as a hyperlink...]
@@ -9934,13 +9935,17 @@ and some display their output in the echo area:
Note: `find-fline' is a contraction of `find-file-line'...
-`find-fline' is better for hyperlinks than `find-file' for
-reasons explained in other tutorials:
+`find-fline' is better for hyperlinks than `find-file' because it
+can be \"refined\" to point to a precise place in a file. See:
- (find-links-conv-intro \"4. Elisp hyperlinks: some conventions\")
- (find-links-conv-intro \"messy\")
(find-refining-intro \"2. Refining hyperlinks\")
+See also:
+
+ (find-enode \"Major Modes\")
+ (find-enode \"Major Modes\" \"Dired\")
+ (find-links-conv-intro \"4. Elisp hyperlinks: some conventions\")
+ (find-links-conv-intro \"messy\")
diff --git a/eev-tlinks.el b/eev-tlinks.el
index 9b2c65c..4374e46 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -1069,6 +1069,10 @@ cd {ee-git-dir}
git clone {url}
cd {dir}
+git branch --list -a
+git for-each-ref
+PAGER=cat git log --oneline --graph --all -20
+
# (find-fline \"{ee-git-dir}\")
# (find-fline \"{dir}\")
# (find-gitk \"{dir}\")
