[elpa] externals/eev c927123fbc 4/4: Merge branch 'UTF-8'

[ELPA Syncer]

branch: externals/eev
commit c927123fbcbd399fb5b433b6ff68b5de50cbed2f
Merge: 6fda10daf0 f97e6c2a39
Author: Eduardo Ochs <eduardoochs@gmail.com>
Commit: Eduardo Ochs <eduardoochs@gmail.com>

    Merge branch 'UTF-8'
---
 ChangeLog         | 13 +++++++++++++
 VERSION           |  5 +++++
 eev-kla.el        | 41 +++++++++++++++++++++++++++++++++++++----
 eev-testblocks.el | 17 ++++++++++++++++-
 eev-tlinks.el     | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 124 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 43536740ab..fd11a04d8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2022-10-19  Eduardo Ochs  <eduardoochs@gmail.com>
+
+       * eev-tlinks.el (find-eejump-links): new function.
+
+2022-10-18  Eduardo Ochs  <eduardoochs@gmail.com>
+
+       * eev-kla.el (ee-kl-shorterfname): new function.
+       (ee-kl-sexp-kla, ee-kl-sexp-klas): use `ee-kl-shorterfname'.
+
+2022-10-16  Eduardo Ochs  <eduardoochs@gmail.com>
+
+       * eev-testblocks.el (ee-insert-test-f90-mode): new function.
+
 2022-10-15  Eduardo Ochs  <eduardoochs@gmail.com>
 
        * eev-pdflike.el (find-pdftools-page, find-xpdf-page)
diff --git a/VERSION b/VERSION
index 2fc3be51c4..913b63065d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 Sun Oct  9 04:07:01 GMT 2022
 Sun Oct  9 01:07:01 -03 2022
 =======
 Sat Oct 15 22:25:27 GMT 2022
 Sat Oct 15 19:25:27 -03 2022
 >>>>>>> UTF-8
+=======
+Wed Oct 19 04:08:36 GMT 2022
+Wed Oct 19 01:08:36 -03 2022
+>>>>>>> UTF-8
diff --git a/eev-kla.el b/eev-kla.el
index bea54e4711..7d3fafda8f 100644
--- a/eev-kla.el
+++ b/eev-kla.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <eduardoochs@gmail.com>
 ;; Maintainer: Eduardo Ochs <eduardoochs@gmail.com>
-;; Version:    20220926
+;; Version:    20221018
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-kla.el>
@@ -458,7 +458,34 @@
 ;;      variable `ee-kl-format1'.
 ;;
 ;;
