branch: externals/eev
commit 0691a8cabce4a6f7f45fb5b90dcde3e807c73bbd
Author: Eduardo Ochs <eduardoo...@gmail.com>
Commit: Eduardo Ochs <eduardoo...@gmail.com>
Fixed `find-libera-2a' and `find-libera-3a' in rcirc.el.
---
ChangeLog | 15 ++++++++
VERSION | 4 +-
eev-intro.el | 2 +-
eev-mode.el | 111 +++++++++++++++++++++++++++---------------------------
eev-rcirc.el | 25 ++++++++----
eev-testblocks.el | 11 +++---
eev.el | 2 +-
7 files changed, 97 insertions(+), 73 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d835a6a..69cc46b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2021-10-24 Eduardo Ochs <eduardoo...@gmail.com>
+
+ * eev-rcirc.el (find-libera-2a): use `find-rcirc-buffer-2a'.
+ (find-libera-3a): use `find-rcirc-buffer-3a'.
+ (find-freenode-2a): use `find-rcirc-buffer-2a'.
+ (find-freenode-3a): use `find-rcirc-buffer-3a'.
+
+2021-10-23 Eduardo Ochs <eduardoo...@gmail.com>
+
+ * eev-testblocks.el (ee-insert-test-lua-mode): use
+ `current-prefix-arg' to determine the number of "="s in the
+ longcomment.
+
+ * eev-mode.el (eev-mode-help): rewritten.
+
2021-10-22 Eduardo Ochs <eduardoo...@gmail.com>
* eev-elinks.el (find-evariable-links): added links starting with
diff --git a/VERSION b/VERSION
index 1a65115..807ef86 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Sat Oct 23 08:15:32 GMT 2021
-Sat Oct 23 05:15:32 -03 2021
+Sun Oct 24 11:58:56 GMT 2021
+Sun Oct 24 08:58:56 -03 2021
diff --git a/eev-intro.el b/eev-intro.el
index c43a5ac..6c62a1e 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -3782,7 +3782,7 @@ use the \"back\" button.
Eev-mode defines two keys for \"going back\": `M-k', that kills
the current buffer, and `M-K', that just hides it (\"buries\" it
in the bottom of the list of all buffers). Try following the link
-below by <M-e>, then deleting its buffer with `M-k' to go back:
+below with `M-e', then deleting its buffer with `M-k' to go back:
(find-node \"(emacs)Shell\")
diff --git a/eev-mode.el b/eev-mode.el
index e30b601..bfec817 100644
--- a/eev-mode.el
+++ b/eev-mode.el
@@ -1,6 +1,6 @@
;;; eev-mode.el -- a minor mode with keybindings for using eev conveniently.
-*- lexical-binding: nil; -*-
-;; Copyright (C) 2012-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2021 Free Software Foundation, Inc.
;;
;; This file is part of GNU eev.
;;
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 20201002
+;; Version: 20211023
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eev-mode.el>
@@ -204,72 +204,71 @@ and: (find-eval-intro \"`M-k'\")"
;; eev-mode-map keymap, and adds an "eev" to the mode line to remind
;; you this.
;;
-;; At one point, when the `find-*-intro' functions either did not
-;; exist or were almost irrelevant, I decided that I had to write a
-;; huge description of eev-mode... I regret that.
-;;
;; See:
-;; (find-efunctiondescr 'eev-mode)
+;; (find-efunctiondescr 'eev-mode)
;; (find-eminorkeymapdescr 'eev-mode)
-;; (find-ekeymapdescr eev-mode-map)
+;; (find-ekeymapdescr eev-mode-map)
+;; (find-esubstitutecommandkeys eev-mode-help)
;; (find-elnode "Keys in Documentation" "\\<MAPVAR>")
(defvar eev-mode-lighter " eev")
(defvar eev-mode-help "Toggle eev mode, i.e, activate or deactivate the
`eev-mode-map' keymap.
With a prefix argument ARG, turn eev-mode on if positive, else off.
-See: (find-emacs-keys-intro \"1. Basic keys (eev)\")
+Only the main keys of eev are listed below. For better lists, see:
+
+ (find-emacs-keys-intro \"1. Basic keys (eev)\")
+ (find-eev \"eev-mode.el\" \"eev-mode-map-set\")
+ (find-ekeymapdescr eev-mode-map)
\\<eev-mode-map>
Commands to follow hyperlinks:
- \\[ee-eval-sexp-eol] -- go to the end of line, then do \\[ee-eval-last-sexp]
- \\[ee-eval-last-sexp] -- eval the sexp at the left of point
- See: (find-eval-intro)
+ \\[ee-eval-sexp-eol] -- go to the end of line, then do
\\[ee-eval-last-sexp]
+ \\[ee-eval-last-sexp] -- eval the sexp at the left of point
+ See: (find-eev-quick-intro \"2. Evaluating Lisp\")
Commands to return from hyperlinks:
- \\[ee-kill-this-buffer] -- kill this buffer
- \\[bury-buffer] -- put this buffer at the end of the list of all buffers
- See: (find-eval-intro \"\\nGoing back\\n\")
-Other very very important commands:
- \\[eejump] -- jump to the list of eejump targets
- M-5 \\[eejump] -- jump to the tutorial at (find-eev-quick-intro)
- See: (find-eejump-intro)
- \\[eepitch-this-line] -- pitch this line to another Emacs buffer,
- or execute it as lisp if it starts with `'
- See: (find-eepitch-intro)
-Commands to convert the current line into hyperlinks:
- \\[eewrap-find-fline] -- wrap its contents in a `find-fline'
- \\[eewrap-man] -- wrap its contents in a `find-man'
- \\[eewrap-sh] -- wrap its contents in a `find-sh'
- \\[eewrap-eepitch] -- generate an \" (eepitch-{xxx,kill,xxx})\" block
- \\[eewrap-anchor] -- convert to two anchors pointing to one another
- \\[eewrap-code-c-d] -- wrap its contents in a `code-c-d' and a `find-_file'
- \\[eewrap-debian] -- wrap its contents in three Debian hyperlinks
- \\[eewrap-eejump] -- make a `(defun eejump-N ...)' from N and a hyperlink
- \\[eewrap-rm/mkdir/cd] -- make a rm/mkdir/cd triple
- \\[eewrap-pdflike] -- generate links to pdf-like documents
- \\[eewrap-audiovideo] -- generate audio/video hyperlinks
- See: (find-wrap-intro)
+ \\[ee-kill-this-buffer] -- kill this buffer
+ \\[bury-buffer] -- put this buffer at the end of the list of all buffers
+ See: (find-eval-intro \"5. Going back\")
+Jump to predefined places:
+ \\[eejump] -- jump to the list of eejump targets / show basic help
+ M-5 \\[eejump] -- jump to the tutorial at (find-eev-quick-intro)
+ M-2 \\[eejump] -- jump to the tutorial at (find-emacs-keys-intro)
+ M-1 \\[eejump] -- open the file ~/TODO
+ See: (find-eev-quick-intro \"7.2. The list of eejump targets\")
+Control shell-like commands:
+ \\[eepitch-this-line] -- pitch this line to another Emacs buffer,
+ or execute it as lisp if it starts with `'
+ \\[eewrap-eepitch] -- generate an \" (eepitch-{xxx,kill,xxx})\" block
+ \\[eeit] -- create a test block
+ See: (find-eev-quick-intro \"6. Controlling shell-like programs\")
+Commands to convert (\"wrap\") the current line into hyperlinks:
+ \\[eewrap-find-fline] -- wrap its contents in a `find-fline'
+ \\[eewrap-man] -- wrap its contents in a `find-man'
+ \\[eewrap-sh] -- wrap its contents in a `find-sh'
+ \\[eewrap-debian] -- wrap its contents in three Debian hyperlinks
+Commands to convert the current line into other things:
+ \\[eewrap-eejump] -- make a `(defun eejump-N ...)' from N and a
hyperlink
+ \\[eewrap-escript-block] -- convert to an e-script block
+ \\[eewrap-anchor] -- convert to two anchors pointing to one another
+ \\[eewrap-rm/mkdir/cd] -- make a rm/mkdir/cd triple
+ See: (find-wrap-intro)
Commands to generate pages with lists of hyperlinks:
- \\[find-here-links] -- \"hyperlinks to here\", which supersedes all these:
- \\[find-efunction-links] -- hyperlinks to an Emacs function
- \\[find-ekey-links] -- hyperlinks to a key sequence and to the function
- associated to it
- \\[find-evariable-links] -- hyperlinks to an Emacs variable
- \\[find-eface-links] -- hyperlinks to a face (default: face at point)
- \\[find-debpkg-links] -- hyperlinks about a Debian package
- \\[find-ecolor-links] -- hyperlinks to a color
- (find-eev-quick-intro \"4.2. `find-ekey-links' and friends\")
- (find-here-links-intro)
+ \\[find-efunction-links] -- hyperlinks to an Emacs function
+ \\[find-ekey-links] -- hyperlinks to a key sequence
+ \\[find-evariable-links] -- hyperlinks to an Emacs variable
+ \\[find-eface-links] -- hyperlinks to a face (default: face at point)
+ \\[find-debpkg-links] -- hyperlinks about a Debian package
+ \\[find-here-links] -- hyperlinks to here
+ M-3 \\[find-here-links] -- hyperlinks to here for beginners
+ See: (find-eev-quick-intro \"\\n4.2.\" \"find-ekey-links\")
+ (find-here-links-intro \"4.\" \"find-here-links-3\")
Commands to edit hyperlinks:
- \\[ee-duplicate-this-line] -- duplicate this line
- \\[ee-yank-pos-spec] -- yank into pos-spec-list
- \\[ee-shrink-hyperlink-at-eol] -- shrink `find-xxxfile' to `find-xxx'
- \\[eewrap-vldi-list-line] -- transform filename into hyperlink
- See: (find-eval-intro \"Producing and refining hyperlinks\")
-Other commands:
- \\[find-eev-mode-links] -- show this help about eev-mode, or some links
- \\[describe-char] -- lots of info about the character at point
- \\[find-etpat] -- text properties at point
- \\[find-etpat0] -- text properties at point (output in the echo area)")
-
+ \\[ee-duplicate-this-line] -- duplicate this line
+ \\[ee-yank-pos-spec] -- yank into pos-spec-list
+ \\[ee-copy-this-line-to-kill-ring] -- copy this line to the kill ring
+ M-1 \\[ee-copy-this-line-to-kill-ring] -- copy the last anchor to the kill
ring
+ \\[ee-shrink-hyperlink-at-eol] -- shrink `find-xxxfile' to `find-xxx'
+ See: (find-refining-intro \"2. Refining hyperlinks\")
+")
(defun eev-mode-define ()
"Use this to redefine `eev-mode' with another lighter and another docstring."
diff --git a/eev-rcirc.el b/eev-rcirc.el
index 9d47c3e..1432562 100644
--- a/eev-rcirc.el
+++ b/eev-rcirc.el
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 20211021
+;; Version: 20211024
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eev-rcirc.el>
@@ -369,7 +369,10 @@ This is like `find-rcirc-buffer', but uses the variables
This is like `find-rcirc-buffer-2a' but uses
`ee-freenode-ichannels' and `ee-freenode-achannels'."
- (find-2a nil '(find-freenode channel)))
+ (find-rcirc-buffer-2a ee-freenode-server
+ ee-freenode-ichannels
+ ee-freenode-achannels
+ channel))
(defun find-freenode-3a (channel)
"Connect to freenode and create this window setup:
@@ -385,9 +388,10 @@ This is like `find-rcirc-buffer-2a' but uses
This is like `find-rcirc-buffer-3a' but uses
`ee-freenode-ichannels' and `ee-freenode-achannels'."
- (find-3a nil '(find-freenode) '(find-freenode channel)))
-
-
+ (find-rcirc-buffer-3a ee-freenode-server
+ ee-freenode-ichannels
+ ee-freenode-achannels
+ channel))
;; See: (find-efunction 'eepitch)
;; (find-efunction 'eepitch-to-buffer)
@@ -436,7 +440,10 @@ This is like `find-rcirc-buffer', but uses the variables
This is like `find-rcirc-buffer-2a' but uses
`ee-libera-ichannels' and `ee-libera-achannels'."
- (find-2a nil '(find-libera channel)))
+ (find-rcirc-buffer-2a ee-libera-server
+ ee-libera-ichannels
+ ee-libera-achannels
+ channel))
(defun find-libera-3a (channel)
"Connect to libera and create this window setup:
@@ -452,8 +459,10 @@ This is like `find-rcirc-buffer-2a' but uses
This is like `find-rcirc-buffer-3a' but uses
`ee-libera-ichannels' and `ee-libera-achannels'."
- (find-3a nil '(find-libera) '(find-libera channel)))
-
+ (find-rcirc-buffer-3a ee-libera-server
+ ee-libera-ichannels
+ ee-libera-achannels
+ channel))
;; See: (find-efunction 'eepitch)
;; (find-efunction 'eepitch-to-buffer)
diff --git a/eev-testblocks.el b/eev-testblocks.el
index c41415b..c8fbe77 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: 20211021
+;; Version: 20211023
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eev-testblocks.el>
@@ -142,15 +142,16 @@ include(\"%s\")
(defun ee-insert-test-lua-mode ()
(interactive)
- (insert (ee-adjust-red-stars (format "
---[[
+ (let ((equals (make-string (or current-prefix-arg 0) ?=)))
+ (insert (ee-adjust-red-stars (format "
+--[%s[
(eepitch-lua51)
(eepitch-kill)
(eepitch-lua51)
dofile \"%s\"
---]]
-" (buffer-name)))))
+--]%s]
+" equals (buffer-name) equals)))))
(defun ee-insert-test-org-mode ()
(interactive)
diff --git a/eev.el b/eev.el
index 3210750..d2f27ad 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: 20211022
+;; Version: 20211024
;; 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
