[elpa] externals/hyperbole updated (7ccfb435ff -> f2b98683ef)
elpasync pushed a change to branch externals/hyperbole. from 7ccfb435ff Merge pull request #609 from rswgnu/rsw new 0b7e746665 hywiki-maybe-dehighlight-page-name - Exclude char after HyWikiWord new 3503b2c22b hpath:shorten - Shorten paths and make relative to source path new 91555dba7f hactypes.el (require): Remove require of 'man' new 6b379c8e19 Install missing 'man' executable new 4b1c74bdb5 Merge pull request #610 from rswgnu/rsw new 36b83da75d Merge branch 'master' into rsw new aa316b46c0 Update main.yml - Remove apt-get update new 72f7626889 Update main.yml - Change 'man' to 'man-db' new f31a78844a Update main.yml - apt-get -y to not prompt new 4e26fd71e1 Update main.yml - Add 'yes yes |' to prevent prompting new 714b8a9aed Update main.yml - 'y' response only new ffe17c0327 Update main.yml - Change to 'master-alpine' new 30f582ddf4 Update main.yml - Revert to 'master' branch new 206f54676d Merge branch 'rsw' of hyperbole into rsw new 70fe668600 hywiki-maybe-highlight-page-name - Fix dehilight of nums in WikiWord new f7edef655f Merge pull request #611 from rswgnu/rsw new 30cf230e02 Merge branch 'master' into rsw new f2b98683ef Merge pull request #612 from rswgnu/rsw Summary of changes: ChangeLog | 34 +- hactypes.el | 4 ++-- hbut.el | 2 +- hpath.el | 41 - hui.el| 5 +++-- hywiki.el | 17 +++-- test/hui-tests.el | 20 ++-- 7 files changed, 92 insertions(+), 31 deletions(-)
[elpa] externals/hyperbole f31a78844a 08/18: Update main.yml - apt-get -y to not prompt
branch: externals/hyperbole commit f31a78844aa731cc4297eb0b95c2f390c2d09dca Author: Robert Weiner Commit: GitHub Update main.yml - apt-get -y to not prompt --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a783be9eab..fe5a5cebbc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,8 @@ jobs: - name: Compile shell: bash run: | - apt-get install man-db + apt-get -y update + apt-get install man make bin 2>&1 | tee MAKE_BIN_OUTPUT echo "Number of warnings: $(grep "Warning:" MAKE_BIN_OUTPUT | wc -l)" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY
[elpa] externals/hyperbole 30cf230e02 17/18: Merge branch 'master' into rsw
branch: externals/hyperbole commit 30cf230e0216981606165fa63d28a9b9d786adc0 Merge: 70fe668600 f7edef655f Author: Robert Weiner Commit: GitHub Merge branch 'master' into rsw
[elpa] externals/hyperbole 4b1c74bdb5 02/18: Merge pull request #610 from rswgnu/rsw
branch: externals/hyperbole commit 4b1c74bdb5fc094fe883de8a9bb7473ecab26bd1 Merge: 7ccfb435ff 0b7e746665 Author: Robert Weiner Commit: GitHub Merge pull request #610 from rswgnu/rsw hywiki-maybe-dehighlight-page-name - Exclude char after HyWikiWord --- ChangeLog | 3 ++- hywiki.el | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2a7db01f2..788ec03965 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2024-11-17 Bob Weiner -* hywiki.el (hywiki-word-at): Fix to exclude any char after the HyWikiWord, if any. +* hywiki.el (hywiki-word-at, hywiki-maybe-dehighlight-page-name): Fix to exclude +any char after the HyWikiWord, if any. * hproperty.el (hproperty:but-get-all-in-region): Return only overlays that still point to some buffer (may have overlay references that have been deleted and point diff --git a/hywiki.el b/hywiki.el index 1eb570ef5c..6f6e232ce8 100644 --- a/hywiki.el +++ b/hywiki.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date:21-Apr-24 at 22:41:13 -;; Last-Mod: 17-Nov-24 at 10:27:44 by Bob Weiner +;; Last-Mod: 17-Nov-24 at 15:56:48 by Bob Weiner ;; ;; SPDX-License-Identifier: GPL-3.0-or-later ;; @@ -1188,7 +1188,7 @@ If in a programming mode, must be within a comment. Use (progn (setq hywiki--page-name (match-string-no-properties 1) hywiki--start (match-beginning 0) -hywiki--end (1- (match-end 0))) +hywiki--end (match-beginning 3)) (and (hywiki-get-page hywiki--page-name) ;; Ignore wikiwords preceded by any non-whitespace character ;; (or (bolp) (memq (preceding-char) '(?\ ?\t)))
[elpa] externals/hyperbole 714b8a9aed 10/18: Update main.yml - 'y' response only
branch: externals/hyperbole commit 714b8a9aed285891ddf4e21647127f19e5f0d5a1 Author: Robert Weiner Commit: GitHub Update main.yml - 'y' response only --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1daaac870a..166921923d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,8 +26,8 @@ jobs: - name: Compile shell: bash run: | - yes yes | apt-get update - yes yes | apt-get install man + yes | apt-get update + yes | apt-get install man make bin 2>&1 | tee MAKE_BIN_OUTPUT echo "Number of warnings: $(grep "Warning:" MAKE_BIN_OUTPUT | wc -l)" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY
[elpa] externals/hyperbole 91555dba7f 12/18: hactypes.el (require): Remove require of 'man'
branch: externals/hyperbole commit 91555dba7f662d40f7b18df1f52aeae10bc01450 Author: bw Commit: bw hactypes.el (require): Remove require of 'man' Do it only in man-show where needed. This may allow CI/CD build of docker Emacs master branch that lacks 'man' package. --- ChangeLog | 6 ++ hactypes.el | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1875bbe152..108878b68a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-11-18 Bob Weiner + +* hactypes.el (require): Remove require of 'man' and do it only in +man-show where needed. This may allow CI/CD build of docker Emacs +master branch that lacks 'man' package. + 2024-11-18 bw * hui-tests.el (hui--ibut-link-directly-to-org-header-first-column): diff --git a/hactypes.el b/hactypes.el index e5cd6e263b..9c8bf7b1a7 100644 --- a/hactypes.el +++ b/hactypes.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date:23-Sep-91 at 20:34:36 -;; Last-Mod: 30-Jun-24 at 17:12:44 by Bob Weiner +;; Last-Mod: 18-Nov-24 at 23:27:33 by Bob Weiner ;; ;; SPDX-License-Identifier: GPL-3.0-or-later ;; @@ -18,7 +18,7 @@ ;;; Other required Elisp libraries ;;; -(eval-and-compile (mapc #'require '(bookmark hvar hsettings comint hbut hpath hargs hmail man hsys-org))) +(eval-and-compile (mapc #'require '(bookmark hvar hsettings comint hbut hpath hargs hmail hsys-org))) ;;; ;;; Public declarations
[elpa] externals/hyperbole 30f582ddf4 13/18: Update main.yml - Revert to 'master' branch
branch: externals/hyperbole
commit 30f582ddf4a4f72ad87b182213b9a3bd323589a1
Author: Robert Weiner
Commit: GitHub
Update main.yml - Revert to 'master' branch
---
.github/workflows/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 416ef64987..fe453264eb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
-version: [27.2, 28.2, 29.4, master-alpine]
+version: [27.2, 28.2, 29.4, master]
container: silex/emacs:${{ matrix.version }}-ci
steps:
[elpa] externals/hyperbole 36b83da75d 05/18: Merge branch 'master' into rsw
branch: externals/hyperbole commit 36b83da75de7a4fe85310f5634d5a982b57c751f Merge: 6b379c8e19 4b1c74bdb5 Author: Robert Weiner Commit: GitHub Merge branch 'master' into rsw
[elpa] externals/hyperbole 0b7e746665 01/18: hywiki-maybe-dehighlight-page-name - Exclude char after HyWikiWord
branch: externals/hyperbole commit 0b7e746665ec7a0f297d8465f8b447f4a107f6fa Author: bw Commit: bw hywiki-maybe-dehighlight-page-name - Exclude char after HyWikiWord --- ChangeLog | 3 ++- hywiki.el | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2a7db01f2..788ec03965 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2024-11-17 Bob Weiner -* hywiki.el (hywiki-word-at): Fix to exclude any char after the HyWikiWord, if any. +* hywiki.el (hywiki-word-at, hywiki-maybe-dehighlight-page-name): Fix to exclude +any char after the HyWikiWord, if any. * hproperty.el (hproperty:but-get-all-in-region): Return only overlays that still point to some buffer (may have overlay references that have been deleted and point diff --git a/hywiki.el b/hywiki.el index 1eb570ef5c..6f6e232ce8 100644 --- a/hywiki.el +++ b/hywiki.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date:21-Apr-24 at 22:41:13 -;; Last-Mod: 17-Nov-24 at 10:27:44 by Bob Weiner +;; Last-Mod: 17-Nov-24 at 15:56:48 by Bob Weiner ;; ;; SPDX-License-Identifier: GPL-3.0-or-later ;; @@ -1188,7 +1188,7 @@ If in a programming mode, must be within a comment. Use (progn (setq hywiki--page-name (match-string-no-properties 1) hywiki--start (match-beginning 0) -hywiki--end (1- (match-end 0))) +hywiki--end (match-beginning 3)) (and (hywiki-get-page hywiki--page-name) ;; Ignore wikiwords preceded by any non-whitespace character ;; (or (bolp) (memq (preceding-char) '(?\ ?\t)))
[elpa] externals/hyperbole ffe17c0327 11/18: Update main.yml - Change to 'master-alpine'
branch: externals/hyperbole
commit ffe17c03272905178aea3d85760132b1591abac7
Author: Robert Weiner
Commit: GitHub
Update main.yml - Change to 'master-alpine'
---
.github/workflows/main.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 166921923d..416ef64987 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
-version: [27.2, 28.2, 29.4, master]
+version: [27.2, 28.2, 29.4, master-alpine]
container: silex/emacs:${{ matrix.version }}-ci
steps:
@@ -26,8 +26,6 @@ jobs:
- name: Compile
shell: bash
run: |
- yes | apt-get update
- yes | apt-get install man
make bin 2>&1 | tee MAKE_BIN_OUTPUT
echo "Number of warnings: $(grep "Warning:" MAKE_BIN_OUTPUT | wc
-l)" >> $GITHUB_STEP_SUMMARY
echo '```' >> $GITHUB_STEP_SUMMARY
[elpa] externals/hyperbole 4e26fd71e1 09/18: Update main.yml - Add 'yes yes |' to prevent prompting
branch: externals/hyperbole commit 4e26fd71e16e7583505693fcbf0fa203680a7357 Author: Robert Weiner Commit: GitHub Update main.yml - Add 'yes yes |' to prevent prompting --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe5a5cebbc..1daaac870a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,8 +26,8 @@ jobs: - name: Compile shell: bash run: | - apt-get -y update - apt-get install man + yes yes | apt-get update + yes yes | apt-get install man make bin 2>&1 | tee MAKE_BIN_OUTPUT echo "Number of warnings: $(grep "Warning:" MAKE_BIN_OUTPUT | wc -l)" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY
[elpa] externals/hyperbole 206f54676d 14/18: Merge branch 'rsw' of hyperbole into rsw
branch: externals/hyperbole commit 206f54676df2f944cfdf80931a69a434387b8470 Merge: 91555dba7f 30f582ddf4 Author: bw Commit: bw Merge branch 'rsw' of hyperbole into rsw
[elpa] externals/hyperbole aa316b46c0 06/18: Update main.yml - Remove apt-get update
branch: externals/hyperbole commit aa316b46c0aad6f9c827013f0a04e22ebe3271fb Author: Robert Weiner Commit: GitHub Update main.yml - Remove apt-get update --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c506f2cb1..5e568f55f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,6 @@ jobs: - name: Compile shell: bash run: | - apt-get update apt-get install man make bin 2>&1 | tee MAKE_BIN_OUTPUT echo "Number of warnings: $(grep "Warning:" MAKE_BIN_OUTPUT | wc -l)" >> $GITHUB_STEP_SUMMARY
[elpa] externals/hyperbole 70fe668600 16/18: hywiki-maybe-highlight-page-name - Fix dehilight of nums in WikiWord
branch: externals/hyperbole commit 70fe668600c2505837183ceb3100edf9e7a3f660 Author: bw Commit: bw hywiki-maybe-highlight-page-name - Fix dehilight of nums in WikiWord --- ChangeLog | 6 ++ hywiki.el | 15 ++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 108878b68a..1324ae46e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-11-19 Bob Weiner + +* hywiki.el (hywiki-maybe-highlight-page-name): Fix that adding +numbers to the middle of a HyWikiWord did not dehighlight it; +see updates at the end of this function. + 2024-11-18 Bob Weiner * hactypes.el (require): Remove require of 'man' and do it only in diff --git a/hywiki.el b/hywiki.el index 6f6e232ce8..0d4572489b 100644 --- a/hywiki.el +++ b/hywiki.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date:21-Apr-24 at 22:41:13 -;; Last-Mod: 17-Nov-24 at 15:56:48 by Bob Weiner +;; Last-Mod: 19-Nov-24 at 00:21:19 by Bob Weiner ;; ;; SPDX-License-Identifier: GPL-3.0-or-later ;; @@ -1293,10 +1293,15 @@ the current page unless they have sections attached." ;; Remove any potential earlier highlighting since the ;; previous word may have changed. (skip-syntax-backward "^-$()<>._\"\'") - (when (and hywiki--start hywiki--end) - (hproperty:but-clear-all-in-list - (hproperty:but-get-all-in-region hywiki--start hywiki--end - 'face hywiki-word-face)) + (if (setq hywiki--buts (hproperty:but-get-all-in-region + (point) (1+ (point)) 'face hywiki-word-face)) + (if (> (length hywiki--buts) 1) + (hproperty:but-clear-all-in-list hywiki--buts) + ;; There is only one existing button + (setq hywiki--buts (car hywiki--buts) + hywiki--but-start (hproperty:but-start hywiki--buts) + hywiki--but-end (hproperty:but-end hywiki--buts)) + (hproperty:but-delete hywiki--buts)) (defun hywiki-maybe-highlight-between-page-names () "Highlight any non-Org link HyWiki page#section names between point.
[elpa] externals/hyperbole 6b379c8e19 04/18: Install missing 'man' executable
branch: externals/hyperbole commit 6b379c8e19c9b2045f5bb98e87d653a9042c6be5 Author: Robert Weiner Commit: GitHub Install missing 'man' executable --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe453264eb..9c506f2cb1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,6 +26,8 @@ jobs: - name: Compile shell: bash run: | + apt-get update + apt-get install man make bin 2>&1 | tee MAKE_BIN_OUTPUT echo "Number of warnings: $(grep "Warning:" MAKE_BIN_OUTPUT | wc -l)" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY
[elpa] externals/dape 5e7dbcd344: Revert "Using global-mode-string"
branch: externals/dape
commit 5e7dbcd344f9668c5a068a241d917c43c8b54af1
Author: Daniel Pettersson
Commit: Daniel Pettersson
Revert "Using global-mode-string"
This reverts commit b4472e4dbccefcbf55818f17864241c6f7699f5d.
---
dape.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dape.el b/dape.el
index c19a5d96a3..864676d53a 100644
--- a/dape.el
+++ b/dape.el
@@ -5353,7 +5353,7 @@ mouse-1: Display minor mode menu"
face shadow
help-echo "Active child connections")))
-(add-to-list 'global-mode-string
+(add-to-list 'mode-line-misc-info
`(dape-active-mode ("[" dape--mode-line-format "] ")))
[elpa] externals/hyperbole 72f7626889 07/18: Update main.yml - Change 'man' to 'man-db'
branch: externals/hyperbole commit 72f76268894157341c4c65053b7a49d4af25e7e9 Author: Robert Weiner Commit: GitHub Update main.yml - Change 'man' to 'man-db' --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5e568f55f5..a783be9eab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: - name: Compile shell: bash run: | - apt-get install man + apt-get install man-db make bin 2>&1 | tee MAKE_BIN_OUTPUT echo "Number of warnings: $(grep "Warning:" MAKE_BIN_OUTPUT | wc -l)" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY
[elpa] externals/ess dbebca483e: long filenames are flushed to the next line of the error message
branch: externals/ess commit dbebca483e7386fa5c17505ab444c817f6926bd4 Author: rsparapa Commit: rsparapa long filenames are flushed to the next line of the error message --- lisp/ess-sas-a.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ess-sas-a.el b/lisp/ess-sas-a.el index 4d5a5ee4b2..2ae5a192a8 100644 --- a/lisp/ess-sas-a.el +++ b/lisp/ess-sas-a.el @@ -730,7 +730,7 @@ Use the current buffer if nil." "\\|NOTE: Compressing data set .* increased size by" "\\|NOTE: ERROR DETECTED IN ANNOTATE=" "\\|NOTE: Import cancelled. Output dataset .* already exists." - "\\|NOTE: Export cancelled. Output file .* already exists." + "\\|NOTE: Export cancelled. Output file" "\\|WARNING: Apparent symbolic reference .* not resolved." "\\|WARNING: Length of character variable has already been set." "\\|WARNING: Not all variables in the list "
[nongnu] elpa/typescript-mode dd10f702d4: Update Makefile
branch: elpa/typescript-mode commit dd10f702d4946ddb2e1c2863bf02bf241bce5fc8 Author: Jostein Kjønigsen Commit: GitHub Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d48eb7682e..8046aa66e5 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ clean: rm -f $(ELCS) eask: clean - $(EASK) build + $(EASK) compile test: eask + $(EMACS) -Q -batch -L . -l typescript-mode-tests.el -f ert-run-tests-batch-and-exit
[elpa] externals/consult-recoll c81d40c70b: customizable recollq program (see #11)
branch: externals/consult-recoll
commit c81d40c70b73a7351d7a4591b14f222682b7a084
Author: jao
Commit: jao
customizable recollq program (see #11)
---
consult-recoll.el | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/consult-recoll.el b/consult-recoll.el
index deca8a3fa8..934623262b 100644
--- a/consult-recoll.el
+++ b/consult-recoll.el
@@ -8,7 +8,7 @@
;; Package-Requires: ((emacs "26.1") (consult "0.19"))
;; Homepage: https://codeberg.org/jao/consult-recoll
-;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2024 Free Software Foundation, Inc.
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -56,6 +56,15 @@
"Prompt used by `consult-recoll'."
:type 'string)
+(defcustom consult-recoll-program "recollq"
+ "Program (or full path to program) used to perform text searches.
+
+This is typically recollq if you have a standard recoll distribution,
+but can be also be set to recoll, or the full path to it if it's
+not in your PATH. In the latter case, you'll want to add -t to
+`consult-recoll-search-flags'."
+ :type 'string)
+
(defcustom consult-recoll-search-flags 'query
"List of flags used to perform queries via recollq.
@@ -132,7 +141,7 @@ Set to nil to use the default `title (path)' format."
(setq consult-recoll--current nil)
(setq consult-recoll--index 0)
(setq consult-recoll--snippets nil)
- `("recollq" ,@(consult-recoll--search-flags) ,text))
+ `(,consult-recoll-program ,@(consult-recoll--search-flags) ,text))
(defun consult-recoll--format (title urln mime)
(if consult-recoll-format-candidate
[elpa] externals/osm ab76f8a9e7: Support more gpx files
branch: externals/osm commit ab76f8a9e79e0ec6330071b4aed974270b6f2a15 Author: Daniel Mendler Commit: Daniel Mendler Support more gpx files --- osm.el | 4 1 file changed, 4 insertions(+) diff --git a/osm.el b/osm.el index 40b9cb499a..3c207b1de8 100644 --- a/osm.el +++ b/osm.el @@ -1680,6 +1680,10 @@ See `osm-search-server' and `osm-search-language' for customization." (insert-file-contents file) (libxml-parse-xml-region (point-min) (point-max (min-lat 90) (max-lat -90) (min-lon 180) (max-lon -180)) +(unless (eq 'gpx (dom-tag dom)) + (setq dom (dom-child-by-tag dom 'gpx))) +(unless (and dom (eq 'gpx (dom-tag dom))) + (error "Not a GPX file")) (setf (alist-get (abbreviate-file-name file) osm--gpx-files nil nil #'equal) (cons (cl-loop
[elpa] externals/transient 5205b18f0d: ci: Generate statistics weekly
branch: externals/transient commit 5205b18f0d1b36b7da2d079762052d7112ec636a Author: Jonas Bernoulli Commit: Jonas Bernoulli ci: Generate statistics weekly --- .github/workflows/stats.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/stats.yml b/.github/workflows/stats.yml index 6f65ecc4b6..e941fb9588 100644 --- a/.github/workflows/stats.yml +++ b/.github/workflows/stats.yml @@ -2,6 +2,8 @@ name: Statistics on: push: branches: main + schedule: +- cron: '3 13 * * 1' jobs: stats: name: Statistics
[elpa] externals/modus-themes df1798234e 2/2: Merge pull request #124 from LionyxML/main
branch: externals/modus-themes commit df1798234edd56678da975d0d65b64bdebafc314 Merge: dc0d606e2a bc3cc758ba Author: Protesilaos Stavrou Commit: GitHub Merge pull request #124 from LionyxML/main Make treemacs directory faces similar to dired --- modus-themes.el | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modus-themes.el b/modus-themes.el index 31419bf04d..3ec3f1315d 100644 --- a/modus-themes.el +++ b/modus-themes.el @@ -3854,8 +3854,8 @@ FG and BG are the main colors." `(trashed-restored ((,c :inherit modus-themes-mark-sel))) ; treemacs `(treemacs-async-loading-face ((,c :foreground ,fg-main))) -`(treemacs-directory-face ((,c :inherit modus-themes-bold :foreground ,keyword))) -`(treemacs-directory-collapsed-face ((,c :inherit modus-themes-bold :foreground ,keyword))) +`(treemacs-directory-face ((,c :foreground ,accent-0))) +`(treemacs-directory-collapsed-face ((,c :foreground ,accent-0))) `(treemacs-file-face ((,c :foreground ,fg-main))) `(treemacs-fringe-indicator-face ((,c :foreground ,fg-main))) `(treemacs-git-added-face ((,c :inherit success))) @@ -3871,20 +3871,20 @@ FG and BG are the main colors." `(treemacs-help-title-face ((,c :foreground ,fg-main))) `(treemacs-hl-line-face ((,c :background ,bg-hl-line :extend t))) `(treemacs-marked-file-face ((,c :inherit modus-themes-mark-alt))) -`(treemacs-nerd-icons-face ((,c :inherit modus-themes-bold :foreground ,keyword))) +`(treemacs-nerd-icons-face ((,c :foreground ,accent-0))) `(treemacs-on-failure-pulse-face ((,c :foreground ,fg-main))) `(treemacs-on-success-pulse-face ((,c :foreground ,fg-main))) `(treemacs-peek-mode-indicator-face ((,c :foreground ,fg-main))) `(treemacs-remote-face ((,c :foreground ,fg-main))) -`(treemacs-root-face ((,c :inherit modus-themes-bold :foreground ,keyword))) +`(treemacs-root-face ((,c :foreground ,accent-0))) `(treemacs-root-remote-disconnected-face ((,c :inherit warning))) `(treemacs-root-remote-unreadable-face ((,c :inherit warning))) `(treemacs-root-unreadable-face ((,c :inherit error))) `(treemacs-tags-face ((,c :foreground ,fg-main))) `(treemacs-term-node-face ((,c :inherit modus-themes-bold :foreground ,keyword))) `(treemacs-window-background-face ((,c :background ,bg-main))) -`(treemacs-nerd-icons-root-face ((,c :inherit modus-themes-bold :foreground ,keyword))) -`(treemacs-nerd-icons-file-face ((,c :inherit modus-themes-bold :foreground ,keyword))) +`(treemacs-nerd-icons-root-face ((,c :foreground ,accent-0))) +`(treemacs-nerd-icons-file-face ((,c :foreground ,accent-0))) ; tree-sitter `(tree-sitter-hl-face:attribute ((,c :inherit font-lock-variable-name-face))) `(tree-sitter-hl-face:constant.builtin ((,c :inherit tree-sitter-hl-face:constant)))
[elpa] externals/modus-themes bc3cc758ba 1/2: Make treemacs directory faces similar to dired
branch: externals/modus-themes commit bc3cc758ba335395c2b35318244d62a47c048381 Author: Rahul M. Juliato Commit: Rahul M. Juliato Make treemacs directory faces similar to dired --- modus-themes.el | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modus-themes.el b/modus-themes.el index 31419bf04d..3ec3f1315d 100644 --- a/modus-themes.el +++ b/modus-themes.el @@ -3854,8 +3854,8 @@ FG and BG are the main colors." `(trashed-restored ((,c :inherit modus-themes-mark-sel))) ; treemacs `(treemacs-async-loading-face ((,c :foreground ,fg-main))) -`(treemacs-directory-face ((,c :inherit modus-themes-bold :foreground ,keyword))) -`(treemacs-directory-collapsed-face ((,c :inherit modus-themes-bold :foreground ,keyword))) +`(treemacs-directory-face ((,c :foreground ,accent-0))) +`(treemacs-directory-collapsed-face ((,c :foreground ,accent-0))) `(treemacs-file-face ((,c :foreground ,fg-main))) `(treemacs-fringe-indicator-face ((,c :foreground ,fg-main))) `(treemacs-git-added-face ((,c :inherit success))) @@ -3871,20 +3871,20 @@ FG and BG are the main colors." `(treemacs-help-title-face ((,c :foreground ,fg-main))) `(treemacs-hl-line-face ((,c :background ,bg-hl-line :extend t))) `(treemacs-marked-file-face ((,c :inherit modus-themes-mark-alt))) -`(treemacs-nerd-icons-face ((,c :inherit modus-themes-bold :foreground ,keyword))) +`(treemacs-nerd-icons-face ((,c :foreground ,accent-0))) `(treemacs-on-failure-pulse-face ((,c :foreground ,fg-main))) `(treemacs-on-success-pulse-face ((,c :foreground ,fg-main))) `(treemacs-peek-mode-indicator-face ((,c :foreground ,fg-main))) `(treemacs-remote-face ((,c :foreground ,fg-main))) -`(treemacs-root-face ((,c :inherit modus-themes-bold :foreground ,keyword))) +`(treemacs-root-face ((,c :foreground ,accent-0))) `(treemacs-root-remote-disconnected-face ((,c :inherit warning))) `(treemacs-root-remote-unreadable-face ((,c :inherit warning))) `(treemacs-root-unreadable-face ((,c :inherit error))) `(treemacs-tags-face ((,c :foreground ,fg-main))) `(treemacs-term-node-face ((,c :inherit modus-themes-bold :foreground ,keyword))) `(treemacs-window-background-face ((,c :background ,bg-main))) -`(treemacs-nerd-icons-root-face ((,c :inherit modus-themes-bold :foreground ,keyword))) -`(treemacs-nerd-icons-file-face ((,c :inherit modus-themes-bold :foreground ,keyword))) +`(treemacs-nerd-icons-root-face ((,c :foreground ,accent-0))) +`(treemacs-nerd-icons-file-face ((,c :foreground ,accent-0))) ; tree-sitter `(tree-sitter-hl-face:attribute ((,c :inherit font-lock-variable-name-face))) `(tree-sitter-hl-face:constant.builtin ((,c :inherit tree-sitter-hl-face:constant)))
[nongnu] elpa/dslide updated (84b4b8c747 -> 4209916697)
elpasync pushed a change to branch elpa/dslide. from 84b4b8c747 Basic built-in cursor hiding by default new 02ee2cfd4a Experimental change to buffer coordination new 4209916697 Off-by-one bug in markup hiding code Summary of changes: dslide.el | 10 -- test/demo.org | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-)
[nongnu] elpa/typescript-mode 3a67100744: Update build.yml - update build-action version.
branch: elpa/typescript-mode commit 3a671007440a9f6e52e12bb30cd0262c0e645282 Author: Jostein Kjønigsen Commit: GitHub Update build.yml - update build-action version. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 28b0f22456..25e219a34f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: jcs090218/setup-emacs@master with:
[elpa] externals/jinx 61144055e8: jinx-languages: Group by dictionary provider
branch: externals/jinx
commit 61144055e8ce445568baa19302f4af60e15a2e6d
Author: Daniel Mendler
Commit: Daniel Mendler
jinx-languages: Group by dictionary provider
---
CHANGELOG.org | 1 +
jinx-mod.c| 6 --
jinx.el | 51 +--
3 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/CHANGELOG.org b/CHANGELOG.org
index 28b42de9a2..f9256ce3ac 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -5,6 +5,7 @@
* Development
- Require Emacs 28.1.
+- ~jinx-languages~: Group dictionaries by dictionary provider.
* Version 1.10 (2024-07-23)
diff --git a/jinx-mod.c b/jinx-mod.c
index 9af48eb869..d08c86fb05 100644
--- a/jinx-mod.c
+++ b/jinx-mod.c
@@ -108,13 +108,15 @@ static emacs_value jinx_describe(emacs_env* env,
ptrdiff_t jinx_unused(nargs),
}
static void jinx_langs_cb(const char* const lang_tag,
- const char* const jinx_unused(provider_name),
+ const char* const provider_name,
const char* const jinx_unused(provider_desc),
const char* const jinx_unused(provider_file),
void* data) {
emacs_env* env = ((emacs_env**)data)[0];
((emacs_value*)data)[1] = jinx_cons(env,
-jinx_str(env, lang_tag),
+jinx_cons(env,
+ jinx_str(env, lang_tag),
+ jinx_str(env,
provider_name)),
((emacs_value*)data)[1]);
}
diff --git a/jinx.el b/jinx.el
index 8909ffd77e..2247a87597 100644
--- a/jinx.el
+++ b/jinx.el
@@ -776,7 +776,7 @@ The word will be associated with GROUP and get a prefix
key."
(format #(" (%s)" 0 5 (face jinx-key)) (string-trim prefix))
(get-text-property 0 'jinx--suffix cand)))
-(defun jinx--correct-group (word transform)
+(defun jinx--group (word transform)
"Group WORD during completion, TRANSFORM candidate if non-nil."
(if transform
word
@@ -784,15 +784,15 @@ The word will be associated with GROUP and get a prefix
key."
(defun jinx--correct-table (suggestions)
"Completion table for SUGGESTIONS."
- (lambda (str pred action)
-(if (eq action 'metadata)
-`(metadata (category . jinx)
- (display-sort-function . ,#'identity)
- (cycle-sort-function . ,#'identity)
- (group-function . ,#'jinx--correct-group)
- (affixation-function . ,#'jinx--correct-affixation)
- (annotation-function . ,#'jinx--correct-annotation))
- (complete-with-action action suggestions str pred
+ (let ((md `(metadata (category . jinx)
+ (display-sort-function . ,#'identity)
+ (cycle-sort-function . ,#'identity)
+ (group-function . ,#'jinx--group)
+ (affixation-function . ,#'jinx--correct-affixation)
+ (annotation-function . ,#'jinx--correct-annotation
+(lambda (str pred action)
+ (if (eq action 'metadata) md
+(complete-with-action action suggestions str pred)
(cl-defun jinx--correct-overlay (overlay &key info initial)
"Correct word at OVERLAY.
@@ -886,6 +886,24 @@ Optionally show prompt INFO and insert INITIAL input."
(when (re-search-forward "\\<\\w+\\>" nil t)
(cons (match-beginning 0) (match-end 0)))
+(defun jinx--read-languages ()
+ "Read languages via `completing-read-multiple'."
+ (jinx--load-module)
+ (let ((langs (delete-dups
+(cl-loop for (l . p) in (jinx--mod-langs) collect
+ (propertize l 'jinx--group (format "Provider %s"
p)
+(md `(metadata (group-function . ,#'jinx--group
+ (string-join
+ (or (completing-read-multiple
+(format "Change languages (%s): "
+(string-join (split-string jinx-languages) ", "))
+(lambda (str pred action)
+ (if (eq action 'metadata) md
+(complete-with-action action langs str pred)))
+nil t)
+ (user-error "No languages selected"))
+ " ")))
+
Save functions
(defun jinx--save-personal (save key word)
@@ -934,18 +952,7 @@ by whitespace. When called interactively, the language
codes are
read via `completing-read-multiple'. If the prefix argument
GLOBAL is non-nil, the languages are changed globally for all
buffers. See also the variable `jinx-languages'."
- (interactive
- (list
-(progn
- (jinx--load-module)
- (string-join
- (or (completing-read-multiple
-(format "Change languages (%s): "
-(string-join (split-string jinx-languages) ", "))
-(delete-dups (jinx--mod-langs)) nil t)
- (user-error "No languages selected"))
-
[nongnu] elpa/dslide 4209916697 2/2: Off-by-one bug in markup hiding code
branch: elpa/dslide commit 4209916697c74f196be6834edfa01a25da597444 Author: Psionik K <73710933+psioni...@users.noreply.github.com> Commit: Psionik K <73710933+psioni...@users.noreply.github.com> Off-by-one bug in markup hiding code This was causing images with associated keywords to be hidden unless they were preceded by a space, as seen in the demo. It is unknown what forces of evil compelled me to include the extraneous space before images in the demo. Likely I encountered the issue while recording and made it work, intending to double back and fix it before not understanding that there was an issue when looking at my todo list. Evil thrives in entropy and can succeed at its nefarious goals even when it is miniscule and even while good appears overwhelming. --- dslide.el | 2 +- test/demo.org | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dslide.el b/dslide.el index 8a0326cdb4..3d9b1d150d 100644 --- a/dslide.el +++ b/dslide.el @@ -1218,7 +1218,7 @@ for `dslide-contents-map'.") (goto-char (oref obj begin)) (while (re-search-forward org-keyword-regexp bound t) (let ((overlay (make-overlay (match-beginning 0) - (1+ (match-end 0) + (match-end 0 (overlay-put overlay 'invisible t) (push dslide-overlays overlay))) diff --git a/test/demo.org b/test/demo.org index 027a911f09..703cc45056 100644 --- a/test/demo.org +++ b/test/demo.org @@ -113,9 +113,9 @@ Positron is deeply committed to bringing you the finest in: - The image buffer is configured to act as a slide, so it still responds to the keybindings. - See more options, such as fullscreen etc by calling ~describe-symbol~ on ~dslide-action-image~ #+ATTR_HTML: :width 45% - [[./images/emacsen4.jpeg]] [[./images/self-care5.jpeg]] +[[./images/emacsen4.jpeg]] [[./images/self-care5.jpeg]] #+ATTR_HTML: :width 45% - [[./images/before-google3.jpeg]] [[./images/all-software-is-the-same-with-tang.jpeg]] +[[./images/before-google3.jpeg]] [[./images/all-software-is-the-same-with-tang.jpeg]] * No Header Slide :PROPERTIES: :DSLIDE_SLIDE_ACTION: dslide-slide-action-child :header nil