-;; 11. Please test!
+;; 11. Overridable functions
+;; =========================
+;; On my machine I have some "living fossils" - the ones mentioned
+;; in `find-angg-es-links',
+;;
+;;   (find-angg-es-links)
+;;   (find-angg-es-links 2 "living fossil")
+;;   (find-eev "eev-tlinks.el" "find-angg-es-links")
+;;   (find-eev "eev-tlinks.el" "find-angg-es-links" "living fossil")
+;;
+;; ...and a few other ones. My trick for making `kla' and `klas'
+;; support them is to override `ee-kl-shorterfname', and redefine it
+;; in my ~/.emacs by a function that deletes the suffixes.
+;;
+;; Also, a friend of mine uses Doom Emacs, that uses straight.el, and
+;; he told me that in Doom Emacs this
+;;
+;;   (find-eev "eev-code.el" "code-c-d-s")
+;;   (find-eev "eev-code.el" "code-c-d-s" "ee-eev-source-directory")
+;;
+;; points to a directory that only has .el files, and all these ".el"s
+;; are symlinks. This breaks `ee-kl-shortfname', and I'm experimenting
+;; with variants of `ee-kl-shortfname' - that are hacks, and that have
+;; to be put in his ~/.emacs to override the original function - that
+;; contain code to handle these symlinks correctly.
+;;
+;;
+;; 12. Please test!
 ;; ================
 ;; ..and get in touch, either through the mailing list,
 ;;
@@ -648,6 +675,7 @@
 ;; accept keyword arguments. Tests:
 ;;   (ee-kl-dir)
 ;;   (ee-kl-shortfname)
+;;   (ee-kl-shorterfname)
 ;;   (ee-kl-find-c)
 ;;   (ee-kl-find-cfile)
 ;;
@@ -661,6 +689,11 @@
   (ee-remove-prefix (ee-expand (ee-kl-dir :c c))
                    (ee-expand fname)))
 
+(cl-defun ee-kl-shorterfname
+    (&key (c     (ee-kl-c))
+         (fname (ee-kl-fname)))
+  (ee-kl-shorterfname :c c :fname fname))
+
 (cl-defun ee-kl-find-c
     (&key (c (ee-kl-c)))
   (intern (format "find-%s" c)))
@@ -689,7 +722,7 @@
      &key (fname  (ee-kl-fname))
      &key (anchor (ee-kl-anchor)))
   (list (ee-kl-find-c :c c)
-       (ee-kl-shortfname :c c :fname fname)
+       (ee-kl-shorterfname :c c :fname fname)
        anchor))
 
 (cl-defun ee-kl-sexp-klas
@@ -698,7 +731,7 @@
      &key (anchor (ee-kl-anchor))
      &key (region (ee-kl-region)))
   (list (ee-kl-find-c :c c)
-       (ee-kl-shortfname :c c :fname fname)
+       (ee-kl-shorterfname :c c :fname fname)
        anchor
        region))
 
diff --git a/eev-testblocks.el b/eev-testblocks.el
index 4882b68add..f5e9b440c0 100644
--- a/eev-testblocks.el
+++ b/eev-testblocks.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <eduardoochs@gmail.com>
 ;; Maintainer: Eduardo Ochs <eduardoochs@gmail.com>
-;; Version:    20220115
+;; Version:    20221016
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-testblocks.el>
@@ -114,6 +114,21 @@ gcc -o {fname} {fnamec}
 \")
 " stem)))))
 
+(defun ee-insert-test-f90-mode ()
+  (interactive)
+  (let* ((fullname  (buffer-name))
+       (shortname (replace-regexp-in-string "\\.[fF].*$" "" fullname)))
+    (insert (ee-adjust-red-stars (ee-template0 "
+!T  (find-eepitch-intro \"3.3. `eepitch-preprocess-line'\")
+!T  (setq eepitch-preprocess-regexp \"^!T ?\")
+!T  (eepitch-shell)
+!T  (eepitch-kill)
+!T  (eepitch-shell)
+!T gfortran {fullname} -o {shortname}
+!T ./{shortname}
+
+")))))
+
 (defun ee-insert-test-gnuplot-mode ()
   (interactive)
   (insert (ee-adjust-red-stars (format "
diff --git a/eev-tlinks.el b/eev-tlinks.el
index 77cd047112..f63da0b060 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -130,6 +130,7 @@
 ;; «.find-pip3-links»                  (to "find-pip3-links")
 ;; «.find-yttranscript-links»          (to "find-yttranscript-links")
 ;; «.find-nov-links»                   (to "find-nov-links")
+;; «.find-eejump-links»                        (to "find-eejump-links")
 
 
 (require 'eev-env)
@@ -3512,6 +3513,58 @@ This doesn't support pos-spec lists yet."
 
 
 
+;; «find-eejump-links»  (to ".find-eejump-links")
+;; Skel: (find-find-links-links-new "eejump" "n sexp" "strn strsexp def call")
+;; Test: (find-eejump-links)
+;;
+(defun find-eejump-links (&optional n sexp &rest pos-spec-list)
+"Visit a temporary buffer that (sort of) explains how to use eejump.
+N should be either a number or a symbol; SEXP should be a sexp."
+  (interactive)
+  (setq n (or n 999))
+  (setq sexp (or sexp '(find-elnode "")))
+  (let* ((strn    (format "%s" n))
+         (strsexp (ee-S sexp))
+         (call    (if (numberp n)
+                     (format "M-%sj" n)
+                   (format "M-x %s"n )))
+         (def     (ee-wrap-eejump strn strsexp)))
+    (apply
+     'find-elinks-elisp
+     `((find-eejump-links ,n ,sexp ,@pos-spec-list)
+       (find-eejump-links 999 '(find-elnode ""))
+       (find-eejump-links 'el '(find-elisp-intro))
+       ;; Convention: the first sexp always regenerates the buffer.
+       (find-efunction 'find-eejump-links)
+       ""
+       ";; See:"
+       (find-eev-quick-intro "7. Quick access to one-liners")
+       (find-eev-quick-intro "7.3. Defining eejump targets")
+       (find-eev-quick-intro "7.4. Commands with very short names")
+       (find-elisp-intro "6. Defining functions")
+       (find-eejump-intro "shorthand" "`M-123j'")
+       (find-eejumps)
+       (find-eeshortdefs)
+       ""
+       ,(ee-template0 "\
+;; Typing `M-J' on the line below...
+{strn} {strsexp}
+
+;; ...converts it to:
+{def}
+
+;; After executing the defun above
+;; you will be able to run the sexp
+;;   {strsexp}
+;; by typing `{call}'.
+")
+       )
+     pos-spec-list)))
+
+
+
+
+
 
 (provide 'eev-tlinks)