branch: externals/eev
commit b8e8c7824c3120cea31d06be47b84ad9c99d30e5
Author: Eduardo Ochs <eduardoo...@gmail.com>
Commit: Eduardo Ochs <eduardoo...@gmail.com>
Fixed a bug find in `ee-efunctiondescr-re'.
---
ChangeLog | 5 +++++
VERSION | 4 ++--
eev-hlinks.el | 17 +++++++++++++++--
eev-intro.el | 1 +
4 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3f8ed510b0..f050ccbe38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-12-14 Eduardo Ochs <eduardoo...@gmail.com>
+
+ * eev-hlinks.el (ee-underlinewsp-re): new function.
+ (ee-efunctiondescr-re): use `ee-underlinewsp-re'.
+
2022-12-04 Eduardo Ochs <eduardoo...@gmail.com>
* eev-videolinks.el (find-eev2022pyvideo): new function.
diff --git a/VERSION b/VERSION
index 1bbf8dbe34..dddc014036 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Sun Dec 4 19:23:45 GMT 2022
-Sun Dec 4 16:23:45 -03 2022
+Wed Dec 14 13:22:55 GMT 2022
+Wed Dec 14 10:22:55 -03 2022
diff --git a/eev-hlinks.el b/eev-hlinks.el
index f1f30df4fd..58aed83280 100644
--- a/eev-hlinks.el
+++ b/eev-hlinks.el
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 20221023
+;; Version: 20221214
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eev-hlinks.el>
@@ -435,6 +435,13 @@ This is the standard high-level way to call `ee-fhl-run'."
"Do the inverse of `custom-unlispify-tag-name'."
(intern (downcase (replace-regexp-in-string " " "-" str))))
+(defun ee-underlinewsp-re (&rest components)
+ "Convert each \"_\" in COMPONENTS into a \"[ \\t\\n]\".
+This is a quick hack that builds a regexp from COMPONENTS.
+Each underline in COMPONENTS is replaced by a regexp that matches
+a single whitespace character, and the results are `concat'-ed."
+ (replace-regexp-in-string "_" "[ \t\n]" (apply 'concat components)))
+
;;; _____ _ _ _ _ _
@@ -479,8 +486,14 @@ This is the standard high-level way to call `ee-fhl-run'."
(defun ee-custom-v-bufferp () (ee-buffer-re ee-custom-v-re))
;; By buffer name (when it is "*Help*")
+;;
+;; (defvar ee-efunctiondescr-re
+;; "^\\([^ \t\n]+\\) is a[^\t\n]*\\(function\\|Lisp macro\\|special form\\)")
(defvar ee-efunctiondescr-re
- "^\\([^ \t\n]+\\) is a[^\t\n]*\\(function\\|Lisp macro\\|special form\\)")
+ (ee-underlinewsp-re
+ "^\\([^ \t\n]+\\)_is_an?"
+ "\\(_autoloaded\\|_interactive\\|_compiled\\|_byte-compiled\\)*"
+ "\\(_Lisp_function\\|_macro\\|_special_form\\)"))
(defun ee-efunctiondescr-bufferp () (ee-buffer-help ee-efunctiondescr-re 1))
(defun ee-find-efunctiondescr-links ()
(let ((f (ee-efunctiondescr-bufferp)))
diff --git a/eev-intro.el b/eev-intro.el
index fb68364b93..2e0f377dd8 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -861,6 +861,7 @@ For more details see:
[Video links:]
(find-eevnavvideo \"10:36\" \"if I type <f8> six times here\")
(find-eevnavvideo \"10:50\" \"a shell running inside Emacs\")
+ (find-eev2021video \"0:14\" \"and if we type f8 several times here\")
(find-eev2019video \"15:11\" \"Demo: the eepitch block (in red star lines)\")
(find-eev2019video \"15:48\" \"Demo: eepitch on non-red star lines\")
(find-eev2019video \"15:56\" \"Demo: eepitch in action\")
