[elpa] externals/eev e101d76 2/2: Merge remote-tracking branch 'eev/UTF-8' into externals/eev

[Stefan Monnier]

branch: externals/eev
commit e101d76b56543f58eec250fd7fb1d2ed6df93cb0
Merge: facb51d 897c87a
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    Merge remote-tracking branch 'eev/UTF-8' into externals/eev
---
 ChangeLog     | 10 ++++++---
 VERSION       |  4 ++--
 eev-elinks.el | 71 -----------------------------------------------------------
 eev-intro.el  |  6 ++---
 eev-tlinks.el | 11 +++++----
 eev.el        |  2 +-
 6 files changed, 20 insertions(+), 84 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a67fb31..08ed8e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-24  Eduardo Ochs  <address@hidden>
+
+       * eev.el: updated the "Version:" (for ELPA).
+
 2020-02-20  Eduardo Ochs  <address@hidden>
 
        * eev-intro.el (find-windows-beginner-intro): new function.
@@ -9,10 +13,10 @@
        * eejump.el (eejump-3): new function - make `M-3 M-j' jump to
        `(find-windows-beginner-intro)'.
 
-       * eev-tlinks.el (find-intro-links): added a "Skel:".
+       * eev-elinks.el (find-code-audiovideo-links): small changes.
 
-       * eev-elinks.el (find-extra-file-links): new function.
-       (find-code-audiovideo-links): small changes.
+       * eev-tlinks.el (find-extra-file-links): new function.
+       (find-intro-links): added a "Skel:".
 
        * eev-mode.el (eev-mode-map-set): bind `M-h M-e' to
        `find-extra-file-links'.
diff --git a/VERSION b/VERSION
index 3cfc394..9e78632 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Thu Feb 20 21:11:56 GMT 2020
-Thu Feb 20 18:11:56 -03 2020
+Mon Feb 24 18:24:03 GMT 2020
+Mon Feb 24 15:24:03 -03 2020
diff --git a/eev-elinks.el b/eev-elinks.el
index bcbc374..4bc1463 100644
--- a/eev-elinks.el
+++ b/eev-elinks.el
@@ -79,7 +79,6 @@
 
 ;; «.find-code-pdf-links»      (to "find-code-pdf-links")
 ;; «.find-pdf-links»           (to "find-pdf-links")
-;; «.find-extra-file-links»    (to "find-extra-file-links")
 ;; «.find-code-audiovideo-links»  (to "find-code-audiovideo-links")
 
 
