[nongnu] elpa/scroll-on-jump b1fd97c62d 1/2: Release 0.2, add changelog
branch: elpa/scroll-on-jump commit b1fd97c62dfc3b4430f3a42f1f504fc231487c91 Author: Campbell Barton Commit: Campbell Barton Release 0.2, add changelog --- changelog.rst | 23 +++ scroll-on-jump.el | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/changelog.rst b/changelog.rst new file mode 100644 index 00..b336034ab1 --- /dev/null +++ b/changelog.rst @@ -0,0 +1,23 @@ + +## +Change Log +## + +- Version 0.2 (2023-01-22) + + - Add ``scroll-on-jump-mode-line-format`` to support overriding the mode-line while scrolling. + - Workaround bug in evil visual line mode. + - Fix error counting lines jumping to a point outside buffer range. + - Fix error detecting scroll changes. + - Fix smooth (pixel) scrolling not being used in most cases. + - Fix error passing out-of-range point to count-screen-lines. + - Fix visual glitch when used with next/previous line. + - Fix #1: Support wrapping functions that themselves scroll. + - Fix error where the pixel scroll was left a non-zero value. + - Fix recursive calls to animate scrolling. + - Fix the case when the windows buffer is not the current-buffer. + - Fix scrolling down when the point is at the beginning of the buffer. + +- Version 0.1 (2020-12-07) + + Initial release. diff --git a/scroll-on-jump.el b/scroll-on-jump.el index baf19d0f8c..321538c6fe 100644 --- a/scroll-on-jump.el +++ b/scroll-on-jump.el @@ -6,7 +6,7 @@ ;; Author: Campbell Barton ;; URL: https://codeberg.com/ideasman42/emacs-scroll-on-jump -;; Version: 0.1 +;; Version: 0.2 ;; Package-Requires: ((emacs "26.2")) ;;; Commentary:
[nongnu] elpa/scroll-on-jump updated (18e524a367 -> 54b48665fc)
elpasync pushed a change to branch elpa/scroll-on-jump. from 18e524a367 Add scroll-on-jump-mode-line-format to optionally override the mode-line new b1fd97c62d Release 0.2, add changelog new 54b48665fc Cleanup: use prog1 to forward the return when mode-line-format is used Summary of changes: changelog.rst | 23 +++ scroll-on-jump.el | 9 + 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 changelog.rst
[nongnu] elpa/scroll-on-jump 54b48665fc 2/2: Cleanup: use prog1 to forward the return when mode-line-format is used
branch: elpa/scroll-on-jump commit 54b48665fcdffaba028de2f7713914f08ee2f0ba Author: Campbell Barton Commit: Campbell Barton Cleanup: use prog1 to forward the return when mode-line-format is used The return value isn't used currently but it's better practice to return it. --- scroll-on-jump.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scroll-on-jump.el b/scroll-on-jump.el index 321538c6fe..0bc11ebbdf 100644 --- a/scroll-on-jump.el +++ b/scroll-on-jump.el @@ -352,10 +352,11 @@ Moving the point when ALSO-MOVE-POINT is set." ;; No animation. ((zerop scroll-on-jump-duration) (scroll-on-jump--immediate-scroll window lines-scroll dir)) + ;; Animated scroll. (scroll-on-jump-mode-line-format -(let ((mode-line-format scroll-on-jump-mode-line-format)) - (scroll-on-jump--scroll-animated window lines-scroll dir also-move-point)) -(force-mode-line-update)) +(prog1 (let ((mode-line-format scroll-on-jump-mode-line-format)) + (scroll-on-jump--scroll-animated window lines-scroll dir also-move-point)) + (force-mode-line-update))) (t (scroll-on-jump--scroll-animated window lines-scroll dir also-move-point
[elpa] externals/compat 24202de98e: Update version numbers
branch: externals/compat
commit 24202de98e2178b6e5fe3b74b8f75f4491e174c5
Author: Daniel Mendler
Commit: Daniel Mendler
Update version numbers
---
compat.texi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/compat.texi b/compat.texi
index 25da519b2f..b30c234ecf 100644
--- a/compat.texi
+++ b/compat.texi
@@ -31,7 +31,7 @@ modify this GNU manual.”
@finalout
@titlepage
@title "Compat" Manual
-@subtitle For version 29.1.2.0
+@subtitle For version 29.1.3.0
@author Philip Kaludercic, Daniel Mendler
@page
@vskip 0pt plus 1filll
@@ -46,7 +46,7 @@ modify this GNU manual.”
This manual documents the usage of the "Compat" Emacs lisp library,
the forward-compatibility library for Emacs Lisp, corresponding to
-version 29.1.2.0.
+version 29.1.3.0.
@insertcopying
@end ifnottex
@@ -107,7 +107,7 @@ The intended use-case for this library is for package
developers to
add as a dependency in the header:
@example
-;; Package-Requires: ((emacs "24.4") (compat "29.1.2.0"))
+;; Package-Requires: ((emacs "24.4") (compat "29.1.3.0"))
@end example
There is no need to depend on @code{emacs} 24.4 specifically. One can
[nongnu] elpa/scroll-on-drag updated (8cab41b40b -> cb3da00368)
elpasync pushed a change to branch elpa/scroll-on-drag. from 8cab41b40b Cleanup: reformat with updated elisp-autofmt new 9836df8c62 Add scroll-on-drag-mode-line-format to optionally override the mode-line new cb3da00368 readme: note default for all settings Summary of changes: readme.rst| 6 +- scroll-on-drag.el | 22 -- 2 files changed, 25 insertions(+), 3 deletions(-)
[nongnu] elpa/scroll-on-drag 9836df8c62 1/2: Add scroll-on-drag-mode-line-format to optionally override the mode-line
branch: elpa/scroll-on-drag commit 9836df8c628d2b496ca62cf37d3a029af819bc11 Author: Campbell Barton Commit: Campbell Barton Add scroll-on-drag-mode-line-format to optionally override the mode-line This can be used to prevent complex mode-lines interfering with scrolling performance. --- readme.rst| 4 scroll-on-drag.el | 22 -- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/readme.rst b/readme.rst index 070b5d98c4..5b9f0bfe34 100644 --- a/readme.rst +++ b/readme.rst @@ -93,3 +93,7 @@ While the defaults seem to work well, these values can be customized. ``scroll-on-drag-follow-mouse`` When non-nil, scroll the window under the mouse cursor (even when it's not active) returning focus on completion. +``scroll-on-drag-mode-line-format``: nil + When non-nil, use this value for the ``mode-line-format`` while scrolling. + This can be used to temporarily override the mode-line while scrolling. + It can also help to avoid overly complex mode-lines from slowing down scrolling. diff --git a/scroll-on-drag.el b/scroll-on-drag.el index 2df1bfca61..19e466921e 100644 --- a/scroll-on-drag.el +++ b/scroll-on-drag.el @@ -72,6 +72,13 @@ "Scroll the window under the mouse cursor (instead of the current active window)." :type 'boolean) +(defcustom scroll-on-drag-mode-line-format nil + "The `mode-line-format' to use or nil to leave the `mode-line-format' unchanged. + +This can be useful to use a simplified or event disabling the mode-line +while scrolling, as a complex mode-line can interfere with smooth scrolling." + :type '(choice (const nil) string)) + (defcustom scroll-on-drag-pre-hook nil "List of functions to be called when `scroll-on-drag' starts." :type 'hook) @@ -476,14 +483,25 @@ This requires a separate code path to run pre/post logic." (t (scroll-on-drag--impl) +(defun scroll-on-drag--impl-with-mode-line-format () + "Call `mode-line-format' with mode-line override." + + (cond + (scroll-on-drag-mode-line-format +(prog1 (let ((mode-line-format scroll-on-drag-mode-line-format)) + (scroll-on-drag--impl-with-evil-mode-workaround)) + (force-mode-line-update))) + (t +(scroll-on-drag--impl-with-evil-mode-workaround + (defun scroll-on-drag--impl-with-window (scroll-win) "Scroll on drag function that takes an optional SCROLL-WIN." (cond (scroll-win (with-selected-window scroll-win - (scroll-on-drag--impl-with-evil-mode-workaround))) + (scroll-on-drag--impl-with-mode-line-format))) (t -(scroll-on-drag--impl-with-evil-mode-workaround +(scroll-on-drag--impl-with-mode-line-format (defun scroll-on-drag (&optional event) "Main scroll on drag function.
[nongnu] elpa/sweeprolog 6ca714f3c8 4/4: don't use file-name-split for compatibility with older Emacsen
branch: elpa/sweeprolog
commit 6ca714f3c8a8379dd896c255b3e12bbc2d7024cd
Author: Eshel Yaron
Commit: Eshel Yaron
don't use file-name-split for compatibility with older Emacsen
---
sweeprolog.el | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sweeprolog.el b/sweeprolog.el
index c05cd7822f..38fe0e024c 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -861,12 +861,7 @@ PROJECT (only on Emacs 28 or later)."
(when (fboundp 'project-known-project-roots)
(car (seq-filter
(lambda (root)
-(member (car
- (reverse
- (seq-filter
- (lambda (s)
- (not (string-empty-p s)))
- (file-name-split root
+(member (file-name-base (directory-file-name root))
'("swipl" "swipl-devel")))
(project-known-project-roots)))
[nongnu] elpa/scroll-on-drag cb3da00368 2/2: readme: note default for all settings
branch: elpa/scroll-on-drag commit cb3da00368079fffd0ff15c64476a092ee4825bb Author: Campbell Barton Commit: Campbell Barton readme: note default for all settings --- readme.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.rst b/readme.rst index 5b9f0bfe34..9bf89c680b 100644 --- a/readme.rst +++ b/readme.rst @@ -90,7 +90,7 @@ While the defaults seem to work well, these values can be customized. Values greater than 0.0 apply non-linear scaling, this gives control when scrolling individual lines while allowing much greater speed without having to move the mouse a long distance. -``scroll-on-drag-follow-mouse`` +``scroll-on-drag-follow-mouse``: t When non-nil, scroll the window under the mouse cursor (even when it's not active) returning focus on completion. ``scroll-on-drag-mode-line-format``: nil
[nongnu] elpa/sweeprolog 4725667302 3/4: * sweeprolog.el: capitalize "Sweep" in major mode names
branch: elpa/sweeprolog
commit 47256673029733ac2baffc921c7c145dbde28d0f
Author: Eshel Yaron
Commit: Eshel Yaron
* sweeprolog.el: capitalize "Sweep" in major mode names
---
sweeprolog.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sweeprolog.el b/sweeprolog.el
index 7b1d08da3c..c05cd7822f 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -2869,7 +2869,7 @@ GOAL. Otherwise, GOAL is set to a default value
specified by
(sweeprolog-signal-thread sweeprolog-top-level-thread-id goal))
;;;###autoload
-(define-derived-mode sweeprolog-top-level-mode comint-mode "sweep Top-level"
+(define-derived-mode sweeprolog-top-level-mode comint-mode "Sweep Top-level"
"Major mode for interacting with an inferior Prolog interpreter."
:group 'sweeprolog-top-level
(setq-local comint-prompt-regexp (rx line-start "?- ")
@@ -4196,7 +4196,7 @@ certain contexts to maintain conventional Prolog layout."
sweeprolog--buffer-modified t))
;;;###autoload
-(define-derived-mode sweeprolog-mode prog-mode "sweep"
+(define-derived-mode sweeprolog-mode prog-mode "Sweep"
"Major mode for reading and editing Prolog code."
:group 'sweeprolog
(setq-local comment-start "%")
@@ -4587,7 +4587,7 @@ accordingly."
(user-error "No top-level menu entry here")))
(define-derived-mode sweeprolog-top-level-menu-mode
- tabulated-list-mode "sweep Top-level Menu"
+ tabulated-list-mode "Sweep Top-level Menu"
"Major mode for browsing a list of active `sweep' top-levels."
(setq tabulated-list-format [("Buffer" 32 t)
("Status" 32 t)
[nongnu] elpa/sweeprolog 8443e4199f 1/4: FIXED: possible race condition when signaling new top-level threads
branch: elpa/sweeprolog commit 8443e4199f8bf77835e0604dc26916851207f838 Author: Eshel Yaron Commit: Eshel Yaron FIXED: possible race condition when signaling new top-level threads --- sweeprolog.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sweeprolog.el b/sweeprolog.el index c434096507..33aa182852 100644 --- a/sweeprolog.el +++ b/sweeprolog.el @@ -2848,9 +2848,8 @@ appropriate buffer." (and (derived-mode-p 'sweeprolog-top-level-mode) sweeprolog-top-level-thread-id) (read-string "Signal goal: ?- "))) - (sweeprolog-signal-thread (buffer-local-value 'sweeprolog-top-level-thread-id -(get-buffer buffer)) -goal)) + (with-current-buffer (get-buffer buffer) +(sweeprolog-top-level-signal-current goal))) (defun sweeprolog-top-level-signal-current (goal) "Signal the current top-level thread to run GOAL. @@ -2862,6 +2861,8 @@ GOAL. Otherwise, GOAL is set to a default value specified by (read-string "Signal goal: ?- " nil 'sweeprolog-top-level-signal-goal-history) sweeprolog-top-level-signal-default-goal))) + (unless sweeprolog-top-level-thread-id +(sweeprolog-top-level--populate-thread-id)) (sweeprolog-signal-thread sweeprolog-top-level-thread-id goal)) ;;;###autoload
[nongnu] elpa/sweeprolog updated (835e44d226 -> 6ca714f3c8)
elpasync pushed a change to branch elpa/sweeprolog. from 835e44d226 Announce recent changes in NEWS.org and bump version to 0.13.0 new 8443e4199f FIXED: possible race condition when signaling new top-level threads new a9d0eb222f ADDED: command to pipe output of Prolog goals to Emacs buffers new 4725667302 * sweeprolog.el: capitalize "Sweep" in major mode names new 6ca714f3c8 don't use file-name-split for compatibility with older Emacsen Summary of changes: README.org| 40 sweep.c | 32 sweep.pl | 32 +++- sweeprolog.el | 117 -- 4 files changed, 208 insertions(+), 13 deletions(-)
[nongnu] elpa/sweeprolog a9d0eb222f 2/4: ADDED: command to pipe output of Prolog goals to Emacs buffers
branch: elpa/sweeprolog
commit a9d0eb222f6efc128d1280db0669820d061b5149
Author: Eshel Yaron
Commit: Eshel Yaron
ADDED: command to pipe output of Prolog goals to Emacs buffers
* sweep.c (sweep_open_channel(), sweep_fd_open()): new helper
functions for obtaining Prolog streams from Emacs pipe buffers.
* sweep.pl (sweep_async_goal/2, sweep_interrupt_async_goal/2): new
predicates.
* sweeprolog.el (sweeprolog-async-goal): new command, executes a goal
in a separate thread and redirects its output to a buffer with mode..
(sweeprolog-async-goal-output-mode): new major mode, derived from
Compilation mode.
(sweeprolog-mode-map, sweeprolog-prefix-map, sweeprolog-menu): bind
sweeprolog-async-goal.
* README.org (Executing Prolog Asynchronously): new manual section.
---
README.org| 40
sweep.c | 32
sweep.pl | 32 +++-
sweeprolog.el | 97 +++
4 files changed, 200 insertions(+), 1 deletion(-)
diff --git a/README.org b/README.org
index 8713530ec9..a93aa3001d 100644
--- a/README.org
+++ b/README.org
@@ -1844,6 +1844,45 @@ In ~sweeprolog-mode~ buffers, you can invoke
goal at point (if any) as the "future history" for the goal prompt,
which you can access with ~M-n~ in the minibuffer.
+* Executing Prolog Asynchronously
+:PROPERTIES:
+:CUSTOM_ID: async-query
+:DESCRIPTION: Running goals in seperate threads, redirecting their output to
Emacs buffers
+:ALT_TITLE: Async Queries
+:END:
+
+#+CINDEX: async queries
+#+CINDEX: query asynchronously
+#+CINDEX: Sweep Async Output mode
+Sweep provides a facility for executing Prolog goals in separate
+threads and capturing their output in Emacs buffers as it is produced.
+You can use this for running queries without blocking Emacs.
+
+- Key: C-c C-& (sweeprolog-async-goal) :: Execute a Prolog goal
+ asynchronously and display its output in a dedicated buffer.
+
+The command ~M-x sweeprolog-async-goal~, bound to ~C-c C-&~ in
+~sweeprolog-mode~ buffers, prompts for a Prolog goal and executes it in
+a new Prolog thread, redirecting its output and error streams to an
+Emacs buffer that gets updated asynchronously.
+
+This is similar in nature to running asynchronous shell commands with
+the standard ~M-&~ (~async-shell-command~) or ~M-x compile~, expect that
+~sweeprolog-async-goal~ runs a Prolog goal instead of a shell command.
+For more information about these commands see [[info:emacs#Single
Shell][Single Shell]] and
+[[info:emacs#Compilation][Compilation]] in the Emacs manual.
+
+The output buffer that ~sweeprolog-async-goal~ creates uses a dedicated
+mode called /Sweep Async Output mode/. This mode is derived from the
+standard Compilation mode, it provides all of the usual commands
+documented in [[info:emacs#Compilation Mode][Compilation Mode]]. Notably, you
can run the same query
+again by typing ~g~ (~sweeprolog-async-goal-restart~) in the output
+buffer. To interrupt the goal running in the current output buffer,
+press ~C-c C-k~ (~kill-compilation~).
+
+_Compatibility note_: asynchronous queries use pipe processes that
+require Emacs 28 or later and SWI-Prolog 9.1.4 or later.
+
* Finding Prolog code
:PROPERTIES:
:CUSTOM_ID: finding-prolog-code
@@ -1957,6 +1996,7 @@ The full list of keybindings in ~sweeprolog-prefix-map~
is given below:
| ~p~ | ~sweeprolog-find-predicate~| [[*Finding Prolog
code][Finding Prolog Code]] |
| ~q~ | ~sweeprolog-top-level-send-goal~ |
[[#top-level-send-goal][Sending Goals to the Top-level]]|
| ~t~ | ~sweeprolog-top-level~ | [[#prolog-top-level][The
Prolog Top-level]] |
+| ~&~ | ~sweeprolog-async-goal~| [[#async-query][Executing
Prolog Asynchronously]] |
* Examining Prolog messages
:PROPERTIES:
diff --git a/sweep.c b/sweep.c
index d83396bcd5..decb8208f7 100644
--- a/sweep.c
+++ b/sweep.c
@@ -387,6 +387,17 @@ sweep_cut_query(emacs_env *env, ptrdiff_t nargs,
emacs_value *args, void *data)
}
}
+#if defined EMACS_MAJOR_VERSION && EMACS_MAJOR_VERSION >= 28
+emacs_value
+sweep_open_channel(emacs_env *env, ptrdiff_t nargs, emacs_value *args, void
*data)
+{
+ if (nargs == 1) {
+return env->make_integer(env, env->open_channel(env, args[0]));
+ }
+ return enil(env);
+}
+#endif
+
emacs_value
sweep_next_solution(emacs_env *env, ptrdiff_t nargs, emacs_value *args, void
*data)
{
@@ -474,6 +485,19 @@ sweep_open_query(emacs_env *env, ptrdiff_t nargs,
emacs_value *args, void *data)
return r;
}
+static foreign_t
+sweep_fd_open(term_t f, term_t o) {
+ IOSTREAM *w;
+ int fd = -1;
+
+ if (PL_get_integer(f, &fd) &&
+ (w = Sfdopen(fd, "w")) &&
+ PL_unify_stream(o, w))
+return TRUE;
+
+ return FALSE;
+}
+
static foreign_t
sweep_funcall0(term_t f, term_t v) {
char * string = NULL;
@@ -552,6 +576,7 @@ sweep_initialize(emacs_env *e
[elpa] externals/bluetooth c719b1ebf8: use ash instead of lsh
branch: externals/bluetooth commit c719b1ebf80a21ba6618ba15fefac5c5886e4e55 Author: Alex McGrath Commit: Alex McGrath use ash instead of lsh --- bluetooth.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bluetooth.el b/bluetooth.el index 5fbc8dd790..ec73e566b2 100644 --- a/bluetooth.el +++ b/bluetooth.el @@ -1569,7 +1569,7 @@ form by a call to ‘bluetooth-device-properties’." "Parse the CLASS property of a Bluetooth device." (cl-labels ((parse (field-def acc) (let-alist field-def - (let* ((m-field (lsh (logand class .mask) .shift)) + (let* ((m-field (ash (logand class .mask) .shift)) (res (cons .name (list (funcall .fn m-field .data (n-acc (cons res acc))) @@ -1586,7 +1586,7 @@ form by a call to ‘bluetooth-device-properties’." (defun bluetooth--class-parse-bitfield (bitfield data) "Parse BITFIELD using DATA as specification." (or (delq nil (mapcar (lambda (x) - (if (/= 0 (logand bitfield (lsh 1 (cl-first x + (if (/= 0 (logand bitfield (ash 1 (cl-first x (cl-rest x) nil)) data))
[elpa] externals/eev 1837f5a3ab: Added support for Raku.
branch: externals/eev commit 1837f5a3ab8ae518a3fadd8a928926e79aadbd2a Author: Eduardo Ochs Commit: Eduardo Ochs Added support for Raku. --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 944aa30aef..cbdf7e093b 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -Sun Jan 22 04:28:41 GMT 2023 -Sun Jan 22 01:28:41 -03 2023 +Sun Jan 22 10:22:58 GMT 2023 +Sun Jan 22 07:22:58 -03 2023
[elpa] externals/org b34bdc8719: org-capture-finalize: Do not save new file with :no-save aborted capture
branch: externals/org
commit b34bdc871950f9780615ab4c64f149a0f5983d22
Author: Ihor Radchenko
Commit: Ihor Radchenko
org-capture-finalize: Do not save new file with :no-save aborted capture
* lisp/org-capture.el (org-capture-finalize): Do not save the newly
created file buffer when the capture is aborted and org-capture is not
asked to save upon capture.
* testing/lisp/test-org-capture.el (test-org-capture/abort): Add test.
---
lisp/org-capture.el | 14 ++
testing/lisp/test-org-capture.el | 12
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index a696c615b2..b96e9f3363 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -889,10 +889,16 @@ captured item after finalizing."
(goto-char (+ size pos))
(goto-char (if (< ipt pos) (+ size pos) pos))
- ;; Kill the target buffer if that is desired
- (when (and base-buffer new-buffer kill-buffer)
- (with-current-buffer base-buffer (save-buffer))
- (kill-buffer base-buffer))
+ (if (and base-buffer org-note-abort new-buffer)
+ ;; Unconditionally kill the new buffer when capture is
+ ;; aborted.
+ (with-current-buffer base-buffer
+(set-buffer-modified-p nil)
+(kill-buffer))
+;; Kill the target buffer if that is desired
+(when (and base-buffer new-buffer kill-buffer)
+ (with-current-buffer base-buffer (save-buffer))
+ (kill-buffer base-buffer)))
;; Restore the window configuration before capture
(set-window-configuration return-wconf))
diff --git a/testing/lisp/test-org-capture.el b/testing/lisp/test-org-capture.el
index 44702c3ced..0ed44c6af0 100644
--- a/testing/lisp/test-org-capture.el
+++ b/testing/lisp/test-org-capture.el
@@ -152,6 +152,18 @@
(ert-deftest test-org-capture/abort ()
"Test aborting a capture process."
+ ;; Newly create capture buffer should not be saved.
+ (let ((capture-file (make-temp-name
+ (org-file-name-concat
+temporary-file-directory
+"org-test"
+(unwind-protect
+(let ((org-capture-templates `(("t" "Todo" entry (file ,capture-file)
nil :no-save t
+ (org-capture nil "t")
+ (org-capture-kill)
+ (should-not (file-exists-p capture-file)))
+ (when (file-exists-p capture-file)
+(delete-file capture-file
;; Test that capture can be aborted after inserting at end of
;; capture buffer.
(should
[elpa] externals/cape f1b359eb81: Bump compat dependency
branch: externals/cape commit f1b359eb81d9ac6756c20d09167b08bfe13807c9 Author: Daniel Mendler Commit: Daniel Mendler Bump compat dependency --- cape.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cape.el b/cape.el index 187e6c6530..c2aabb5be2 100644 --- a/cape.el +++ b/cape.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2021 ;; Version: 0.12 -;; Package-Requires: ((emacs "27.1") (compat "29.1.1.0")) +;; Package-Requires: ((emacs "27.1") (compat "29.1.3.0")) ;; Homepage: https://github.com/minad/cape ;; This file is part of GNU Emacs.
[elpa] externals/consult 234b131a69: Bump compat dependency
branch: externals/consult commit 234b131a699f51350e26b41af5a42ade8e6ff1f6 Author: Daniel Mendler Commit: Daniel Mendler Bump compat dependency --- consult.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consult.el b/consult.el index ce5dc640b0..adb8eaec37 100644 --- a/consult.el +++ b/consult.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2020 ;; Version: 0.31 -;; Package-Requires: ((emacs "27.1") (compat "29.1.1.1")) +;; Package-Requires: ((emacs "27.1") (compat "29.1.3.0")) ;; Homepage: https://github.com/minad/consult ;; This file is part of GNU Emacs.
[elpa] externals/corfu 1bb3d86ed0: Bump compat dependency
branch: externals/corfu commit 1bb3d86ed03534f105d1d8bc38d621b99df44c9f Author: Daniel Mendler Commit: Daniel Mendler Bump compat dependency --- corfu.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corfu.el b/corfu.el index f4ebf9249c..5c5c6ac338 100644 --- a/corfu.el +++ b/corfu.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2021 ;; Version: 0.34 -;; Package-Requires: ((emacs "27.1") (compat "29.1.1.0")) +;; Package-Requires: ((emacs "27.1") (compat "29.1.3.0")) ;; Homepage: https://github.com/minad/corfu ;; This file is part of GNU Emacs.
[elpa] externals/marginalia 18b3fcfba0: Bump compat dependency
branch: externals/marginalia commit 18b3fcfba0c4af8b7bcff99ebf5891e8c0037bca Author: Daniel Mendler Commit: Daniel Mendler Bump compat dependency --- marginalia.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marginalia.el b/marginalia.el index 0fdd6d9557..6db93ceaef 100644 --- a/marginalia.el +++ b/marginalia.el @@ -6,7 +6,7 @@ ;; Maintainer: Omar Antolín Camarena , Daniel Mendler ;; Created: 2020 ;; Version: 1.0 -;; Package-Requires: ((emacs "27.1") (compat "29.1.1.1")) +;; Package-Requires: ((emacs "27.1") (compat "29.1.3.0")) ;; Homepage: https://github.com/minad/marginalia ;; This file is part of GNU Emacs.
[elpa] externals/osm 4e83414299: Bump compat dependency
branch: externals/osm commit 4e83414299ebaf1966a0a61a188bbc58fd2760f2 Author: Daniel Mendler Commit: Daniel Mendler Bump compat dependency --- osm.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osm.el b/osm.el index 1c5b45bb6b..bb5a3e9f7d 100644 --- a/osm.el +++ b/osm.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2022 ;; Version: 0.9 -;; Package-Requires: ((emacs "27.1") (compat "29.1.1.1")) +;; Package-Requires: ((emacs "27.1") (compat "29.1.3.0")) ;; Homepage: https://github.com/minad/osm ;; This file is part of GNU Emacs.
[elpa] externals/tempel fd77dc7ad6: Bump compat dependency
branch: externals/tempel commit fd77dc7ad6359d3f2b01cd7e4e7743b7180e54b8 Author: Daniel Mendler Commit: Daniel Mendler Bump compat dependency --- tempel.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tempel.el b/tempel.el index 926b42393c..aeb5901150 100644 --- a/tempel.el +++ b/tempel.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2022 ;; Version: 0.6 -;; Package-Requires: ((emacs "27.1") (compat "29.1.1.1")) +;; Package-Requires: ((emacs "27.1") (compat "29.1.3.0")) ;; Homepage: https://github.com/minad/tempel ;; This file is part of GNU Emacs.
[elpa] externals/vertico 08e185a783: Bump compat dependency
branch: externals/vertico commit 08e185a7835a0c52a2ca61cc57bc884dd1ec0774 Author: Daniel Mendler Commit: Daniel Mendler Bump compat dependency --- vertico.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vertico.el b/vertico.el index f88da29c83..66401f14c2 100644 --- a/vertico.el +++ b/vertico.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2021 ;; Version: 1.0 -;; Package-Requires: ((emacs "27.1") (compat "29.1.1.0")) +;; Package-Requires: ((emacs "27.1") (compat "29.1.3.0")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs.
[nongnu] elpa/workroom updated (a00e8561cb -> dcd02cb06e)
elpasync pushed a change to branch elpa/workroom. from a00e8561cb Use 'get-scratch-buffer-create' if defined new f3b7bc504f Fix #3: Allow changing fallback buffer new dcd02cb06e Document new option: workroom-default-buffer-name Summary of changes: README.org| 3 +++ workroom.el | 49 +++-- workroom.texi | 7 +++ 3 files changed, 41 insertions(+), 18 deletions(-)
[nongnu] elpa/workroom dcd02cb06e 2/2: Document new option: workroom-default-buffer-name
branch: elpa/workroom
commit dcd02cb06ee450796c1b8d7385efc853827648e3
Author: Akib Azmain Turja
Commit: Akib Azmain Turja
Document new option: workroom-default-buffer-name
---
README.org| 3 +++
workroom.texi | 7 +++
2 files changed, 10 insertions(+)
diff --git a/README.org b/README.org
index e7cc6b6960..4cf8849e24 100644
--- a/README.org
+++ b/README.org
@@ -85,3 +85,6 @@ If you want to completely automate managing workroom buffer
list,
check out the docstrings of ~workroom-buffer-manager-function~,
~workroom-set-buffer-manager-function~ and
~workroom-buffer-manager-data~.
+
+There's a Info manual available with more information, which can be
+accessed with =C-h i m Workroom=, also available
[[https://elpa.nongnu.org/nongnu-devel/doc/workroom.html][here on the
internet]].
diff --git a/workroom.texi b/workroom.texi
index 3ca48e9854..49b86f98b5 100644
--- a/workroom.texi
+++ b/workroom.texi
@@ -238,6 +238,9 @@ If you invoke the command
@command{workroom-switch-to-buffer} or
the command @command{workroom-list-buffers}, you'll see that only the
@samp{*scratch*} buffer is available.
+To use some other buffer as the first member of your new workrooms,
+change @code{workroom-default-buffer-name} to that buffer's name.
+
@node Buffer Management
@cindex buffer management
@cindex managing buffers
@@ -349,6 +352,10 @@ After you switch, you'll get a scratch buffer on your
view. If you
don't switch to another room (by giving prefix argument), you'll see
that the buffers are the same.
+To use some other buffer as the first buffer of the newly created
+views, change @code{workroom-default-buffer-name} to that buffer's
+name.
+
@node Killing View
@cindex killing view
@cindex view, kill
[nongnu] elpa/workroom f3b7bc504f 1/2: Fix #3: Allow changing fallback buffer
branch: elpa/workroom
commit f3b7bc504f9d3e596e05315adb8252b27a2bb4ee
Author: Akib Azmain Turja
Commit: Akib Azmain Turja
Fix #3: Allow changing fallback buffer
---
workroom.el | 49 +++--
1 file changed, 31 insertions(+), 18 deletions(-)
diff --git a/workroom.el b/workroom.el
index 65ebd7635c..4f533c37e4 100644
--- a/workroom.el
+++ b/workroom.el
@@ -139,6 +139,10 @@ name can be manually changed with `workroom-rename'."
"Name of the default view."
:type 'string)
+(defcustom workroom-default-buffer-name "*scratch*"
+ "Name of the buffer used as the default fallback buffer."
+ :type 'string)
+
(defcustom workroom-buffer-handler-alist
'((bookmark :encoder workroom-encode-buffer-bookmark
:decoder workroom-decode-buffer-bookmark))
@@ -678,14 +682,17 @@ If WRITABLE, return a writable object."
(when (stringp buffer)
(setq writable t))
;; If the buffer shown in the window is dead,
- ;; replace it with the `*scratch*' buffer, with the
+ ;; replace it with the fallback buffer, with the
;; point at the very beginning.
(unless (buffer-live-p (get-buffer buffer))
- (let ((scratch (get-buffer-create "*scratch*")))
- (with-current-buffer scratch
+ (let ((fallback (get-buffer-create
+ workroom-default-buffer-name)))
+ (with-current-buffer fallback
;; Change buffer.
(setf (car (alist-get 'buffer (cdr entry)))
- (if writable "*scratch*" scratch))
+ (if writable
+ (buffer-name fallback)
+ fallback))
;; Set point.
(setf (alist-get
'point
@@ -703,7 +710,7 @@ If WRITABLE, return a writable object."
(point-min)
(copy-marker (point-min
;; Remove references to dead buffers with
- ;; `*scratch*'.
+ ;; the fallback buffer.
(let ((prev (alist-get 'prev-buffers (cdr entry
(setf
(alist-get 'prev-buffers (cdr entry))
@@ -711,14 +718,15 @@ If WRITABLE, return a writable object."
(lambda (entry)
(if (buffer-live-p (get-buffer (car entry)))
entry
- (let ((scratch (get-buffer-create
- "*scratch*")))
- (with-current-buffer scratch
+ (let ((fallback
+(get-buffer-create
+ workroom-default-buffer-name)))
+ (with-current-buffer fallback
(if writable
- (list "*scratch*" (point-min)
- (point-min))
+ (list (buffer-name fallback)
+ (point-min) (point-min))
(list
-scratch
+fallback
(copy-marker (point-min))
(copy-marker
(point-min)
@@ -730,9 +738,12 @@ If WRITABLE, return a writable object."
(lambda (buffer)
(if (buffer-live-p (get-buffer buffer))
buffer
- (let ((buffer (get-buffer-create
- "*scratch*")))
-(if writable "*scratch*" buffer
+ (let ((buffer
+ (get-buffer-create
+ workroom-default-buffer-name)))
+(if writable
+(buffer-name buffer)
+ buffer
next
entry)
;; Recurse.
@@ -745,7 +756,7 @@ If WRITABLE, return a writable object."
(unless workroom--dont-clear-new-view
(delete-other-windows)
(set-window-dedicated-p (selected-window) nil)
- (switch-to-buffer "*scratch*"
+ (switch-to-buffer workroom-default-buffer-name
(defun workroom--barf-unless-enabled ()
"Signal `user-error' unless Workroom mode is enabled."
@@ -1249,9 +1260,11 @@ ACTION and ARGS are also described there."
(pcase (cons action args)
('(:initialize)
(setf
[elpa] externals/compat c5b7ee9376 1/2: compat-29: Provide string-lines implementation from Emacs 29
branch: externals/compat
commit c5b7ee9376a760db436d6699c5e9de7963892316
Author: Daniel Mendler
Commit: Daniel Mendler
compat-29: Provide string-lines implementation from Emacs 29
---
NEWS.org| 5 +
compat-28.el| 5 -
compat-29.el| 29 +
compat-tests.el | 42 ++
compat.texi | 31 ---
5 files changed, 76 insertions(+), 36 deletions(-)
diff --git a/NEWS.org b/NEWS.org
index 8db740ed87..b4a66b301c 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,5 +1,10 @@
#+title: compat.el - Changelog
+* Development
+
+- compat-29: Replace ~string-lines~ with version from Emacs 29, support
optional
+ KEEP-NEWLINES argument.
+
* Release of "Compat" Version 29.1.3.0
- compat-25: Add ~hash-table-empty-p~.
diff --git a/compat-28.el b/compat-28.el
index 76dfe37e3d..f068240d64 100644
--- a/compat-28.el
+++ b/compat-28.el
@@ -390,11 +390,6 @@ removed."
(fill-region (point-min) (point-max)))
(buffer-string)))
-(compat-defun string-lines (string &optional omit-nulls) ;;
- "Split STRING into a list of lines.
-If OMIT-NULLS, empty lines will be removed from the results."
- (split-string string "\n" omit-nulls))
-
(compat-defun string-pad (string length &optional padding start) ;;
"Pad STRING to LENGTH using PADDING.
If PADDING is nil, the space character is used. If not nil, it
diff --git a/compat-29.el b/compat-29.el
index 6612612ea3..821d28319c 100644
--- a/compat-29.el
+++ b/compat-29.el
@@ -170,6 +170,35 @@ This function does not move point. Also see
`line-end-position'."
Defined in subr.el
+(compat-defun string-lines (string &optional omit-nulls keep-newlines)
+ "Handle additional KEEP-NEWLINES argument."
+ :extended "28.1"
+ (if (equal string "")
+ (if omit-nulls
+ nil
+(list ""))
+(let ((lines nil)
+ (start 0))
+ (while (< start (length string))
+(let ((newline (string-search "\n" string start)))
+ (if newline
+ (progn
+(when (or (not omit-nulls)
+ (not (= start newline)))
+ (let ((line (substring string start
+ (if keep-newlines
+ (1+ newline)
+ newline
+(when (not (and keep-newlines omit-nulls
+(equal line "\n")))
+ (push line lines
+(setq start (1+ newline)))
+(if (zerop start)
+(push string lines)
+ (push (substring string start) lines))
+(setq start (length string)
+ (nreverse lines
+
(compat-defun readablep (object) ;;
"Say whether OBJECT has a readable syntax.
This means that OBJECT can be printed out and then read back
diff --git a/compat-tests.el b/compat-tests.el
index 14f8c79a20..c26c29496f 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -1802,17 +1802,24 @@
(ert-deftest string-lines ()
(should-equal '("a" "b" "c") (string-lines "a\nb\nc"))
- ;; FIXME: Behavior changed on Emacs 30
- (compat-tests--if (< emacs-major-version 29)
+ (should-equal '("a" "b" "c") (string-lines "a\nb\nc\n" t))
+ (should-equal '("a" "b" "c") (string-lines "a\nb\n\nc\n" t))
+ (should-equal '("abc" "bcd" "cde") (string-lines "abc\nbcd\ncde"))
+ (should-equal '(" abc" " bcd " "cde ") (string-lines " abc\n bcd \ncde "))
+
+ ;; NOTE: Behavior for trailing newline was different on Emacs 28
+ (compat-tests--if (= emacs-major-version 28)
(should-equal '("a" "b" "c" "") (string-lines "a\nb\nc\n"))
(should-equal '("a" "b" "c") (string-lines "a\nb\nc\n"))
(should-equal '("a\n" "\n" "b\n" "c\n") (string-lines "a\n\nb\nc\n" nil t))
(should-equal '("a\n" "b\n" "c\n") (string-lines "a\n\nb\nc\n" t t))
(should-equal '("a\n" "b\n" "c\n") (string-lines "a\nb\nc\n" nil t)))
- (should-equal '("a" "b" "c") (string-lines "a\nb\nc\n" t))
- (should-equal '("a" "b" "c") (string-lines "a\nb\n\nc\n" t))
- (should-equal '("abc" "bcd" "cde") (string-lines "abc\nbcd\ncde"))
- (should-equal '(" abc" " bcd " "cde ") (string-lines " abc\n bcd \ncde ")))
+
+ ;; Compatibility function provides the Emacs 29 behavior regarding trailing
newlines
+ (should-equal '("a" "b" "c") (compat-call string-lines "a\nb\nc\n"))
+ (should-equal '("a\n" "\n" "b\n" "c\n") (compat-call string-lines
"a\n\nb\nc\n" nil t))
+ (should-equal '("a\n" "b\n" "c\n") (compat-call string-lines "a\n\nb\nc\n" t
t))
+ (should-equal '("a\n" "b\n" "c\n") (compat-call string-lines "a\nb\nc\n" nil
t)))
(ert-deftest string-pad ()
(should-equal "a " (string-pad "a" 4))
@@ -1984,12 +1991,10 @@
;; The `make-string' calls with three arguments have been replaced
;; here with the result of their evaluation, to avoid issues with
;; older versions of Em
[elpa] externals/compat 0f4e98628c 2/2: string-lines: Add missing test link
branch: externals/compat commit 0f4e98628c4a4df608550f1152a60f19a762a838 Author: Daniel Mendler Commit: Daniel Mendler string-lines: Add missing test link --- compat-29.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat-29.el b/compat-29.el index 821d28319c..e597d5ea37 100644 --- a/compat-29.el +++ b/compat-29.el @@ -170,7 +170,7 @@ This function does not move point. Also see `line-end-position'." Defined in subr.el -(compat-defun string-lines (string &optional omit-nulls keep-newlines) +(compat-defun string-lines (string &optional omit-nulls keep-newlines) ;; "Handle additional KEEP-NEWLINES argument." :extended "28.1" (if (equal string "")
[elpa] externals/compat updated (24202de98e -> 0f4e98628c)
elpasync pushed a change to branch externals/compat. from 24202de98e Update version numbers new c5b7ee9376 compat-29: Provide string-lines implementation from Emacs 29 new 0f4e98628c string-lines: Add missing test link Summary of changes: NEWS.org| 5 + compat-28.el| 5 - compat-29.el| 29 + compat-tests.el | 42 ++ compat.texi | 31 --- 5 files changed, 76 insertions(+), 36 deletions(-)
[elpa] externals/consult ab02c8ece9 1/2: consult-locate-args: Remove --existing (Fix #499)
branch: externals/consult commit ab02c8ece95afe5e915bc9bf1414ca70e2b854e9 Author: Daniel Mendler Commit: Daniel Mendler consult-locate-args: Remove --existing (Fix #499) --- consult.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consult.el b/consult.el index adb8eaec37..ae42f81a0a 100644 --- a/consult.el +++ b/consult.el @@ -284,7 +284,7 @@ Can be either a string, or a list of strings or expressions." :type '(choice string (repeat (choice string expression (defcustom consult-locate-args - "locate --ignore-case --existing" + "locate --ignore-case" ;; --existing not supported by Debian plocate "Command line arguments for locate, see `consult-locate'. The dynamically computed arguments are appended. Can be either a string, or a list of strings or expressions."
[elpa] externals/consult updated (234b131a69 -> 13d16a7002)
elpasync pushed a change to branch externals/consult. from 234b131a69 Bump compat dependency new ab02c8ece9 consult-locate-args: Remove --existing (Fix #499) new 13d16a7002 Update changelog Summary of changes: CHANGELOG.org | 2 ++ consult.el| 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
[elpa] externals/consult 13d16a7002 2/2: Update changelog
branch: externals/consult commit 13d16a700238f5ee80c2d74c50b54dd9270dc583 Author: Daniel Mendler Commit: Daniel Mendler Update changelog --- CHANGELOG.org | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.org b/CHANGELOG.org index 19f4484685..30ff841cbc 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -10,6 +10,8 @@ - Drop obsolete =consult-multi-occur=. Alternative: Built-in =multi-occur=, =multi-occur-in-matching-buffers= or =consult-line-multi=. - Drop obsolete =consult-file-externally=. Alternative: =embark-open-externally=. +- =consult-locate-args=: Remove =--existing=, which is not supported by =plocate= on + Debian stable. * Version 0.31 (2023-01-06)
[elpa] externals/hyperbole d2b007c1ae: Remove docstring warnings (#297)
branch: externals/hyperbole commit d2b007c1ae38d7674f9352b284adb7cdf2388615 Author: Mats Lidell Commit: GitHub Remove docstring warnings (#297) --- ChangeLog | 4 hbdata.el | 6 +++--- hib-kbd.el | 4 ++-- hmouse-info.el | 4 ++-- hui.el | 4 ++-- hywconfig.el | 8 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1584f9471..35113e2102 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2023-01-20 Mats Lidell + +* Remove docstring warnings. + 2023-01-15 Mats Lidell * hsmail.el: Remove #-mark for symbol check. diff --git a/hbdata.el b/hbdata.el index aa750e..87ed9e4344 100644 --- a/hbdata.el +++ b/hbdata.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date: 2-Apr-91 -;; Last-Mod: 5-Nov-22 at 14:24:56 by Bob Weiner +;; Last-Mod: 20-Jan-23 at 23:17:59 by Mats Lidell ;; ;; Copyright (C) 1991-2021 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. @@ -100,8 +100,8 @@ (car hbdata)) (defun hbdata:loc-p (hbdata) - "[Hyp V1] Return 'L iff HBDATA referent is within a local file system. -Return 'R if remote and nil if irrelevant for button action type." + "[Hyp V1] Return \\='L iff HBDATA referent is within a local file system. +Return \\='R if remote and nil if irrelevant for button action type." (nth 1 hbdata)) (defun hbdata:modifier (hbdata) diff --git a/hib-kbd.el b/hib-kbd.el index d11a5f1354..f622cf311c 100644 --- a/hib-kbd.el +++ b/hib-kbd.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date:22-Nov-91 at 01:37:57 -;; Last-Mod: 27-Oct-22 at 18:46:16 by Bob Weiner +;; Last-Mod: 20-Jan-23 at 22:19:34 by Mats Lidell ;; ;; Copyright (C) 1991-2022 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. @@ -463,7 +463,7 @@ For an approximate inverse of this, see `key-description'." (defun kbd-key:extended-command-p (key-series) "Return non-nil if the KEY-SERIES is a normalized extended command invocation. -That is, 'M-x command'." +That is, `M-x command'." (when (stringp key-series) (string-match kbd-key:extended-command-prefix key-series))) diff --git a/hmouse-info.el b/hmouse-info.el index 5e10db04ae..1253710486 100644 --- a/hmouse-info.el +++ b/hmouse-info.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date:04-Apr-89 -;; Last-Mod: 12-Oct-22 at 22:52:44 by Mats Lidell +;; Last-Mod: 20-Jan-23 at 22:19:33 by Mats Lidell ;; ;; Copyright (C) 1989-2022 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. @@ -113,7 +113,7 @@ If assist-key is pressed within: (3) the File entry of a Node Header (first line), the `DIR' root-level node is found; (4) at the end of the current node, the Previous node is found (this will - return from subtrees if the function 'Info-global-prev is bound); + return from subtrees if the function `Info-global-prev' is bound); (5) anywhere else (e.g. at the end of a line), the current node entry is scrolled down one windowful. diff --git a/hui.el b/hui.el index 6419a21eaa..311902b5c9 100644 --- a/hui.el +++ b/hui.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date:19-Sep-91 at 21:42:03 -;; Last-Mod: 8-Jan-23 at 10:22:39 by Mats Lidell +;; Last-Mod: 20-Jan-23 at 23:16:41 by Mats Lidell ;; ;; Copyright (C) 1991-2021 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. @@ -781,7 +781,7 @@ BUT defaults to the button whose label point is within." (defun hui:hbut-label (default-label func-name &optional prompt) "Read button label from user using DEFAULT-LABEL and caller's FUNC-NAME. -Optional PROMPT string replaces the standard prompt of 'Button label: '." +Optional PROMPT string replaces the standard prompt of `Button label: '." (hargs:read (if (stringp prompt) prompt "Button label: ") (lambda (lbl) (and (not (string-equal lbl "")) (<= (length lbl) (hbut:max-len diff --git a/hywconfig.el b/hywconfig.el index f7f5d7d535..cfda781e90 100644 --- a/hywconfig.el +++ b/hywconfig.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date:15-Mar-89 -;; Last-Mod: 6-Nov-22 at 13:04:26 by Bob Weiner +;; Last-Mod: 20-Jan-23 at 22:20:55 by Mats Lidell ;; ;; Copyright (C) 1989-2022 Free Software Foundation, Inc. ;; See the "../HY-COPY" file for license information. @@ -136,9 +136,9 @@ Then deletes this new configuration from the ring." ;;;###autoload (defun hywconfig-delete-pop-continue () - "Replace the current frame's window configuration with the most recently saved. -Delete this new configuration from the ring. If the hywconfig ring is not empty, -then stay in the hywconfig menu." + "Replace current frame's window configuration with the most recently saved. +Delete this new configuration from the ring. If the hywconfig +ring is not empty
[elpa] externals/org b29f772416 10/14: org-macs: Split org-compile-file into two funs
branch: externals/org commit b29f77241681abd6fb12de3b7e26c009cb28c63d Author: TEC Commit: Ihor Radchenko org-macs: Split org-compile-file into two funs * lisp/org-macs.el (org-compile-file, org-compile-file-commands): Pull out the logic transforming process descriptions to commands to be executed into a new function, `org-compile-file-commands'. `org-compile-file' is now solely concerned with running the commands and reporting the result. --- lisp/org-macs.el | 74 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 07c668a807..cda9c5e034 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -345,31 +345,56 @@ in target-prerequisite files relation." (defun org-compile-file (source process ext &optional err-msg log-buf spec) "Compile a SOURCE file using PROCESS. -PROCESS is either a function or a list of shell commands, as -strings. EXT is a file extension, without the leading dot, as -a string. It is used to check if the process actually succeeded. +See `org-compile-file-commands' for information on PROCESS, EXT, and SPEC. +If PROCESS fails, an error will be raised. The error message can +then be refined by providing string ERR-MSG, which is appended to +the standard message. PROCESS must create a file with the same base name and directory as SOURCE, but ending with EXT. The function then returns its -filename. Otherwise, it raises an error. The error message can -then be refined by providing string ERR-MSG, which is appended to -the standard message. +filename. Otherwise, it raises an error. + +When PROCESS is a list of commands, optional argument LOG-BUF can +be set to a buffer or a buffer name. `shell-command' then uses +it for output." + (let* ((commands (org-compile-file-commands source process ext spec err-msg)) + (output (expand-file-name (concat (file-name-base source) "." ext) + (file-name-directory source))) + (log-buf (and log-buf (get-buffer-create log-buf))) + (time (file-attribute-modification-time (file-attributes output +(save-window-excursion + (dolist (command commands) +(cond + ((functionp command) + (funcall command (shell-quote-argument (file-relative-name source + ((stringp command) (shell-command command log-buf) +;; Check for process failure. Output file is expected to be +;; located in the same directory as SOURCE. +(unless (org-file-newer-than-p output time) + (error (format "File %S wasn't produced%s" output err-msg))) +output)) + +(defun org-compile-file-commands (source process ext &optional spec err-msg) + "Create commands to compile SOURCE. + +The commands are formed from PROCESS, which is either a function or +a list of shell commands, as strings. EXT is a file extension, without +the leading dot, as a string. After PROCESS has been executed, +a file with the same basename and directory as SOURCE but with the +file extension EXT is expected to be produced. +Failure to produce this file will be interpreted as PROCESS failing. If PROCESS is a function, it is called with a single argument: the SOURCE file. -If it is a list of commands, each of them is called using +If PROCESS is a list of commands, each of them is called using `shell-command'. By default, in each command, %b, %f, %F, %o and %O are replaced with, respectively, SOURCE base name, name, full name, directory and absolute output file name. It is possible, however, to use more place-holders by specifying them in optional argument SPEC, as an alist following the pattern - (CHARACTER . REPLACEMENT-STRING). - -When PROCESS is a list of commands, optional argument LOG-BUF can -be set to a buffer or a buffer name. `shell-command' then uses -it for output." + (CHARACTER . REPLACEMENT-STRING)." (let* ((base-name (file-name-base source)) (full-name (file-truename source)) (relative-name (file-relative-name source)) @@ -378,34 +403,19 @@ it for output." ;; in the shell command call. (file-name-directory full-name) "./")) -(output (expand-file-name (concat base-name "." ext) out-dir)) -(time (file-attribute-modification-time (file-attributes output))) +(output (expand-file-name (concat (file-name-base source) "." ext) out-dir)) (err-msg (if (stringp err-msg) (concat ". " err-msg) ""))) -(save-window-excursion (pcase process - ((pred functionp) (funcall process (shell-quote-argument relative-name))) + ((pred functionp) process) ((pred consp) -(let ((log-buf (and log-buf (get-buffer-create log-buf))) - (spec (append spec +(let ((spec (append spec `((?b . ,(shell-quote-argument base-name))
[elpa] externals/org updated (b34bdc8719 -> f0dfbf0c39)
elpasync pushed a change to branch externals/org. from b34bdc8719 org-capture-finalize: Do not save new file with :no-save aborted capture new ddca762329 org-element--cache-verify-element: Format all the elements in warning new 4b546e04af org-element--cache-submit-request: Ensure correct cache synchronization new 0af74d33a7 org-manual: Fix typos in print_bibliography kwd new 5cde90e3c8 ox: Refactor org-export-expand-include-keyword new 7e649050c7 ox: Pass through unparsed #+include content new ffd832d5d6 org-manual: Update #+include block parsing new 506989bed5 ox: Improve #+include parsing docstring new e9c0696f79 org-persist: Inhibit fsync when writing cachefiles new c8f88589cb org-persist: Set utf-8 coding when reading/writing new b29f772416 org-macs: Split org-compile-file into two funs new d0c87c762a ox-latex: Do not hardcode fallback compiler new 18d2f871c2 org: Split org-format-latex into two functions new b84018633e ox-latex: Split org-latex-compile into two funs new f0dfbf0c39 ox-latex: Erase compile buffer at the start Summary of changes: doc/org-manual.org | 23 ++-- lisp/org-element.el | 21 ++-- lisp/org-macs.el| 74 +++-- lisp/org-persist.el | 80 -- lisp/org.el | 35 +++--- lisp/ox-latex.el| 43 +--- lisp/ox.el | 306 +++- 7 files changed, 343 insertions(+), 239 deletions(-)
[elpa] externals/org e9c0696f79 08/14: org-persist: Inhibit fsync when writing cachefiles
branch: externals/org commit e9c0696f795628e86d8c526f8a7656b674b1b3ee Author: TEC Commit: Ihor Radchenko org-persist: Inhibit fsync when writing cachefiles * lisp/org-persist.el (org-persist--write-elisp-file): For the reasons mentioned in the large code comment, it simply does not make much sense to use fsync when writing cache files. The value of fsync in general on modern hardware seems questionable, particularly with CoW filesystems which take care of the problem better than it seems fsync ever could. --- lisp/org-persist.el | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lisp/org-persist.el b/lisp/org-persist.el index da74257de8..6fbc8d87b0 100644 --- a/lisp/org-persist.el +++ b/lisp/org-persist.el @@ -420,7 +420,19 @@ FORMAT and ARGS are passed to `message'." (defun org-persist--write-elisp-file (file data &optional no-circular pp) "Write elisp DATA to FILE." - (let ((print-circle (not no-circular)) + ;; Fsync slightly reduces the chance of an incomplete filesystem + ;; write, however on modern hardware its effectiveness is + ;; questionable and it is insufficient to garantee complete writes. + ;; Coupled with the significant performance hit if writing many + ;; small files, it simply does not make sense to use fsync here, + ;; particularly as cache corruption is only a minor inconvenience. + ;; With all this in mind, we ensure `write-region-inhibit-fsync' is + ;; set. + ;; + ;; To read more about this, see the comments in Emacs' fileio.c, in + ;; particular the large comment block in init_fileio. + (let ((write-region-inhibit-fsync t) +(print-circle (not no-circular)) print-level print-length print-quoted
[elpa] externals/org d0c87c762a 11/14: ox-latex: Do not hardcode fallback compiler
branch: externals/org commit d0c87c762aa35f9abec79d8e0fea325a8c0608d0 Author: TEC Commit: Ihor Radchenko ox-latex: Do not hardcode fallback compiler * lisp/ox-latex.el (org-latex-compile): Instead of hardcoding "pdflatex" as the fallback compiler, use `org-latex-compiler'. --- lisp/ox-latex.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 110390cf3c..330007eba9 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -4283,7 +4283,7 @@ produced." ;; Cannot find the compiler inserted by ;; `org-latex-template' -> `org-latex--insert-compiler'. ;; Use a fallback. - "pdflatex")) + org-latex-compiler)) (process (if (functionp org-latex-pdf-process) org-latex-pdf-process ;; Replace "%latex" with "%L" and "%bib" and ;; "%bibtex" with "%B" to adhere to `format-spec'
[elpa] externals/org 5cde90e3c8 04/14: ox: Refactor org-export-expand-include-keyword
branch: externals/org commit 5cde90e3c8df5d95dd291025acf3bf3acdc248ac Author: TEC Commit: Ihor Radchenko ox: Refactor org-export-expand-include-keyword * lisp/ox.el (org-export-expand-include-keyword): Split the parsing and inclusion logic of the ~150 line `org-export-expand-include-keyword' into two new functions: `org-export-parse-include-value' and `org-export--blindly-expand-include'. --- lisp/ox.el | 285 +++-- 1 file changed, 162 insertions(+), 123 deletions(-) diff --git a/lisp/ox.el b/lisp/ox.el index b9c57321f6..b6240cb1fc 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -3303,7 +3303,6 @@ not have `buffer-file-name' assigned." (buffer-file-name (buffer-base-buffer (case-fold-search t) (file-prefix (make-hash-table :test #'equal)) - (current-prefix 0) (footnotes (or footnotes (make-hash-table :test #'equal))) (include-re "^[ \t]*#\\+INCLUDE:")) ;; If :minlevel is not set the text-property @@ -3319,128 +3318,168 @@ not have `buffer-file-name' assigned." (goto-char (point-min)) (while (re-search-forward include-re nil t) (unless (org-in-commented-heading-p) - (let ((element (save-match-data (org-element-at-point - (when (eq (org-element-type element) 'keyword) - (beginning-of-line) - ;; Extract arguments from keyword's value. - (let* ((value (org-element-property :value element)) - (ind (org-current-text-indentation)) - location - (coding-system-for-read - (or (and (string-match ":coding +\\(\\S-+\\)>" value) -(prog1 (intern (match-string 1 value)) - (setq value (replace-match "" nil nil value - coding-system-for-read)) - (file - (and (string-match "^\\(\".+?\"\\|\\S-+\\)\\(?:\\s-+\\|$\\)" - value) -(prog1 -(save-match-data - (let ((matched (match-string 1 value)) - stripped) -(when (string-match "\\(::\\(.*?\\)\\)\"?\\'" -matched) - (setq location (match-string 2 matched)) - (setq matched -(replace-match "" nil nil matched 1))) - (setq stripped (org-strip-quotes matched)) - (if (org-url-p stripped) - stripped - (expand-file-name stripped dir - (setq value (replace-match "" nil nil value) - (only-contents - (and (string-match ":only-contents *\\([^: \r\t\n]\\S-*\\)?" - value) -(prog1 (org-not-nil (match-string 1 value)) - (setq value (replace-match "" nil nil value) - (lines - (and (string-match - ":lines +\"\\([0-9]*-[0-9]*\\)\"" - value) -(prog1 (match-string 1 value) - (setq value (replace-match "" nil nil value) - (env (cond -((string-match "\\" value) 'literal) -((string-match "\\" value) - (match-string 1 value - ;; Remove keyword. - (delete-region (point) (line-beginning-position 2)) - (cond - ((not file) nil) - ((and (not (org-url-p file)) (not (file-readable-p file))) - (error "Cannot include file %s" file)) - ;; Check if files has already been parsed. Look after - ;; inclusion lines too, as different parts of the same - ;; file can be included too. - ((member (list file lines) included) - (error "Recursive file inclusion: %s" file)) - (t - (cond -((eq env 'literal) - (insert - (let ((ind-str (make-string ind ?\s)) -(arg-str (if (stringp args) (format " %s" args) "")) -(contents - (org-escape-code-in-string - (org-export--prepare-file-contents file lines -(format "%s#+BEGIN_%s%s\n%s%s#+END_%s\n" -ind-str block arg-str contents ind-str block -((stringp block) - (insert - (let ((ind-str (make-string ind ?\s)) -
[elpa] externals/org c8f88589cb 09/14: org-persist: Set utf-8 coding when reading/writing
branch: externals/org commit c8f88589cb8891cbe0f70aa6969837619cf05f41 Author: TEC Commit: Ihor Radchenko org-persist: Set utf-8 coding when reading/writing * lisp/org-persist.el (org-persist--write-elisp-file, org-persist--read-elisp-file): Instead of letting `find-auto-coding' be invoked to determine the coding for org-persist cache files (which can be surprisingly expensive), we simply set utf-8 coding when reading/writing. --- lisp/org-persist.el | 66 - 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/lisp/org-persist.el b/lisp/org-persist.el index 6fbc8d87b0..385e118115 100644 --- a/lisp/org-persist.el +++ b/lisp/org-persist.el @@ -386,37 +386,38 @@ FORMAT and ARGS are passed to `message'." (defun org-persist--read-elisp-file (&optional buffer-or-file) "Read elisp data from BUFFER-OR-FILE or current buffer." - (unless buffer-or-file (setq buffer-or-file (current-buffer))) - (with-temp-buffer -(if (bufferp buffer-or-file) -(set-buffer buffer-or-file) - (insert-file-contents buffer-or-file)) -(condition-case err -(let ((coding-system-for-read 'utf-8) - (read-circle t) - (start-time (float-time))) - ;; FIXME: Reading sometimes fails to read circular objects. - ;; I suspect that it happens when we have object reference - ;; #N# read before object definition #N=. If it is really - ;; so, it should be Emacs bug - either in `read' or in - ;; `prin1'. Meanwhile, just fail silently when `read' - ;; fails to parse the saved cache object. - (prog1 - (read (current-buffer)) -(org-persist--display-time - (- (float-time) start-time) - "Reading from %S" buffer-or-file))) - ;; Recover gracefully if index file is corrupted. - (error - ;; Remove problematic file. - (unless (bufferp buffer-or-file) (delete-file buffer-or-file)) - ;; Do not report the known error to user. - (if (string-match-p "Invalid read syntax" (error-message-string err)) - (message "Emacs reader failed to read data in %S. The error was: %S" -buffer-or-file (error-message-string err)) - (warn "Emacs reader failed to read data in %S. The error was: %S" - buffer-or-file (error-message-string err))) - nil + (let (;; UTF-8 is explicitly used in `org-persist--write-elisp-file'. +(coding-system-for-read 'utf-8) +(buffer-or-file (or buffer-or-file (current-buffer +(with-temp-buffer + (if (bufferp buffer-or-file) + (set-buffer buffer-or-file) +(insert-file-contents buffer-or-file)) + (condition-case err + (let ((read-circle t) +(start-time (float-time))) +;; FIXME: Reading sometimes fails to read circular objects. +;; I suspect that it happens when we have object reference +;; #N# read before object definition #N=. If it is really +;; so, it should be Emacs bug - either in `read' or in +;; `prin1'. Meanwhile, just fail silently when `read' +;; fails to parse the saved cache object. +(prog1 +(read (current-buffer)) + (org-persist--display-time + (- (float-time) start-time) + "Reading from %S" buffer-or-file))) +;; Recover gracefully if index file is corrupted. +(error + ;; Remove problematic file. + (unless (bufferp buffer-or-file) (delete-file buffer-or-file)) + ;; Do not report the known error to user. + (if (string-match-p "Invalid read syntax" (error-message-string err)) + (message "Emacs reader failed to read data in %S. The error was: %S" + buffer-or-file (error-message-string err)) + (warn "Emacs reader failed to read data in %S. The error was: %S" + buffer-or-file (error-message-string err))) + nil) (defun org-persist--write-elisp-file (file data &optional no-circular pp) "Write elisp DATA to FILE." @@ -432,6 +433,9 @@ FORMAT and ARGS are passed to `message'." ;; To read more about this, see the comments in Emacs' fileio.c, in ;; particular the large comment block in init_fileio. (let ((write-region-inhibit-fsync t) +;; We set UTF-8 here and in `org-persist--read-elisp-file' +;; to avoid the overhead from `find-auto-coding'. +(coding-system-for-write 'utf-8) (print-circle (not no-circular)) print-level print-length
[elpa] externals/org f0dfbf0c39 14/14: ox-latex: Erase compile buffer at the start
branch: externals/org commit f0dfbf0c3999e44ef7b6704e6584aa2a5d43f2d8 Author: TEC Commit: Ihor Radchenko ox-latex: Erase compile buffer at the start * lisp/ox-latex.el (org-latex-compile): Before running the compile command, erase the log buffer to ensure that stale/old logging is cleared. --- lisp/ox-latex.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 156940703a..dc2062df50 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -4301,6 +4301,8 @@ produced." (outfile (org-compile-file texfile process "pdf" (format "See %S for details" log-buf-name) log-buf spec))) +(with-current-buffer log-buf + (erase-buffer)) (org-latex-compile--postprocess outfile log-buf snippet) ;; Return output file name. outfile))
[elpa] externals/org 7e649050c7 05/14: ox: Pass through unparsed #+include content
branch: externals/org commit 7e649050c7ad653952b96f86cb172f3b32dc3cc2 Author: TEC Commit: Ihor Radchenko ox: Pass through unparsed #+include content * lisp/ox.el (org-export-parse-include-value): Adjust the block matches not to match keywords (i.e. ":\S-+"), and both block and env to consume their matches in value. Now value only contains the unmatched content, which is given in as the results plist as :unmatched. --- lisp/ox.el | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/ox.el b/lisp/ox.el index b6240cb1fc..3ff7799b40 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -3404,9 +3404,15 @@ not have `buffer-file-name' assigned." (setq value (replace-match "" nil nil value))) (get-text-property (point) :org-include-induced-level - (args (and (eq env 'literal) (match-string 1 value))) - (block (and (string-match "\\<\\(\\S-+\\)\\>" value) - (match-string 1 value + (args (and (eq env 'literal) +(prog1 (match-string 1 value) + (setq value (replace-match "" nil nil value 1) + (block (and (or (string-match "\"\\(\\S-+\\)\"" value) + (string-match "\\<\\(\\S-+\\)\\>" value)) + (or (= (match-beginning 0) 0) + (not (= ?: (aref value (1- (match-beginning 0)) + (prog1 (match-string 1 value) + (setq value (replace-match "" nil nil value)) (list :file file :coding-system coding-system :location location @@ -3415,7 +3421,8 @@ not have `buffer-file-name' assigned." :env env :minlevel minlevel :args args - :block block))) + :block block + :unmatched (org-babel-parse-header-arguments value t (cl-defun org-export--blindly-expand-include (parameters &key includer-file file-prefix footnotes already-included) "Unconditionally include reference defined by PARAMETERS in the buffer.
[elpa] externals/org 4b546e04af 02/14: org-element--cache-submit-request: Ensure correct cache synchronization
branch: externals/org commit 4b546e04af85e757902b57963854a35690739514 Author: Ihor Radchenko Commit: Ihor Radchenko org-element--cache-submit-request: Ensure correct cache synchronization * lisp/org-element.el (org-element--cache-sync): Add new optional argument FORCE to force cache synchronization even when `org-element--cache-active-p' returns non-nil. Update commentary explaining why `org-element--cache-active-p' needs to be checked. (org-element--cache-submit-request): Force cache synchronization. We are safe to force it as all the callers of `org-element--cache-submit-request' do check that cache is active. This fixes an edge case when Org buffer has transient indirect buffers with `after-change-functions' not being setup. If a change happens in the main Org buffer, `org-element--cache-after-change' gets called and cache request is processed even though (org-element--cache-active-p), but not (org-element--cache-active-p t), returns nil (due to the indirect buffer). Before this commit, `org-element--cache-submit-request' called by `org-element--cache-after-change' missed cache synchronization, as `org-element--cache-sync' did nothing. As a result, if the indirect buffer would get deleted, we would end up with incorrect cache state. Reported-by: Gregor Zattler --- lisp/org-element.el | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lisp/org-element.el b/lisp/org-element.el index b9e93f60e1..a3d9092909 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -5985,7 +5985,7 @@ It is a symbol among nil, t, or a number representing smallest level of modified headline. The level considers headline levels both before and after the modification.") -(defun org-element--cache-sync (buffer &optional threshold future-change offset) +(defun org-element--cache-sync (buffer &optional threshold future-change offset force) "Synchronize cache with recent modification in BUFFER. When optional argument THRESHOLD is non-nil, do the @@ -5998,13 +5998,18 @@ FUTURE-CHANGE, when non-nil, is a buffer position where changes not registered yet in the cache are going to happen. OFFSET is the change offset. It is used in `org-element--cache-submit-request', where cache is partially updated before current modification are -actually submitted." +actually submitted. + +FORCE, when non-nil will force the synchronization even when +`org-element--cache-active-p' returns nil." (when (buffer-live-p buffer) (org-with-base-buffer buffer ;; Do not sync when, for example, in the middle of ;; `combine-change-calls'. See the commentary inside - ;; `org-element--cache-active-p'. - (when (and org-element--cache-sync-requests (org-element--cache-active-p)) + ;; `org-element--cache-active-p'. Such situation may occur when + ;; sync timer triggers in the middle of `combine-change-calls'. + (when (and org-element--cache-sync-requests + (or force (org-element--cache-active-p))) ;; Check if the buffer have been changed outside visibility of ;; `org-element--cache-before-change' and `org-element--cache-after-change'. (if (/= org-element--cache-last-buffer-size (buffer-size)) @@ -7072,7 +7077,7 @@ change, as an integer." ;; yet to the otherwise correct part of the cache (i.e, before ;; the first request). (org-element--cache-log-message "Adding new phase 0 request") -(when next (org-element--cache-sync (current-buffer) end beg offset)) +(when next (org-element--cache-sync (current-buffer) end beg offset 'force)) (let ((first (org-element--cache-for-removal beg end offset))) (if first (push (let ((first-beg (org-element-property :begin first))
[elpa] externals/org 18d2f871c2 12/14: org: Split org-format-latex into two functions
branch: externals/org commit 18d2f871c298b1033cb164dacd48e0f723379a2e Author: TEC Commit: Ihor Radchenko org: Split org-format-latex into two functions * lisp/org.el (org-place-formula-image, org-format-latex): Extract the overlay placement component of `org-format-latex' into a new function `org-place-formula-image`. --- lisp/org.el | 35 --- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 0e6a3da0a3..00674d1fcb 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -15801,21 +15801,7 @@ Some of the options can be changed using the variable (unless (file-exists-p movefile) (org-create-formula-image value movefile options forbuffer processing-type)) - (if overlays - (progn - (dolist (o (overlays-in beg end)) - (when (eq (overlay-get o 'org-overlay-type) - 'org-latex-overlay) - (delete-overlay o))) - (org--make-preview-overlay beg end movefile imagetype) - (goto-char end)) - (delete-region beg end) - (insert - (org-add-props link - (list 'org-latex-src -(replace-regexp-in-string "\"" "" value) -'org-latex-src-embed-type -(if block-type 'paragraph 'character))) +(org-place-formula-image link block-type beg end value overlays movefile imagetype))) ((eq processing-type 'mathml) ;; Process to MathML. (unless (org-format-latex-mathml-available-p) @@ -15830,6 +15816,25 @@ Some of the options can be changed using the variable (error "Unknown conversion process %s for LaTeX fragments" processing-type))) +(defun org-place-formula-image (link block-type beg end value overlays movefile imagetype) + "Place an overlay from BEG to END showing MOVEFILE. +The overlay will be above BEG if OVERLAYS is non-nil." + (if overlays + (progn +(dolist (o (overlays-in beg end)) + (when (eq (overlay-get o 'org-overlay-type) +'org-latex-overlay) +(delete-overlay o))) +(org--make-preview-overlay beg end movefile imagetype) +(goto-char end)) +(delete-region beg end) +(insert + (org-add-props link + (list 'org-latex-src + (replace-regexp-in-string "\"" "" value) + 'org-latex-src-embed-type + (if block-type 'paragraph 'character)) + (defun org-create-math-formula (latex-frag &optional mathml-file) "Convert LATEX-FRAG to MathML and store it in MATHML-FILE. Use `org-latex-to-mathml-convert-command'. If the conversion is
[elpa] externals/org ffd832d5d6 06/14: org-manual: Update #+include block parsing
branch: externals/org
commit ffd832d5d63549d054feb93b1e076efcc243ac84
Author: TEC
Commit: Ihor Radchenko
org-manual: Update #+include block parsing
* doc/org-manual.org (Include Files): Mention that block names starting
with ":" will need to be quoted, and reformat the paragraph for clarity
while editing the mention of block name.
---
doc/org-manual.org | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index d19f9b303b..77ae185468 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -12180,16 +12180,15 @@ example, to include your =.emacs= file, you could use:
: #+INCLUDE: "~/.emacs" src emacs-lisp
#+texinfo: @noindent
-The first parameter is the file name to include. The optional second
-parameter specifies the block type: =example=, =export= or =src=. The
-optional third parameter specifies the source code language to use for
-formatting the contents. This is relevant to both =export= and =src=
-block types.
-
-If an included file is specified as having a markup language, Org
-neither checks for valid syntax nor changes the contents in any way.
-For example and source blocks, Org code-escapes the contents before
-inclusion.
+There are three positional arguments after the include keyword, they are:
+1. The file name, this is the sole mandatory argument. Org neither
+ checks for correctness or validates the content in any way.
+2. The block name to wrap the file content in. When this is
+ =example=, =export=, or =src= the content is escaped by
+ ~org-escape-code-in-string~. Arbitrary block names may be given,
+ however block names starting with =:= must be quoted, i.e. =":name"=.
+3. The source code language to use for formatting the contents. This is
relevant
+ to both =export= and =src= block types.
#+cindex: @samp{minlevel}, include
If an included file is not specified as having any markup language,
[elpa] externals/substitute d4c0a123e8 2/3: Merge pull request #1 from wcy123/fix-compilation-warning
branch: externals/substitute commit d4c0a123e8994f81dc7e658417f39c3774d91e9e Merge: df1d0dee11 f245a25428 Author: Protesilaos Stavrou Commit: GitHub Merge pull request #1 from wcy123/fix-compilation-warning fix compilation warning. --- substitute.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substitute.el b/substitute.el index 76f30b92c8..47f799cc57 100644 --- a/substitute.el +++ b/substitute.el @@ -34,7 +34,7 @@ ;;; Code: (require 'thingatpt) - +(require 'subr-x) (defgroup substitute nil "Efficiently replace targets in the buffer or context." :group 'editing)
[elpa] externals/org ddca762329 01/14: org-element--cache-verify-element: Format all the elements in warning
branch: externals/org commit ddca762329b89ebcf656effd8e327ee9e26723de Author: Ihor Radchenko Commit: Ihor Radchenko org-element--cache-verify-element: Format all the elements in warning * lisp/org-element.el (org-element--cache-verify-element): Use `org-element--format-element' to print all the elements. --- lisp/org-element.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/org-element.el b/lisp/org-element.el index ccecec342f..b9e93f60e1 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -7208,9 +7208,9 @@ The element is: %S\n The real element is: %S\n Cache around :begin:\n%S\n%S\n%S" "no" "yes") (org-element--format-element element) (org-element--format-element real-element) - (org-element--cache-find (1- (org-element-property :begin real-element))) - (car (org-element--cache-find (org-element-property :begin real-element) 'both)) - (cdr (org-element--cache-find (org-element-property :begin real-element) 'both))) + (org-element--format-element (org-element--cache-find (1- (org-element-property :begin real-element + (org-element--format-element (car (org-element--cache-find (org-element-property :begin real-element) 'both))) + (org-element--format-element (cdr (org-element--cache-find (org-element-property :begin real-element) 'both (org-element-cache-reset)) ;;; Cache persistence
[elpa] externals/substitute updated (df1d0dee11 -> 66f3ad93c2)
elpasync pushed a change to branch externals/substitute. from df1d0dee11 Re-indent and bump version for new package build new f245a25428 fix compilation warning. new d4c0a123e8 Merge pull request #1 from wcy123/fix-compilation-warning new 66f3ad93c2 Wrap require for subr-x in 'eval-when-compile' Summary of changes: substitute.el | 1 + 1 file changed, 1 insertion(+)
[elpa] externals/substitute 66f3ad93c2 3/3: Wrap require for subr-x in 'eval-when-compile'
branch: externals/substitute commit 66f3ad93c257c90982767d163ed593e8c40fc6dd Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Wrap require for subr-x in 'eval-when-compile' --- substitute.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/substitute.el b/substitute.el index 47f799cc57..a1170c829a 100644 --- a/substitute.el +++ b/substitute.el @@ -34,7 +34,8 @@ ;;; Code: (require 'thingatpt) -(require 'subr-x) +(eval-when-compile (require 'subr-x)) + (defgroup substitute nil "Efficiently replace targets in the buffer or context." :group 'editing)
[elpa] externals/org 0af74d33a7 03/14: org-manual: Fix typos in print_bibliography kwd
branch: externals/org commit 0af74d33a776bbf4a87304cd1755b273abb6d279 Author: TEC Commit: Ihor Radchenko org-manual: Fix typos in print_bibliography kwd * doc/org-manual.org (Bibliography options in the "biblatex" and "csl" export processors): In some example Org content, the "+" in the keyword prefix "#+" was missing. --- doc/org-manual.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/org-manual.org b/doc/org-manual.org index ce32f77408..d19f9b303b 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -17133,13 +17133,13 @@ The "biblatex" and "csl" export processors support bibliography options through a property list attached to the =PRINT_BIBLIOGRAPHY= keyword. For example, -: #print_bibliography: :keyword algebra :type book +: #+print_bibliography: :keyword algebra :type book Values including spaces must be surrounded with double quotes. If you need to use a key multiple times, you can separate its values with commas, but without any space in-between: -: #print_bibliography: :keyword "algebraic logic" :nottype article,book +: #+print_bibliography: :keyword "algebraic logic" :nottype article,book The "biblatex" export processor accepts all options supported by BibLaTeX's ~\printbibliography~ command, while the "csl" processor
[elpa] externals/org 506989bed5 07/14: ox: Improve #+include parsing docstring
branch: externals/org commit 506989bed58122bc8994051d8e1c0b8947408c14 Author: TEC Commit: Ihor Radchenko ox: Improve #+include parsing docstring * lisp/ox.el (org-export-parse-include-value): Actually describe the parsing behaviour of the function in the docstring. --- lisp/ox.el | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lisp/ox.el b/lisp/ox.el index 3ff7799b40..759bd7875d 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -3353,7 +3353,21 @@ not have `buffer-file-name' assigned." footnotes (defun org-export-parse-include-value (value &optional dir) - "Extract the various parameters from #+include: VALUE." + "Extract the various parameters from #+include: VALUE. + +More specifically, this extracts the following parameters to a +plist: :file, :coding-system, :location, :only-contents, :lines, +:env, :minlevel, :args, and :block. + +The :file parameter is expanded relative to DIR. + +The :file, :block, and :args parameters are extracted +positionally, while the remaining parameters are extracted as +plist-style keywords. + +Any remaining unmatched content is passed through +`org-babel-parse-header-arguments' (without evaluation) and +provided as the :unmatched parameter." (let* ((ind (org-current-text-indentation)) location (coding-system
[elpa] externals/substitute f245a25428 1/3: fix compilation warning.
branch: externals/substitute commit f245a254281fa38e95b329749548bce38ce8e11a Author: Wang Chunye Commit: Wang Chunye fix compilation warning. when byte-compile this file without load subr-x, there is a warning message, because if-let* is defined in subr-x --- substitute.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substitute.el b/substitute.el index 76f30b92c8..47f799cc57 100644 --- a/substitute.el +++ b/substitute.el @@ -34,7 +34,7 @@ ;;; Code: (require 'thingatpt) - +(require 'subr-x) (defgroup substitute nil "Efficiently replace targets in the buffer or context." :group 'editing)
[elpa] externals/org b84018633e 13/14: ox-latex: Split org-latex-compile into two funs
branch: externals/org commit b84018633eaebb08b90fca12237b0b892d19a528 Author: TEC Commit: Ihor Radchenko ox-latex: Split org-latex-compile into two funs * lisp/ox-latex.el (org-latex-compile): Split off the postprocessing in `org-latex-compile' into a new function, `org-latex-compile--postprocess'. --- lisp/ox-latex.el | 39 +++ 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 330007eba9..156940703a 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -4301,25 +4301,32 @@ produced." (outfile (org-compile-file texfile process "pdf" (format "See %S for details" log-buf-name) log-buf spec))) -(unless snippet - (when org-latex-remove-logfiles - (mapc #'delete-file - (directory-files - (file-name-directory outfile) - t - (concat (regexp-quote (file-name-base outfile)) - "\\(?:\\.[0-9]+\\)?\\." - (regexp-opt org-latex-logfiles-extensions)) - t))) - (let ((warnings (org-latex--collect-warnings log-buf))) - (message (concat "PDF file produced" -(cond - ((eq warnings 'error) " with errors.") - (warnings (concat " with warnings: " warnings)) - (t ".")) +(org-latex-compile--postprocess outfile log-buf snippet) ;; Return output file name. outfile)) +(defun org-latex-compile--postprocess (outfile log-buf &optional snippet) + "Process the results of creating OUTFILE via LaTeX compilation. +Warnings and errors are collected from LOG-BUF. +When SNIPPET is nil and `org-latex-remove-logfiles' non-nil, +log files (as specified by `org-latex-logfiles-extensions') are deleted." + (unless snippet +(when org-latex-remove-logfiles + (mapc #'delete-file +(directory-files + (file-name-directory outfile) + t + (concat (regexp-quote (file-name-base outfile)) + "\\(?:\\.[0-9]+\\)?\\." + (regexp-opt org-latex-logfiles-extensions)) + t))) +(let ((warnings (org-latex--collect-warnings log-buf))) + (message (concat "PDF file produced" + (cond +((eq warnings 'error) " with errors.") +(warnings (concat " with warnings: " warnings)) +(t "."))) + (defun org-latex--collect-warnings (buffer) "Collect some warnings from \"pdflatex\" command output. BUFFER is the buffer containing output. Return collected
[elpa] externals/hyperbole 74ad94b114: Silence byte compilation warnings for interaction-log (#298)
branch: externals/hyperbole
commit 74ad94b11478fb3003c03a56832c84ccb37b22e2
Author: Mats Lidell
Commit: GitHub
Silence byte compilation warnings for interaction-log (#298)
---
ChangeLog | 6 ++
hypb.el | 29 -
2 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 35113e2102..20005090ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-01-22 Mats Lidell
+
+* hypb.el: Add variable and function declarations for package
+interaction-log to silence byte compilation warnings.
+(hypb:activate-interaction-log-mode): Use cl-pushnew.
+
2023-01-20 Mats Lidell
* Remove docstring warnings.
diff --git a/hypb.el b/hypb.el
index f51de655cc..912d87cd8b 100644
--- a/hypb.el
+++ b/hypb.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 6-Oct-91 at 03:42:38
-;; Last-Mod: 10-Dec-22 at 00:52:04 by Mats Lidell
+;; Last-Mod: 22-Jan-23 at 16:57:36 by Mats Lidell
;;
;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -17,7 +17,7 @@
;;; Other required Elisp libraries
;;;
-(eval-and-compile (mapc #'require '(compile hversion hact locate)))
+(eval-and-compile (mapc #'require '(compile hversion hact locate cl-lib)))
;;;
;;; Public variables
@@ -51,6 +51,26 @@ It must end with a space."
(declare-function helm-apropos "ext:helm")
(declare-function devdocs-lookup "ext:devdocs")
+;; interaction-log
+(defvar ilog-buffer-name)
+(defvar ilog-display-state)
+(defvar ilog-idle-time)
+(defvar ilog-insertion-timer)
+(defvar ilog-print-lambdas)
+(defvar ilog-self-insert-command-regexps)
+(defvar ilog-truncation-timer)
+(defvar interaction-log-mode)
+(defvar interaction-log-mode-hook)
+
+(declare-function ilog-note-buffer-change "ext:interaction-log")
+(declare-function ilog-post-command "ext:interaction-log")
+(declare-function ilog-record-this-command "ext:interaction-log")
+(declare-function ilog-show-in-other-frame "ext:interaction-log")
+(declare-function ilog-timer-function "ext:interaction-log")
+(declare-function ilog-toggle-view "ext:interaction-log")
+(declare-function ilog-truncate-log-buffer "ext:interaction-log")
+(declare-function interaction-log-mode "ext:interaction-log")
+
;;;
;;; Public functions
;;;
@@ -78,7 +98,7 @@ This displays a clean log of Emacs keys used and commands
executed."
(setq ilog-print-lambdas 'not-compiled)
;; Omit display of some lower-level Hyperbole commands for cleaner logs
- (mapc (lambda (cmd-str) (pushnew (format "^%s$" cmd-str)
ilog-self-insert-command-regexps))
+ (mapc (lambda (cmd-str) (cl-pushnew (format "^%s$" cmd-str)
ilog-self-insert-command-regexps))
'("hyperbole" "hui:menu-enter"))
;; Redefine the mode to display commands on post-command-hook rather
@@ -99,8 +119,7 @@ This displays a clean log of Emacs keys used and commands
executed."
(setq ilog-truncation-timer (run-at-time 30 30
#'ilog-truncate-log-buffer))
(setq ilog-insertion-timer (run-with-timer ilog-idle-time
ilog-idle-time
#'ilog-timer-function))
- (message "Interaction Log: started logging in %s" ilog-buffer-name)
- (easy-menu-add ilog-minor-mode-menu))
+ (message "Interaction Log: started logging in %s" ilog-buffer-name))
(remove-hook 'after-change-functions #'ilog-note-buffer-change)
(remove-hook 'post-command-hook #'ilog-record-this-command)
(remove-hook 'post-command-hook #'ilog-post-command)
[elpa] externals/org ce4f7db3c1: test-ob-shell: Fix test failures on Emacs 26
branch: externals/org
commit ce4f7db3c1d244e9b02e5974b19e9214b35ac9a6
Author: Ihor Radchenko
Commit: Ihor Radchenko
test-ob-shell: Fix test failures on Emacs 26
* testing/lisp/test-ob-shell.el
(test-ob-shell/remote-with-stdin-or-cmdline):
Work around non-local exit when running tests on Emacs 26. Do no call
`kill-matching-buffers' unless Emacs in newer.
---
testing/lisp/test-ob-shell.el | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index 5318425e60..fe975771ce 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -251,8 +251,10 @@ echo ${table[spaghetti]}
(org-trim (org-babel-execute-src-block
(expected (concat "ARGS: --verbose 23 71"
"\nhello tramp from " (file-local-name
default-directory
-(if (should (equal result expected))
-(kill-matching-buffers (format "\\*tramp/mock\\s-%s\\*"
system-name) t t)))
+(if (should (equal result expected)) nil
+ ;; FIXME: Fails with non-local exit on Emacs 26.
+ (when (version<= "27" emacs-version)
+(kill-matching-buffers (format "\\*tramp/mock\\s-%s\\*"
system-name) t t
(ert-deftest test-ob-shell/results-table ()
"Test :results table."
[nongnu] elpa/eat e12a5be607 2/3: ; Update copyright years
branch: elpa/eat
commit e12a5be6076647d4efbd3c4b41720079e1fbdb3e
Author: Akib Azmain Turja
Commit: Akib Azmain Turja
; Update copyright years
* eat.el:
* eat.texi:
Update copyright year to add 2023.
---
eat.el | 2 +-
eat.texi | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/eat.el b/eat.el
index 8ba13d3263..c948c6a25b 100644
--- a/eat.el
+++ b/eat.el
@@ -1,6 +1,6 @@
;;; eat.el --- Emulate A Terminal, in a region, in a buffer and in Eshell -*-
lexical-binding: t; -*-
-;; Copyright (C) 2022 Akib Azmain Turja.
+;; Copyright (C) 2022, 2023 Akib Azmain Turja.
;; Author: Akib Azmain Turja
;; Created: 2022-08-15
diff --git a/eat.texi b/eat.texi
index 7fa83f7569..aa2f108f5b 100644
--- a/eat.texi
+++ b/eat.texi
@@ -2,7 +2,7 @@
@comment %**start of header
@setfilename eat.info
-@set UPDATED 10 December 2022
+@set UPDATED 22 January 2023
@set EDITION 0.4
@set VERSION 0.4
@documentencoding UTF-8
@@ -18,7 +18,7 @@
This manual is for Eat (version @value{VERSION}, @value{UPDATED}), a
terminal emulator for Emacs.
-Copyright @copyright{} 2022 Akib Azmain Turja.
+Copyright @copyright{} 2022, 2023 Akib Azmain Turja.
@quotation
Permission is granted to copy, distribute and/or modify this document
[nongnu] elpa/eat d66c55a285 3/3: ; Release version 0.5
branch: elpa/eat commit d66c55a2855f6a60f6184135d95d2d5f4b64535e Author: Akib Azmain Turja Commit: Akib Azmain Turja ; Release version 0.5 * eat.el: * eat.texi: Bump version. * ChangeLog: Update. --- ChangeLog | 57 - eat.el| 2 +- eat.texi | 4 ++-- 3 files changed, 59 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75d4d64107..453382d576 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,58 @@ +2023-01-22 Akib Azmain Turja + + Add many more semi-char mode exceptions + + * eat.el (eat-semi-char-non-bound-keys) + (eat-eshell-semi-char-non-bound-keys): Add 81 more keys. + +2023-01-19 Akib Azmain Turja + + Auto reload Eat when "semi-char" map is customized + + * eat.el (eat--load-file-path, eat--being-loaded): New + variable. + * eat.el (eat-semi-char-non-bound-keys) + (eat-eshell-semi-char-non-bound-keys): Reload Eat when + customized. Document what to do if changed from Lisp. + * eat.el (eat-update-semi-char-mode-map) + (eat-eshell-update-semi-char-mode-map): New function. + * eat.el (eat-reload): New command. + * eat.texi (Semi-char Mode): Document what to do if the lists + of not bound keys are changed from Lisp. + +2023-01-18 Akib Azmain Turja + + Document some new user options + + * eat.texi (Semi-char Mode): Document + 'eat-semi-char-non-bound-keys' and + 'eat-eshell-semi-char-non-bound-keys'. + * eat.texi (Input Invisible): New section. + +2023-01-16 Akib Azmain Turja + + Allow modifying semi-char key exceptions + + * eat.el (eat-semi-char-non-bound-keys) + (eat-eshell-semi-char-non-bound-keys): New user option. + * eat.el (eat--prepare-semi-char-mode-map) + (eat--eshell-prepare-semi-char-mode-map): New function. + * eat.el (eat-semi-char-mode-map): Use + 'eat--prepare-semi-char-mode-map' to make the keymap. + * eat.el (eat-eshell-semi-char-mode-map): Use + 'eat--eshell-prepare-semi-char-mode-map' to make the keymap. + +2023-01-15 Akib Azmain Turja + + Allow pasting from parent XTerm to Eat terminal + + * eat.el (eat-xterm-paste): New command. + * eat.el (eat-mode-map, eat-eshell-emacs-mode-map): Bind +to 'ignore'. + * eat.el (eat-semi-char-mode-map, eat-char-mode-map) + (eat-eshell-semi-char-mode-map, eat-eshell-char-mode-map): Bind +to 'eat-xterm-paste'. + 2022-12-28 Akib Azmain Turja Don't error while handling the sequence '\e[>c' @@ -930,7 +985,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2022 Akib Azmain Turja. + Copyright (C) 2022-2023 Akib Azmain Turja. This file is not part of GNU Emacs. diff --git a/eat.el b/eat.el index c948c6a25b..74844c4ff5 100644 --- a/eat.el +++ b/eat.el @@ -4,7 +4,7 @@ ;; Author: Akib Azmain Turja ;; Created: 2022-08-15 -;; Version: 0.4 +;; Version: 0.5 ;; Package-Requires: ((emacs "28.1")) ;; Keywords: terminals processes ;; Homepage: https://codeberg.org/akib/emacs-eat diff --git a/eat.texi b/eat.texi index aa2f108f5b..d0c09c660b 100644 --- a/eat.texi +++ b/eat.texi @@ -3,8 +3,8 @@ @comment %**start of header @setfilename eat.info @set UPDATED 22 January 2023 -@set EDITION 0.4 -@set VERSION 0.4 +@set EDITION 0.5 +@set VERSION 0.5 @documentencoding UTF-8 @codequotebacktick on @codequoteundirected on
[nongnu] elpa/eat updated (417e7d2362 -> d66c55a285)
elpasync pushed a change to branch elpa/eat. from 417e7d2362 Auto reload Eat when "semi-char" map is customized new ac954032c6 Add many more semi-char mode exceptions new e12a5be607 ; Update copyright years new d66c55a285 ; Release version 0.5 Summary of changes: ChangeLog | 57 - eat.el| 52 eat.texi | 8 3 files changed, 108 insertions(+), 9 deletions(-)
[nongnu] elpa/eat ac954032c6 1/3: Add many more semi-char mode exceptions
branch: elpa/eat commit ac954032c6c51ee21f45cea516c5c6b17899a669 Author: Akib Azmain Turja Commit: Akib Azmain Turja Add many more semi-char mode exceptions * eat.el (eat-semi-char-non-bound-keys) (eat-eshell-semi-char-non-bound-keys): Add 81 more keys. --- eat.el | 48 ++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/eat.el b/eat.el index 010706c5bf..8ba13d3263 100644 --- a/eat.el +++ b/eat.el @@ -165,7 +165,29 @@ FUNCTION Call FUNCTION with the command and arguments (using (defcustom eat-semi-char-non-bound-keys '([?\C-x] [?\C-\\] [?\C-q] [?\C-g] [?\C-h] [?\e ?\C-c] [?\C-u] -[?\e ?x] [?\e ?:] [?\e ?!] [?\e ?&]) +[?\e ?x] [?\e ?:] [?\e ?!] [?\e ?&] +[C-insert] [M-insert] [S-insert] [C-M-insert] +[C-S-insert] [M-S-insert] [C-M-S-insert] +[C-delete] [M-delete] [S-delete] [C-M-delete] +[C-S-delete] [M-S-delete] [C-M-S-delete] +[C-deletechar] [M-deletechar] +[S-deletechar] [C-M-deletechar] [C-S-deletechar] +[M-S-deletechar] [C-M-S-deletechar] +[C-up] [C-down] [C-right] [C-left] +[M-up] [M-down] [M-right] [M-left] +[S-up] [S-down] [S-right] [S-left] +[C-M-up] [C-M-down] [C-M-right] [C-M-left] +[C-S-up] [C-S-down] [C-S-right] [C-S-left] +[M-S-up] [M-S-down] [M-S-right] [M-S-left] +[C-M-S-up] [C-M-S-down] [C-M-S-right] [C-M-S-left] +[C-home] [M-home] [S-home] [C-M-home] [C-S-home] +[M-S-home] [C-M-S-home] +[C-end] [M-end] [S-end] [C-M-end] [C-S-end] +[M-S-end] [C-M-S-end] +[C-prior] [M-prior] [S-prior] [C-M-prior] +[C-S-prior] [M-S-prior] [C-M-S-prior] +[C-next] [M-next] [S-next] [C-M-next] [C-S-next] +[M-S-next] [C-M-S-next]) "List of keys not bound in Eat \"semi-char\" mode. Keys appearing in this list are not bound to send the key to terminal. @@ -189,7 +211,29 @@ make the changes effective." (defcustom eat-eshell-semi-char-non-bound-keys '([?\C-\\] [?\C-x] [?\C-g] [?\C-h] [?\e ?\C-c] [?\C-u] [?\C-q] -[?\e ?x] [?\e ?:] [?\e ?!] [?\e ?&]) +[?\e ?x] [?\e ?:] [?\e ?!] [?\e ?&] +[C-insert] [M-insert] [S-insert] [C-M-insert] +[C-S-insert] [M-S-insert] [C-M-S-insert] +[C-delete] [M-delete] [S-delete] [C-M-delete] +[C-S-delete] [M-S-delete] [C-M-S-delete] +[C-deletechar] [M-deletechar] +[S-deletechar] [C-M-deletechar] [C-S-deletechar] +[M-S-deletechar] [C-M-S-deletechar] +[C-up] [C-down] [C-right] [C-left] +[M-up] [M-down] [M-right] [M-left] +[S-up] [S-down] [S-right] [S-left] +[C-M-up] [C-M-down] [C-M-right] [C-M-left] +[C-S-up] [C-S-down] [C-S-right] [C-S-left] +[M-S-up] [M-S-down] [M-S-right] [M-S-left] +[C-M-S-up] [C-M-S-down] [C-M-S-right] [C-M-S-left] +[C-home] [M-home] [S-home] [C-M-home] [C-S-home] +[M-S-home] [C-M-S-home] +[C-end] [M-end] [S-end] [C-M-end] [C-S-end] +[M-S-end] [C-M-S-end] +[C-prior] [M-prior] [S-prior] [C-M-prior] +[C-S-prior] [M-S-prior] [C-M-S-prior] +[C-next] [M-next] [S-next] [C-M-next] [C-S-next] +[M-S-next] [C-M-S-next]) "List of keys not bound in Eat-Eshell \"semi-char\" mode. Keys appearing in this list are not bound to send the key to terminal.
[nongnu] elpa/workroom updated (dcd02cb06e -> b6b06463ee)
elpasync pushed a change to branch elpa/workroom. from dcd02cb06e Document new option: workroom-default-buffer-name new c41e4329b1 Update copyright years to add 2023 new b6b06463ee Bump version to 2.3 Summary of changes: workroom.el | 4 ++-- workroom.texi | 10 +- 2 files changed, 7 insertions(+), 7 deletions(-)
[nongnu] elpa/workroom c41e4329b1 1/2: Update copyright years to add 2023
branch: elpa/workroom
commit c41e4329b19c263f26ce5bcdc5fbce64a5b72cdc
Author: Akib Azmain Turja
Commit: Akib Azmain Turja
Update copyright years to add 2023
---
workroom.el | 2 +-
workroom.texi | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/workroom.el b/workroom.el
index 4f533c37e4..656734be15 100644
--- a/workroom.el
+++ b/workroom.el
@@ -1,6 +1,6 @@
;;; workroom.el --- Named rooms for work without irrelevant distracting
buffers -*- lexical-binding: t; -*-
-;; Copyright (C) 2022 Akib Azmain Turja.
+;; Copyright (C) 2022, 2023 Akib Azmain Turja.
;; Author: Akib Azmain Turja
;; Version: 2.2.5
diff --git a/workroom.texi b/workroom.texi
index 49b86f98b5..f905786b56 100644
--- a/workroom.texi
+++ b/workroom.texi
@@ -2,8 +2,8 @@
@comment %**start of header
@setfilename workroom.info
-@set UPDATED 14 November 2022
-@set UPDATED-MONTH November 2022
+@set UPDATED 22 January 2023
+@set UPDATED-MONTH January 2023
@set EDITION 2.2.5
@set VERSION 2.2.5
@documentencoding UTF-8
@@ -19,7 +19,7 @@
This manual is for Workroom (version @value{VERSION},
@value{UPDATED}), a workspace manager for Emacs.
-Copyright @copyright{} 2022 Akib Azmain Turja.
+Copyright @copyright{} 2022, 2023 Akib Azmain Turja.
@quotation
Permission is granted to copy, distribute and/or modify this document
[nongnu] elpa/workroom b6b06463ee 2/2: Bump version to 2.3
branch: elpa/workroom commit b6b06463ee7b5d66ec56fc1195836c0c27c6b6f4 Author: Akib Azmain Turja Commit: Akib Azmain Turja Bump version to 2.3 --- workroom.el | 2 +- workroom.texi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workroom.el b/workroom.el index 656734be15..30c4030d1f 100644 --- a/workroom.el +++ b/workroom.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2022, 2023 Akib Azmain Turja. ;; Author: Akib Azmain Turja -;; Version: 2.2.5 +;; Version: 2.3 ;; Package-Requires: ((emacs "25.1") (project "0.3.0") (compat "28.1.2.2")) ;; Keywords: tools, convenience ;; URL: https://codeberg.org/akib/emacs-workroom diff --git a/workroom.texi b/workroom.texi index f905786b56..f342de0e21 100644 --- a/workroom.texi +++ b/workroom.texi @@ -4,8 +4,8 @@ @setfilename workroom.info @set UPDATED 22 January 2023 @set UPDATED-MONTH January 2023 -@set EDITION 2.2.5 -@set VERSION 2.2.5 +@set EDITION 2.3 +@set VERSION 2.3 @documentencoding UTF-8 @codequotebacktick on @codequoteundirected on
[elpa] externals/org a9ee43a124: ox: Fix parsing of example #+includes
branch: externals/org commit a9ee43a1248f1daabb4aedb793314a223b2d4ba7 Author: TEC Commit: Ihor Radchenko ox: Fix parsing of example #+includes * lisp/ox.el (org-export-parse-include-value): Since the example environment regexp does not contain a capture group, we can not assume we can call `replace-match' on the first capture group. Before doing so, check that the capture group indeed exists. --- lisp/ox.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/ox.el b/lisp/ox.el index 759bd7875d..6fd72a2232 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -3420,7 +3420,8 @@ provided as the :unmatched parameter." :org-include-induced-level (args (and (eq env 'literal) (prog1 (match-string 1 value) - (setq value (replace-match "" nil nil value 1) + (when (match-string 1 value) +(setq value (replace-match "" nil nil value 1)) (block (and (or (string-match "\"\\(\\S-+\\)\"" value) (string-match "\\<\\(\\S-+\\)\\>" value)) (or (= (match-beginning 0) 0)
[elpa] externals/tempel adb99a74ab: tempel-complete: Add :company-doc-buffer function
branch: externals/tempel
commit adb99a74abdb327d579f064b4326ec4b6f8607dc
Author: Daniel Mendler
Commit: Daniel Mendler
tempel-complete: Add :company-doc-buffer function
This is useful in combination with corfu-popupinfo-mode.
---
tempel.el | 49 ++---
1 file changed, 30 insertions(+), 19 deletions(-)
diff --git a/tempel.el b/tempel.el
index aeb5901150..1763906366 100644
--- a/tempel.el
+++ b/tempel.el
@@ -155,31 +155,40 @@ may be named with `tempel--name' or carry an evaluatable
Lisp expression
"M-" #'tempel-previous
"M-" #'tempel-next)
-(defun tempel--print-element (elt)
- "Return string representation of template ELT."
- (pcase elt
-('nil nil)
-((pred stringp) elt)
-(`(s ,name) (symbol-name name))
-(`(,(or 'p 'P) ,_ ,name . ,noinsert)
- (and (not (car noinsert)) (symbol-name name)))
-((or 'n 'n> '> '& '% 'o) " ")
-(_ "_")))
+(defun tempel--print-template (elts)
+ "Print template ELTS."
+ (cl-loop
+ for elt in elts until (keywordp elt) concat
+ (pcase elt
+ ('nil nil)
+ ((pred stringp) (propertize elt 'face 'completions-annotations))
+ (`(s ,name) (propertize (symbol-name name) 'face
'completions-annotations))
+ (`(,(or 'p 'P) ,_ ,name . ,noinsert)
+ (and (not (car noinsert))
+ (propertize (symbol-name name) 'face 'completions-annotations)))
+ ('> #(" " 0 1 (face completions-annotations)))
+ ((or 'n 'n> '& '% 'o) #("\n" 0 1 (face completions-annotations)))
+ (_ #("_" 0 1 (face shadow))
(defun tempel--annotate (templates width ellipsis sep name)
"Annotate template NAME given the list of TEMPLATES.
WIDTH, SEP and ELLIPSIS configure the formatting."
(when-let ((name (intern-soft name))
(elts (cdr (assoc name templates
-(concat sep
-(truncate-string-to-width
- (replace-regexp-in-string
- "_+" #("_" 0 1 (face shadow))
- (propertize (replace-regexp-in-string
- "\\s-+" " "
- (mapconcat #'tempel--print-element elts ""))
- 'face 'completions-annotations))
- width 0 ?\s ellipsis
+(concat sep (truncate-string-to-width
+ (replace-regexp-in-string
+ "[ \t\n\r]+" #(" " 0 1 (face completions-annotations))
+ (tempel--print-template elts))
+ width 0 ?\s ellipsis
+
+(defun tempel--doc-buffer (templates name)
+ "Create doc buffer for template NAME given the list of TEMPLATES."
+ (when-let ((name (intern-soft name))
+ (elts (cdr (assoc name templates
+(with-current-buffer (get-buffer-create " *tempel-doc*")
+ (erase-buffer)
+ (insert (tempel--print-template elts))
+ (current-buffer
(defun tempel--delete-word (word)
"Delete WORD before point."
@@ -674,6 +683,8 @@ If INTERACTIVE is nil the function acts like a capf."
:company-kind (lambda (_) 'snippet)
:exit-function (apply-partially #'tempel--exit templates region)
:company-prefix-length (and tempel-trigger-prefix t)
+ :company-doc-buffer
+ (apply-partially #'tempel--doc-buffer templates)
:annotation-function
(and tempel-complete-annotation
(apply-partially #'tempel--annotate
[elpa] externals-release/org updated (15c519b84c -> e37e9b692e)
elpasync pushed a change to branch externals-release/org. from 15c519b84c Do not assume that `org-string-width' preserves match data new 0ab9bc138f Backport commit 920a7d38e from Emacs new ebaf1c9c04 Backport commit 347933377 from Emacs new 6ae5430962 Merge branch 'km/from-emacs-29' into bugfix new e37e9b692e org-persist: Silence recent byte-compiler warning Summary of changes: lisp/ob-ruby.el | 5 ++--- lisp/org-mouse.el | 4 ++-- lisp/org-persist.el | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-)
[elpa] externals-release/org 6ae5430962 3/4: Merge branch 'km/from-emacs-29' into bugfix
branch: externals-release/org commit 6ae54309624bbf7ba0a4056d0031694723fda80e Merge: 15c519b84c ebaf1c9c04 Author: Kyle Meyer Commit: Kyle Meyer Merge branch 'km/from-emacs-29' into bugfix --- lisp/ob-ruby.el | 5 ++--- lisp/org-mouse.el | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el index 03c94b1ba9..b94bc73dd7 100644 --- a/lisp/ob-ruby.el +++ b/lisp/ob-ruby.el @@ -29,11 +29,10 @@ ;; - ruby and irb executables :: https://www.ruby-lang.org/ ;; -;; - ruby-mode :: Can be installed through ELPA, or from -;; https://github.com/eschulte/rinari/raw/master/util/ruby-mode.el +;; - ruby-mode :: Comes with Emacs. ;; ;; - inf-ruby mode :: Can be installed through ELPA, or from -;; https://github.com/eschulte/rinari/raw/master/util/inf-ruby.el +;; https://raw.githubusercontent.com/nonsequitur/inf-ruby/master/inf-ruby.el ;;; Code: diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el index 6a733f09db..3b2c4cba62 100644 --- a/lisp/org-mouse.el +++ b/lisp/org-mouse.el @@ -241,7 +241,7 @@ return `:middle'." (t :middle))) (defun org-mouse-empty-line () - "Return non-nil iff the line contains only white space." + "Return non-nil if the line contains only white space." (save-excursion (beginning-of-line) (looking-at "[ \t]*$"))) (defun org-mouse-next-heading () @@ -283,7 +283,7 @@ keyword as the only argument. If SELECTED is nil, then all items are normal menu items. If SELECTED is a function, then each item is a checkbox, which is -enabled for a given keyword iff (funcall SELECTED keyword) return +enabled for a given keyword if (funcall SELECTED keyword) return non-nil. If SELECTED is neither nil nor a function, then the items are radio buttons. A radio button is enabled for the keyword `equal' to SELECTED.
[elpa] externals-release/org e37e9b692e 4/4: org-persist: Silence recent byte-compiler warning
branch: externals-release/org commit e37e9b692e5992daee7a767b4d9707b2b582af20 Author: Kyle Meyer Commit: Kyle Meyer org-persist: Silence recent byte-compiler warning * lisp/org-persist.el: Bind pp-use-max-width to silence byte-compiler warning about unused lexical variable. Note that loading pp.el upfront rather than relying on the pp function being autoloaded would also eliminate the warning, but that would only work on Emacs 29 or later because earlier versions do not have the pp-use-max-width option. --- lisp/org-persist.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org-persist.el b/lisp/org-persist.el index a96f0fdc90..a0652b99c5 100644 --- a/lisp/org-persist.el +++ b/lisp/org-persist.el @@ -160,6 +160,8 @@ (declare-function org-next-visible-heading "org" (arg)) (declare-function org-at-heading-p "org" (&optional invisible-not-ok)) +;; Silence byte-compiler (used in `org-persist--write-elisp-file'). +(defvar pp-use-max-width) (defconst org-persist--storage-version "3.1" "Persistent storage layout version.")
[elpa] externals-release/org ebaf1c9c04 2/4: Backport commit 347933377 from Emacs
branch: externals-release/org commit ebaf1c9c0468bfb06b8499b374beb5c3702b2258 Author: Dmitry Gutov Commit: Kyle Meyer Backport commit 347933377 from Emacs * lisp/ob-ruby.el: Fix outdated comments. lisp/org/ob-ruby.el: Fix outdated comments. 34793337783489297313c67d4a56682514877597 Dmitry Gutov Fri Jan 20 23:32:21 2023 +0200 --- lisp/ob-ruby.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el index 03c94b1ba9..b94bc73dd7 100644 --- a/lisp/ob-ruby.el +++ b/lisp/ob-ruby.el @@ -29,11 +29,10 @@ ;; - ruby and irb executables :: https://www.ruby-lang.org/ ;; -;; - ruby-mode :: Can be installed through ELPA, or from -;; https://github.com/eschulte/rinari/raw/master/util/ruby-mode.el +;; - ruby-mode :: Comes with Emacs. ;; ;; - inf-ruby mode :: Can be installed through ELPA, or from -;; https://github.com/eschulte/rinari/raw/master/util/inf-ruby.el +;; https://raw.githubusercontent.com/nonsequitur/inf-ruby/master/inf-ruby.el ;;; Code:
[elpa] externals/org updated (a9ee43a124 -> e84077ded3)
elpasync pushed a change to branch externals/org. from a9ee43a124 ox: Fix parsing of example #+includes new 0ab9bc138f Backport commit 920a7d38e from Emacs new ebaf1c9c04 Backport commit 347933377 from Emacs new 6ae5430962 Merge branch 'km/from-emacs-29' into bugfix new e37e9b692e org-persist: Silence recent byte-compiler warning new e84077ded3 Merge branch 'bugfix' Summary of changes: lisp/ob-ruby.el | 5 ++--- lisp/org-mouse.el | 4 ++-- lisp/org-persist.el | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-)
[elpa] externals-release/org 0ab9bc138f 1/4: Backport commit 920a7d38e from Emacs
branch: externals-release/org commit 0ab9bc138f531a70ebacf98e1f205313d6a35ce6 Author: Stefan Kangas Commit: Kyle Meyer Backport commit 920a7d38e from Emacs ; Fix typos 920a7d38e96134289393b7bfcc3a7b88be73925b Stefan Kangas Sun Jan 15 02:14:19 2023 +0100 [km] These were likely not typos but intended as an abbreviation for "if and only if". However, using "if" works fine in these spots, so let's just go along with the change. (These may end up being reverted on Emacs's side; see emacs-devel <83a62k72lx@gnu.org>, 01-15.) --- lisp/org-mouse.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el index 6a733f09db..3b2c4cba62 100644 --- a/lisp/org-mouse.el +++ b/lisp/org-mouse.el @@ -241,7 +241,7 @@ return `:middle'." (t :middle))) (defun org-mouse-empty-line () - "Return non-nil iff the line contains only white space." + "Return non-nil if the line contains only white space." (save-excursion (beginning-of-line) (looking-at "[ \t]*$"))) (defun org-mouse-next-heading () @@ -283,7 +283,7 @@ keyword as the only argument. If SELECTED is nil, then all items are normal menu items. If SELECTED is a function, then each item is a checkbox, which is -enabled for a given keyword iff (funcall SELECTED keyword) return +enabled for a given keyword if (funcall SELECTED keyword) return non-nil. If SELECTED is neither nil nor a function, then the items are radio buttons. A radio button is enabled for the keyword `equal' to SELECTED.
[elpa] externals/org e84077ded3: Merge branch 'bugfix'
branch: externals/org commit e84077ded30ef3b094b73765a7b895fa608960d3 Merge: a9ee43a124 e37e9b692e Author: Kyle Meyer Commit: Kyle Meyer Merge branch 'bugfix' --- lisp/ob-ruby.el | 5 ++--- lisp/org-mouse.el | 4 ++-- lisp/org-persist.el | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el index 03c94b1ba9..b94bc73dd7 100644 --- a/lisp/ob-ruby.el +++ b/lisp/ob-ruby.el @@ -29,11 +29,10 @@ ;; - ruby and irb executables :: https://www.ruby-lang.org/ ;; -;; - ruby-mode :: Can be installed through ELPA, or from -;; https://github.com/eschulte/rinari/raw/master/util/ruby-mode.el +;; - ruby-mode :: Comes with Emacs. ;; ;; - inf-ruby mode :: Can be installed through ELPA, or from -;; https://github.com/eschulte/rinari/raw/master/util/inf-ruby.el +;; https://raw.githubusercontent.com/nonsequitur/inf-ruby/master/inf-ruby.el ;;; Code: diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el index 6a733f09db..3b2c4cba62 100644 --- a/lisp/org-mouse.el +++ b/lisp/org-mouse.el @@ -241,7 +241,7 @@ return `:middle'." (t :middle))) (defun org-mouse-empty-line () - "Return non-nil iff the line contains only white space." + "Return non-nil if the line contains only white space." (save-excursion (beginning-of-line) (looking-at "[ \t]*$"))) (defun org-mouse-next-heading () @@ -283,7 +283,7 @@ keyword as the only argument. If SELECTED is nil, then all items are normal menu items. If SELECTED is a function, then each item is a checkbox, which is -enabled for a given keyword iff (funcall SELECTED keyword) return +enabled for a given keyword if (funcall SELECTED keyword) return non-nil. If SELECTED is neither nil nor a function, then the items are radio buttons. A radio button is enabled for the keyword `equal' to SELECTED. diff --git a/lisp/org-persist.el b/lisp/org-persist.el index 385e118115..d1a28497c4 100644 --- a/lisp/org-persist.el +++ b/lisp/org-persist.el @@ -255,6 +255,8 @@ (declare-function org-next-visible-heading "org" (arg)) (declare-function org-at-heading-p "org" (&optional invisible-not-ok)) +;; Silence byte-compiler (used in `org-persist--write-elisp-file'). +(defvar pp-use-max-width) (defconst org-persist--storage-version "3.2" "Persistent storage layout version.")
[elpa] externals/denote 491f81b68b 2/3: Add reverse option to dblock denote-baclinks
branch: externals/denote commit 491f81b68b189db2f8f0711c4ee0e390a6066ee5 Author: Elias Storms Commit: Elias Storms Add reverse option to dblock denote-baclinks --- denote-org-dblock.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/denote-org-dblock.el b/denote-org-dblock.el index 22ec86b11a..c8f595e05e 100644 --- a/denote-org-dblock.el +++ b/denote-org-dblock.el @@ -127,8 +127,8 @@ Used by `org-dblock-update' with PARAMS provided by the dynamic block." ;; Similarly, we can create a 'denote-backlinks' block that inserts ;; links to notes that link to the current note. -;; Note that this block type doesn't take any additional parameters -;; (such as ':missing-only'). +;; This block type takes the following parameters: +;; 1. :reverse t -- reverse sort order (or don't, when nil) ;;;###autoload (defun denote-org-dblock-insert-backlinks () @@ -139,11 +139,12 @@ Used by `org-dblock-update' with PARAMS provided by the dynamic block." (org-dynamic-block-define "denote-backlinks" 'denote-org-dblock-insert-backlinks) -(defun org-dblock-write:denote-backlinks (_params) +(defun org-dblock-write:denote-backlinks (params) "Function to update `denote-backlinks' Org Dynamic blocks. Used by `org-dblock-update' with PARAMS provided by the dynamic block." (when-let* ((file (buffer-file-name)) (id (denote-retrieve-filename-identifier file)) + (denote-link-add-links-sort (plist-get params :reverse)) (files (delete file (denote--retrieve-files-in-xrefs id (insert (denote-link--prepare-links files file nil)) (join-line))) ;; remove trailing empty line
[elpa] externals/denote ad4b9a380a 1/3: Add documentation on rx options for insert links dblock
branch: externals/denote commit ad4b9a380ab59b386d56ddfecb48d15f063f5ffb Author: Elias Storms Commit: Elias Storms Add documentation on rx options for insert links dblock --- denote-org-dblock.el | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/denote-org-dblock.el b/denote-org-dblock.el index a55cdd783c..22ec86b11a 100644 --- a/denote-org-dblock.el +++ b/denote-org-dblock.el @@ -55,7 +55,9 @@ ;; ;; With point at the #+BEGIN: line, pressing 'C-c C-c' will replace the ;; contents of the block with links to notes matching the search -;; ':regexp'. See also the denote manual on 'denote-link-add-links'. +;; ':regexp'. The regular expression can be either a regexp string or +;; a sexp form (the latter is translated via rx). +;; See also the denote manual on 'denote-link-add-links'. ;; ;; Inserting a block can be done via the Org-mode entry point ;; 'org-dynamic-block-insert-dblock' and selecting 'denote-links' from @@ -64,7 +66,8 @@ ;; ;; Org Dynamic blocks of the denote-links type can have the follwoing ;; arguments (in any order): -;; 1. :regexp "string" -- the search input (required) +;; 1. :regexp input-- the search input (required), either as a +;; regexp string or a sexp (in rx notation) ;; 2. :missing-only t -- to only include missing links ;; 3. :reverse t -- reverse sort order (or don't, when nil) ;; 4. :block-name "n" -- to include a name for later processing
[elpa] externals/denote updated (34b4a31f39 -> 823b3b8ba5)
elpasync pushed a change to branch externals/denote. from 34b4a31f39 Add missing custom_id to heading new ad4b9a380a Add documentation on rx options for insert links dblock new 491f81b68b Add reverse option to dblock denote-baclinks new 823b3b8ba5 Merge pull request #130 from EFLS/main Summary of changes: denote-org-dblock.el | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-)
[elpa] externals/denote 823b3b8ba5 3/3: Merge pull request #130 from EFLS/main
branch: externals/denote commit 823b3b8ba5cf5577839b7ed3d293d85714a79967 Merge: 34b4a31f39 491f81b68b Author: Protesilaos Stavrou Commit: GitHub Merge pull request #130 from EFLS/main Minor updates for dblock --- denote-org-dblock.el | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/denote-org-dblock.el b/denote-org-dblock.el index a55cdd783c..c8f595e05e 100644 --- a/denote-org-dblock.el +++ b/denote-org-dblock.el @@ -55,7 +55,9 @@ ;; ;; With point at the #+BEGIN: line, pressing 'C-c C-c' will replace the ;; contents of the block with links to notes matching the search -;; ':regexp'. See also the denote manual on 'denote-link-add-links'. +;; ':regexp'. The regular expression can be either a regexp string or +;; a sexp form (the latter is translated via rx). +;; See also the denote manual on 'denote-link-add-links'. ;; ;; Inserting a block can be done via the Org-mode entry point ;; 'org-dynamic-block-insert-dblock' and selecting 'denote-links' from @@ -64,7 +66,8 @@ ;; ;; Org Dynamic blocks of the denote-links type can have the follwoing ;; arguments (in any order): -;; 1. :regexp "string" -- the search input (required) +;; 1. :regexp input-- the search input (required), either as a +;; regexp string or a sexp (in rx notation) ;; 2. :missing-only t -- to only include missing links ;; 3. :reverse t -- reverse sort order (or don't, when nil) ;; 4. :block-name "n" -- to include a name for later processing @@ -124,8 +127,8 @@ Used by `org-dblock-update' with PARAMS provided by the dynamic block." ;; Similarly, we can create a 'denote-backlinks' block that inserts ;; links to notes that link to the current note. -;; Note that this block type doesn't take any additional parameters -;; (such as ':missing-only'). +;; This block type takes the following parameters: +;; 1. :reverse t -- reverse sort order (or don't, when nil) ;;;###autoload (defun denote-org-dblock-insert-backlinks () @@ -136,11 +139,12 @@ Used by `org-dblock-update' with PARAMS provided by the dynamic block." (org-dynamic-block-define "denote-backlinks" 'denote-org-dblock-insert-backlinks) -(defun org-dblock-write:denote-backlinks (_params) +(defun org-dblock-write:denote-backlinks (params) "Function to update `denote-backlinks' Org Dynamic blocks. Used by `org-dblock-update' with PARAMS provided by the dynamic block." (when-let* ((file (buffer-file-name)) (id (denote-retrieve-filename-identifier file)) + (denote-link-add-links-sort (plist-get params :reverse)) (files (delete file (denote--retrieve-files-in-xrefs id (insert (denote-link--prepare-links files file nil)) (join-line))) ;; remove trailing empty line
[elpa] externals/substitute 3c80ceeb4f: Bump version to trigger package rebuild
branch: externals/substitute commit 3c80ceeb4fc536588c0e64c0ef609d1ed297c61f Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Bump version to trigger package rebuild This is to include the addition of (eval-when-compile (require 'subr-x)) --- substitute.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substitute.el b/substitute.el index a1170c829a..0c39c4f66a 100644 --- a/substitute.el +++ b/substitute.el @@ -6,7 +6,7 @@ ;; Maintainer: Protesilaos Stavrou General Issues <~protesilaos/general-iss...@lists.sr.ht> ;; URL: https://git.sr.ht/~protesilaos/substitute ;; Mailing-List: https://lists.sr.ht/~protesilaos/general-issues -;; Version: 0.1.4 +;; Version: 0.1.5 ;; Package-Requires: ((emacs "27.1")) ;; This file is NOT part of GNU Emacs.
[elpa] externals/compat ac471b9ccf: Manual: Update missing definitions
branch: externals/compat
commit ac471b9ccf821a421f61945c262c53a7a02006cd
Author: Daniel Mendler
Commit: Daniel Mendler
Manual: Update missing definitions
---
compat.texi | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/compat.texi b/compat.texi
index 94508fa3c2..b4880ae6ef 100644
--- a/compat.texi
+++ b/compat.texi
@@ -2091,23 +2091,21 @@ The macro @code{pcase-setq}.
@item
The function @code{custom-add-choice}.
@item
-The function @code{dom-print}.
-@item
-The function @code{dom-remove-attribute}.
+The functions @code{dom-print} and @code{dom-remove-attribute}.
@item
The function @code{dns-query-asynchronous}.
@item
The function @code{get-locale-names}.
@item
-The function @code{mail-header-parse-addresses-lax}.
-@item
-The function @code{mail-header-parse-address-lax}.
+The functions @code{mail-header-parse-addresses-lax} and
+@code{mail-header-parse-address-lax}.
@item
The function @code{num-processors}.
@item
The function @code{object-intervals}.
@item
-The function @code{process-lines-ignore-status}.
+The functions @code{process-lines-handling-status} and
+@code{process-lines-ignore-status}.
@item
The function @code{require-theme}.
@item
