branch: externals/eev
commit 2c1dc69a0669bf30937996f5d4aba71b82a2b562
Author: Eduardo Ochs <eduardoo...@gmail.com>
Commit: Eduardo Ochs <eduardoo...@gmail.com>
Added a way to use red bullets instead of red stars in eepitch.
---
ChangeLog | 23 +++++++++++++++++++++
VERSION | 4 ++--
eepitch.el | 9 ++++----
eev-elinks.el | 4 ++--
eev-testblocks.el | 26 ++++++++++++++++++------
eev-tlinks.el | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
eev.el | 2 +-
7 files changed, 113 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index aa53522..cbcb460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2021-09-13 Eduardo Ochs <eduardoo...@gmail.com>
+
+ * eepitch.el (eepitch-regexp, eepitch-comment-regexp): make red
+ bullets play the same role as the red stars.
+
+ * eev-tlinks.el (find-eepitch-bullet-links): new function.
+
+2021-09-10 Eduardo Ochs <eduardoo...@gmail.com>
+
+ * eev-elinks.el (find-epackage-links): fixed a small bug.
+
+2021-09-09 Eduardo Ochs <eduardoo...@gmail.com>
+
+ * eev-testblocks.el (ee-insert-test-scheme-mode): use Chez Scheme
+ instead of Guile. The version for Guile was commented out.
+
+ * eepitch.el (eepitch-scheme): new function.
+
+2021-09-08 Eduardo Ochs <eduardoo...@gmail.com>
+
+ * eev-testblocks.el (ee-insert-test-tcl-mode): use
+ "THIS_IS_A_TEST_BLOCK" instead of "COMMENTED_OUT".
+
2021-09-07 Eduardo Ochs <eduardoo...@gmail.com>
* eev-testblocks.el (ee-insert-test-js-mode): new function.
diff --git a/VERSION b/VERSION
index d555104..2dc4cb4 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Tue Sep 7 23:10:08 GMT 2021
-Tue Sep 7 20:10:08 -03 2021
+Mon Sep 13 18:48:58 GMT 2021
+Mon Sep 13 15:48:58 -03 2021
diff --git a/eepitch.el b/eepitch.el
index ade5194..da75283 100644
--- a/eepitch.el
+++ b/eepitch.el
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 20210821
+;; Version: 20210913
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eepitch.el>
@@ -250,14 +250,14 @@ This function is used by `eepitch-this-line'."
;; «eepitch» (to ".eepitch")
;; See: (find-eepitch-intro "2.3. `(eepitch)'")
;; See this for a way to use red bullets insted of red stars:
-;; https://lists.gnu.org/archive/html/help-gnu-emacs/2021-05/msg01080.html
+;; (find-eepitch-bullet-links)
-(defvar eepitch-regexp "^\\(.*\\)"
+(defvar eepitch-regexp "^[•]\\(.*\\)"
"The regexp used by `eepitch-this-line' to determine what is a red-star line.
Red star lines are evaluated as lisp, normal lines are pitched to
the target buffer.")
-(defvar eepitch-comment-regexp "^\\(.*\\)"
+(defvar eepitch-comment-regexp "^[•][•]\\(.*\\)"
"The regexp used by `eepitch-this-line' to test if a line is a comment.
Comment lines are neither evaluated nor sent to the target buffer.
The test that ignores comment lines is applied before the test that decides
@@ -871,6 +871,7 @@ This function is a prototype and will probably change."
(defun eepitch-gcl () (interactive) (eepitch-comint "gcl" "gcl"))
(defun eepitch-guile () (interactive) (eepitch-comint "guile" "guile"))
(defun eepitch-racket () (interactive) (eepitch-comint "racket" "racket"))
+(defun eepitch-scheme () (interactive) (eepitch-comint "scheme" "scheme"))
(defun eepitch-mitscheme () (interactive)
(eepitch-comint "mit-scheme" "mit-scheme"))
(defun eepitch-tinyscheme () (interactive)
diff --git a/eev-elinks.el b/eev-elinks.el
index ea9c3b2..d2e1863 100644
--- a/eev-elinks.el
+++ b/eev-elinks.el
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 20210226
+;; Version: 20210910
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eev-elinks.el>
@@ -1174,7 +1174,7 @@ This needs a temporary directory; see:
(find-prepared-intro)"
PKG must be a symbol; C and D are arguments for `code-c-d'.
If D is t then try to use `ee-package-dir' to get the directory."
(interactive (list (symbol-at-point)))
- (setq pkg (or pkg "{pkg}"))
+ (setq pkg (or pkg '{pkg}))
(setq c (or c (replace-regexp-in-string "[-]" "" (symbol-name pkg))))
(setq d (cond ((eq d t) (ee-package-dir pkg))
((eq d nil) "{d}")
diff --git a/eev-testblocks.el b/eev-testblocks.el
index e123645..0c9926e 100644
--- a/eev-testblocks.el
+++ b/eev-testblocks.el
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 20210907
+;; Version: 20210909
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eev-testblocks.el>
@@ -161,18 +161,32 @@ load \"%s\"
=end
" (buffer-name))))
+;; For Chez Scheme.
(defun ee-insert-test-scheme-mode ()
(interactive)
(insert (format "
-#!
- (eepitch-guile)
+#|
+ (eepitch-scheme)
(eepitch-kill)
- (eepitch-guile)
+ (eepitch-scheme)
(load \"%s\")
-!#
+|#
" (buffer-name))))
+;; ;; For Guile.
+;; (defun ee-insert-test-scheme-mode ()
+;; (interactive)
+;; (insert (format "
+;; #|
+;; (eepitch-guile)
+;; (eepitch-kill)
+;; (eepitch-guile)
+;; (load \"%s\")
+;;
+;; |#
+;; " (buffer-name))))
+
(defun ee-insert-test-sh-mode ()
(interactive)
(insert (format "
@@ -188,7 +202,7 @@ load \"%s\"
(defun ee-insert-test-tcl-mode ()
(interactive)
(insert (format "
-set COMMENTED_OUT {
+set THIS_IS_A_TEST_BLOCK {
(eepitch-tclsh)
(eepitch-kill)
(eepitch-tclsh)
diff --git a/eev-tlinks.el b/eev-tlinks.el
index 3538be1..11a17f4 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 20210822
+;; Version: 20210913
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eev-tlinks.el>
@@ -89,6 +89,7 @@
;; «.find-newbrowser-links» (to "find-newbrowser-links")
;; «.ee-0x0-upload-region» (to "ee-0x0-upload-region")
;; «.find-0x0-links» (to "find-0x0-links")
+;; «.find-eepitch-bullet-links» (to "find-eepitch-bullet-links")
(require 'eev-env)
@@ -2399,6 +2400,64 @@ This function is used by `ee-0x0-upload-region'."
+;; «find-eepitch-bullet-links» (to ".find-eepitch-bullet-links")
+;; Skel: (find-find-links-links-new "eepitch-bullet" "" "")
+;; Test: (find-eepitch-bullet-links)
+;;
+(defun find-eepitch-bullet-links (&rest pos-spec-list)
+"Show code that makes eepitch use red bullets instead of red stars."
+ (interactive)
+ (apply
+ 'find-elinks-elisp
+ `((find-eepitch-bullet-links ,@pos-spec-list)
+ ;; Convention: the first sexp always regenerates the buffer.
+ (find-efunction 'find-eepitch-bullet-links)
+ ;; ""
+ ,(ee-template0 "\
+;; The code below was based on:
+;; https://lists.gnu.org/archive/html/help-gnu-emacs/2021-05/msg01080.html
+;; https://lists.gnu.org/archive/html/help-gnu-emacs/2021-05/msg01079.html
+
+
+
+;; Run this to make the bullets use the default face:
+\(eepitch-set-glyph0 ?• nil)
+;;
+;; Run this to make the bullets appear in the same face as the red stars:
+\(eepitch-set-glyph0 ?• ?• 'eepitch-star-face)
+;;
+;; You'll need to force a redisplay to see the change.
+;; One way to do that is with `C-l' (`recenter-top-bottom').
+
+
+
+;; This is the standard definition of `eewrap-eepitch'. See:
+;; (find-eev \"eepitch.el\" \"eewrap-eepitch\" \"defun eewrap-eepitch\")
+;; (find-eev-quick-intro \"6.4. Red stars\")
+;;
+\(defun eewrap-eepitch () (interactive)
+ (let* ((fmt \" (eepitch-%s)\\n (eepitch-kill)\\n (eepitch-%s)\")
+ (li (ee-this-line-extract))
+ (newli (format fmt li li)))
+ (insert newli))
+ (ee-next-line 1))
+
+;; This is an alternative definition of `eewrap-eepitch' that uses
+;; bullets instead of red stars. Run the defun below to override the
+;; standard definition.
+;;
+\(defun eewrap-eepitch () (interactive)
+ (let* ((fmt \"• (eepitch-%s)\\n• (eepitch-kill)\\n• (eepitch-%s)\")
+ (li (ee-this-line-extract))
+ (newli (format fmt li li)))
+ (insert newli))
+ (ee-next-line 1))
+")
+ )
+ pos-spec-list))
+
+
+
(provide 'eev-tlinks)
diff --git a/eev.el b/eev.el
index 7a91629..9aa05f7 100644
--- a/eev.el
+++ b/eev.el
@@ -6,7 +6,7 @@
;; Package-Requires: ((emacs "24.4"))
;; Keywords: lisp e-scripts
;; URL: http://angg.twu.net/#eev
-;; Version: 20210822
+;; Version: 20210913
;; 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