@@ -1240,76 +1239,6 @@ This is an internal function used by 
`ee-find-epackage-links'."
 
 
 
-;; «find-extra-file-links»  (to ".find-extra-file-links")
-;; Skel: (find-find-links-links-new "extra-file" "fname c" "dir")
-;;
-(defun find-extra-file-links (&optional fname c &rest pos-spec-list)
-"Visit a temporary buffer containing hyperlinks for extra-file."
-  (interactive (list (and (eq major-mode 'dired-mode) (ee-dired-to-fname))))
-  (if fname (setq fname (ee-shorten-file-name fname)))
-  (setq fname (or fname "{fname}"))
-  (setq c (or c "{c}"))
-  (let* ((dir (file-name-directory fname)))
-    (apply
-     'find-elinks-elisp
-     `((find-extra-file-links ,fname ,c ,@pos-spec-list)
-       ;; Convention: the first sexp always regenerates the buffer.
-       ;; (find-efunction 'find-extra-file-links)
-       ;; ""
-       ,(ee-template0 "\
-;; See: (find-eev-quick-intro \"9.1. `code-c-d'\")
-;;      (find-pdf-like-intro \"9. Generating three pairs\" \"`M-h M-p'\")
-;;      (find-audiovideo-intro \"2.1. `find-extra-file-links'\")
-
-;; Links to this directory:
-;; (find-fline {(ee-S (file-name-directory fname))})
-\(code-c-d \"{c}\" \"{(file-name-directory fname)}\")
-;; (find-{c}file \"\")
-
-;; Links to a PDF file:
-;; (find-pdf-page \"{fname}\")
-;; (find-pdf-text \"{fname}\")
-\(code-pdf-page \"{c}\" \"{fname}\")
-\(code-pdf-text \"{c}\" \"{fname}\")
-;; (find-{c}page)
-;; (find-{c}text)
-
-;; Links to an audio file:
-;; (find-audio \"{fname}\")
-\(code-audio \"{c}audio\" \"{fname}\")
-;; (find-{c}audio)
-;; (find-{c}audio \"0:00\")
-
-;; Links to a video file:
-;; (find-video \"{fname}\")
-\(code-video \"{c}video\" \"{fname}\")
-;; (find-{c}video)
-;; (find-{c}video \"0:00\")
-;;
-;; (eev-avadj-mode 0)
-;; (eev-avadj-mode)
-
-;; Links to an shell-like program (for eepitch):
-;; (eepitch-comint \"{c}\" \"{fname}\")
-
-(defun eepitch-{c} () (interactive)
-  (eepitch-comint \"{c}\"
-     \"{fname}\"))
-
-;; Test:
-
- (eepitch-{c})
- (eepitch-kill)
- (eepitch-{c})
-")
-       )
-     pos-spec-list)))
-
-;; Tests:
-;; (find-extra-file-links "~/eev-videos/three-keys-2.mp4")
-
-
-
 ;; «find-code-audiovideo-links»  (to ".find-code-audiovideo-links")
 ;; Skel: (find-find-links-links-new "code-audiovideo" "fname c" "dir")
 ;;
diff --git a/eev-intro.el b/eev-intro.el
index 5d2022c..98d2475 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -11163,9 +11163,6 @@ Version of these instructions: 2020feb20.
 
 1. Download and install Emacs
 =============================
-Official instructions:
-https://www.gnu.org/software/emacs/download.html#windows
-
 Download one of the .zips below:
 http://gnu.c3sl.ufpr.br/ftp/emacs/windows/emacs-26/
 http://gnu.c3sl.ufpr.br/ftp/emacs/windows/emacs-26/README
@@ -11175,6 +11172,9 @@ 
http://gnu.c3sl.ufpr.br/ftp/emacs/windows/emacs-26/emacs-26.3-x86_64.zip   (64 b
 then unpack the .zip and create a desktop icon or shortcut to
 <emacsdir>/bin/runemacs.exe.
 
+The official instructions are here (but you don't need them):
+https://www.gnu.org/software/emacs/download.html#windows
+
 Note: don't use Emacs25 on Windows - it can't access the package repository!  
The details are here:
 
https://emacs.stackexchange.com/questions/233/how-to-proceed-on-package-el-signature-check-failure/52823#52823
 
diff --git a/eev-tlinks.el b/eev-tlinks.el
index 0fd6f32..6ff1dc7 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -1770,7 +1770,9 @@ os.exit()
 ;;
 (defun find-extra-file-links (&optional fname c &rest pos-spec-list)
 "Visit a temporary buffer containing hyperlinks for extra-file."
-  (interactive (list (and (eq major-mode 'dired-mode) (ee-dired-to-fname))))
+  (interactive (list (if (eq major-mode 'dired-mode)
+                        (ee-dired-to-fname)
+                      buffer-file-name)))
   (if fname (setq fname (ee-shorten-file-name fname)))
   (setq fname (or fname "{fname}"))
   (setq c (or c "{c}"))
@@ -1786,9 +1788,10 @@ os.exit()
 ;;      (find-pdf-like-intro \"9. Generating three pairs\" \"`M-h M-p'\")
 ;;      (find-audiovideo-intro \"2.1. `find-extra-file-links'\")
 
-;; Links to this directory:
-;; (find-fline {(ee-S (file-name-directory fname))})
-\(code-c-d \"{c}\" \"{(file-name-directory fname)}\")
+;; Links to this file and directory:
+;; (find-fline {(ee-S fname)})
+;; (find-fline {(ee-S dir)})
+\(code-c-d \"{c}\" \"{dir}\")
 ;; (find-{c}file \"\")
 
 ;; Links to a PDF file:
diff --git a/eev.el b/eev.el
index 2a188b0..a71a11e 100644
--- a/eev.el
+++ b/eev.el
@@ -6,7 +6,7 @@
 ;; Package-Requires: ((emacs "24.1"))
 ;; Keywords: lisp e-scripts
 ;; URL: http://angg.twu.net/#eev
-;; Version: 20191105
+;; Version: 20200224
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by