branch: externals/eev
commit 1cdfd41fbc320205f1ad820bdb60dcdec7b2cb51
Author: Eduardo Ochs <eduardoo...@gmail.com>
Commit: Eduardo Ochs <eduardoo...@gmail.com>
Small fixes.
---
ChangeLog | 5 +++++
VERSION | 4 ++--
eev-hydras.el | 8 ++++----
eev-intro.el | 22 +++++++++++++++++++++-
eev-kla.el | 12 ++++++------
5 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 50194c617b..e136cfae5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-11-21 Eduardo Ochs <eduardoo...@gmail.com>
+
+ * eev-kla.el (ee-kl-sexp-kla, ee-kl-sexp-klas, ee-kl-sexp-klf):
+ fixed the missing ":fname" arguments.
+
2022-11-20 Eduardo Ochs <eduardoo...@gmail.com>
* eev-hydras.el (eev-index-edit): renamed to `ee-edit-index'.
diff --git a/VERSION b/VERSION
index 0cb121e4cd..9a6bb527f8 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Sun Nov 20 18:26:26 GMT 2022
-Sun Nov 20 15:26:26 -03 2022
+Mon Nov 21 05:36:44 GMT 2022
+Mon Nov 21 02:36:44 -03 2022
diff --git a/eev-hydras.el b/eev-hydras.el
index 479d018ad6..ff33385d6e 100644
--- a/eev-hydras.el
+++ b/eev-hydras.el
@@ -128,8 +128,10 @@ Use `_,_'s and `_._'s between the `_i_' and the `_0_' to
adjust the `(to ...)'.\
("q" nil)
;;
;; Reindent:
- ("," (ee-edit-index-replace "\t(to " "(to "))
- ("." (ee-edit-index-replace "(to " "\t(to "))
+ ("<down>" (eek "<down>"))
+ ("<up>" (eek "<up>"))
+ ("," (ee-edit-index-replace "\t(to " "(to "))
+ ("." (ee-edit-index-replace "(to " "\t(to "))
;;
;; Next anchor and previous anchor:
("n" (re-search-forward (ee-tag-re)))
@@ -137,8 +139,6 @@ Use `_,_'s and `_._'s between the `_i_' and the `_0_' to
adjust the `(to ...)'.\
("j" (re-search-forward (ee-tag-re)))
;;
;; Other keys:
- ("<down>" (eek "<down>"))
- ("<up>" (eek "<up>"))
("<" (eek "M-<"))
("M-<" (eek "M-<"))
("1" (eek "C-x 1"))
diff --git a/eev-intro.el b/eev-intro.el
index ae13e173b3..761e43cd5a 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -1470,6 +1470,11 @@ beginning of the file, as explained here:
(find-escripts-intro)
+Another way of moving the index line to the index section is
+described here:
+
+ (find-edit-index-intro)
+
@@ -3722,7 +3727,8 @@ This was split from:
Pre-requisites:
(find-here-links-intro)
(find-refining-intro)
-
+See also:
+ (find-kla-intro)
@@ -14829,6 +14835,20 @@ The keyword arguments for `cl-defun' are explained
here:
(find-clnode \"Argument Lists\" \"&key ((KEYWORD VAR) INITFORM SVAR)\")
(find-clnode \"Argument Lists\" \"&key c d (e 17)\")
+Some functions in eev-kla.el use a trick to make nil arguments be
+ignored. For example, try:
+
+ ;; «aaa»
+ (ee-kl-sexp-klt)
+ (ee-kl-sexp-klt :anchor nil)
+ (ee-kl-sexp-klt :anchor \"bbb\")
+
+The source code for `ee-kl-sexp-klt' is here:
+
+ (find-eev \"eev-kla.el\" \"generate-sexps\")
+ (find-eev \"eev-kla.el\" \"generate-sexps\" \"ee-kl-sexp-klt\")
+
+
7. The default `c', `d', and `r'
diff --git a/eev-kla.el b/eev-kla.el
index dcd7c27ba1..d17da91c7d 100644
--- a/eev-kla.el
+++ b/eev-kla.el
@@ -447,8 +447,8 @@ If (ee-kl-lrcds FNAME) doesn't return any matching `lrcd's,
return nil."
(cl-defun ee-kl-sexp-kla (&key fname c r anchor)
"<K>ill <l>ink to <a>nchor - make sexp."
(setq fname (or fname (ee-kl-fname))
- c (or c (ee-kl-c))
- r (or r (ee-kl-r))
+ c (or c (ee-kl-c :fname fname))
+ r (or r (ee-kl-r :fname fname))
anchor (or anchor (ee-kl-anchor)))
(list (ee-kl-find-c :fname fname :c c)
(ee-kl-shorterfname :fname fname :c c :r r)
@@ -457,8 +457,8 @@ If (ee-kl-lrcds FNAME) doesn't return any matching `lrcd's,
return nil."
(cl-defun ee-kl-sexp-klas (&key fname c r anchor region)
"<K>ill <l>ink to <a>nchor and <s>tring - make sexp."
(setq fname (or fname (ee-kl-fname))
- c (or c (ee-kl-c))
- r (or r (ee-kl-r))
+ c (or c (ee-kl-c :fname fname))
+ r (or r (ee-kl-r :fname fname))
anchor (or anchor (ee-kl-anchor))
region (or region (ee-kl-region)))
(list (ee-kl-find-c :fname fname :c c)
@@ -469,8 +469,8 @@ If (ee-kl-lrcds FNAME) doesn't return any matching `lrcd's,
return nil."
(cl-defun ee-kl-sexp-klf (&key fname c r)
"<K>ill <l>ink to <f>ile - make sexp."
(setq fname (or fname (ee-kl-fname))
- c (or c (ee-kl-c))
- r (or r (ee-kl-r)))
+ c (or c (ee-kl-c :fname fname))
+ r (or r (ee-kl-r :fname fname)))
(list (ee-kl-find-cfile :fname fname :c c)
(ee-kl-shortfname :fname fname :c c :r r)))
