[elpa] externals/svg-lib cde8a8c2ba 1/3: Added dynamic date icon
branch: externals/svg-lib commit cde8a8c2ba153963cbe4d233069bc053943f0974 Author: Nicolas P. Rougier Commit: Nicolas P. Rougier Added dynamic date icon --- screenshot.png | Bin 544432 -> 821841 bytes svg-lib-demo.el | 12 ++--- svg-lib.el | 82 +++- 3 files changed, 90 insertions(+), 4 deletions(-) diff --git a/screenshot.png b/screenshot.png index 748aa9c7a2..4b5a81df04 100644 Binary files a/screenshot.png and b/screenshot.png differ diff --git a/svg-lib-demo.el b/svg-lib-demo.el index a5b0a1d4be..0684279a16 100644 --- a/svg-lib-demo.el +++ b/svg-lib-demo.el @@ -25,7 +25,7 @@ (dotimes (i 5) (insert-image (svg-lib-tag "TODO" nil :font-weight (* (+ i 2) 100 - + (dotimes (i 10) (insert-image (svg-lib-tag "TODO" nil :padding 1 :stroke (/ i 4.0 @@ -41,7 +41,7 @@ (insert-image (svg-lib-progress-bar 0.75 nil :radius 8 :stroke 2 :padding 0)) - + (dotimes (i 10) (insert-image (svg-lib-progress-pie (/ (+ i 1) 10.0) nil @@ -56,7 +56,13 @@ :font-family "Roboto Mono" :font-weight 500 :stroke 0 :background "#673AB7" :foreground "white")) - + (insert-image (svg-lib-icon "gnuemacs" nil :collection "simple" :stroke 0 :scale 1 :padding 0)) + + +(insert-image (svg-lib-date nil nil :foreground "#673AB7")) + + + diff --git a/svg-lib.el b/svg-lib.el index 0d93e9973c..d88db0d056 100644 --- a/svg-lib.el +++ b/svg-lib.el @@ -4,7 +4,7 @@ ;; Maintainer: Nicolas P. Rougier ;; URL: https://github.com/rougier/svg-lib -;; Version: 0.2.6 +;; Version: 0.2.7 ;; Package-Requires: ((emacs "27.1")) ;; Keywords: svg, icons, tags, convenience @@ -67,6 +67,9 @@ ;;; NEWS: +;; Version 0.2.7 +;; - Added a dynamic date icon + ;; Version 0.2.6 ;; - Bug fix with bootstrap icon directory @@ -630,6 +633,83 @@ and style elements ARGS." (svg-lib--image svg :ascent svg-ascent))) +(defun svg-lib-date (&optional date style &rest args) + "Create a two lines date icon showing given DATE, using given +STYLE and style elements ARGS." + + (let* ((default svg-lib-style-default) + (style (if style (apply #'svg-lib-style nil style) default)) + (style (if args (apply #'svg-lib-style style args) style)) + + (date (or date (current-time))) + (month (upcase (format-time-string "%b" date))) + (day (format-time-string "%d" date)) + + (foreground (plist-get style :foreground)) + (background (plist-get style :background)) + (alignment (plist-get style :alignment)) + (stroke (plist-get style :stroke)) + (width (or (plist-get args :width) 5)) + (height (or (plist-get args :height) 2)) + (radius (plist-get style :radius)) + (margin (plist-get style :margin)) + + (font-size (plist-get style :font-size)) + (font-family (plist-get style :font-family)) + (font-weight (plist-get style :font-weight)) + + (txt-char-width (window-font-width)) + (txt-char-height (window-font-height)) + + (font-info (font-info (format "%s-%d" font-family font-size))) + (ascent (aref font-info 8)) + (tag-char-width (aref font-info 11)) + (tag-char-height (aref font-info 3)) + (tag-width (* width txt-char-width)) + + (tag-height (* height txt-char-height)) + (svg-width (+ tag-width (* margin txt-char-width))) + (svg-height tag-height) + (svg-ascent (or (plist-get style :ascent) 'center)) + (tag-x (/ (- svg-width tag-width) 2) ) + + (svg (svg-create svg-width svg-height))) + +(when (>= stroke 0.25) + (svg-rectangle svg tag-x 0 tag-width tag-height + :fill foreground :rx radius)) +(svg-rectangle svg (+ tag-x (/ stroke 2.0)) + (/ stroke 2.0) + (- tag-width stroke) + (- tag-height stroke) + :fill background :rx (- radius (/ stroke 2.0))) +(svg-rectangle svg (+ tag-x (/ stroke 2.0)) + (/ stroke 2.0) + (- tag-width stroke) + (- (/ tag-height 2) stroke) + :fill foreground :rx (- radius (/ stroke 2.0))) +(svg-rectangle svg (+ tag-x (/ stroke 2.0)) + (+ (/ stroke 2.0) (/ tag-height 3)) + (- tag-width stroke) + (- (/ tag-height 2) stroke) + :fill background :rx 0) +(svg-text svg month + :font-family font-family + :font-weight "bold" + :font-size (* font-size 0.9) + :fill background + :text-anc
[elpa] externals/svg-lib 12a722aa3c 2/3: Merge remote-tracking branch 'origin/master'
branch: externals/svg-lib commit 12a722aa3c508c1245ebea4fd557346476e1d214 Merge: cde8a8c2ba ed8cc0aec9 Author: Nicolas P. Rougier Commit: Nicolas P. Rougier Merge remote-tracking branch 'origin/master' --- svg-lib.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svg-lib.el b/svg-lib.el index d88db0d056..8bad50eab6 100644 --- a/svg-lib.el +++ b/svg-lib.el @@ -120,7 +120,7 @@ ("material" . "https://raw.githubusercontent.com/Templarian/MaterialDesign/master/svg/%s.svg";) ("octicons" . - "https://raw.githubusercontent.com/primer/octicons/master/icons/%s-24.svg";) + "https://raw.githubusercontent.com/primer/octicons/main/icons/%s-24.svg";) ("boxicons" . "https://boxicons.com/static/img/svg/regular/bx-%s.svg";) ("vscode" .
[elpa] externals/svg-lib cca504cbfd 3/3: Added date example
branch: externals/svg-lib commit cca504cbfd2ac82caa2ee9af865f3a5840b3f136 Author: Nicolas P. Rougier Commit: Nicolas P. Rougier Added date example --- svg-lib-demo.el | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/svg-lib-demo.el b/svg-lib-demo.el index 0684279a16..0598062cc9 100644 --- a/svg-lib-demo.el +++ b/svg-lib-demo.el @@ -41,7 +41,7 @@ (insert-image (svg-lib-progress-bar 0.75 nil :radius 8 :stroke 2 :padding 0)) - + (dotimes (i 10) (insert-image (svg-lib-progress-pie (/ (+ i 1) 10.0) nil @@ -56,13 +56,14 @@ :font-family "Roboto Mono" :font-weight 500 :stroke 0 :background "#673AB7" :foreground "white")) - + (insert-image (svg-lib-icon "gnuemacs" nil :collection "simple" :stroke 0 :scale 1 :padding 0)) - - -(insert-image (svg-lib-date nil nil :foreground "#673AB7")) + +(insert-image (svg-lib-date nil nil :font-family "Roboto" :radius 5 +:foreground "#673AB7")) +
[elpa] externals/svg-lib updated (ed8cc0aec9 -> cca504cbfd)
elpasync pushed a change to branch externals/svg-lib. from ed8cc0aec9 Merge pull request #31 from chookity-pokk/octicons-update new cde8a8c2ba Added dynamic date icon new 12a722aa3c Merge remote-tracking branch 'origin/master' new cca504cbfd Added date example Summary of changes: screenshot.png | Bin 544432 -> 821841 bytes svg-lib-demo.el | 9 ++- svg-lib.el | 82 +++- 3 files changed, 89 insertions(+), 2 deletions(-)
[nongnu] elpa/cider 5d91ffcc75 5/5: Prompt to kill dead repls after choosing not to reuse them
branch: elpa/cider commit 5d91ffcc75069efe9c513af285627a4e38685bb1 Author: yuhan0 Commit: Bozhidar Batsov Prompt to kill dead repls after choosing not to reuse them --- cider-connection.el | 28 ++-- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/cider-connection.el b/cider-connection.el index b47a11e575..35fc792716 100644 --- a/cider-connection.el +++ b/cider-connection.el @@ -861,16 +861,24 @@ PARAMS is a plist as received by `cider-repl-create'." (if (equal port (plist-get bparams :port)) 2 0)) repls)) (sorted-repls (mapcar #'car (seq-sort-by #'cdr #'> (delq nil scored-repls) - (when sorted-repls -(cond ((eq 'any cider-reuse-dead-repls) - (car sorted-repls)) - ((= 1 (length sorted-repls)) - (when (or (eq 'auto cider-reuse-dead-repls) - (y-or-n-p (format "A dead REPL %s exists. Reuse buffer? " (car sorted-repls - (car sorted-repls))) - ((y-or-n-p "Dead REPL buffers exist. Select one to reuse? ") - (get-buffer (completing-read "REPL buffer to reuse: " (mapcar #'buffer-name sorted-repls) -nil t nil nil (car sorted-repls) + (cond ((null sorted-repls) nil) +((and (= 1 (length sorted-repls)) + (eq cider-reuse-dead-repls 'prompt)) + (if (y-or-n-p (format "A dead REPL %s exists. Reuse buffer? " (car sorted-repls))) + (car sorted-repls) + (and (y-or-n-p "Kill dead REPL buffer?") +(kill-buffer (car sorted-repls)) +nil))) +((and (< 1 (length sorted-repls)) + (memq cider-reuse-dead-repls '(prompt auto))) + (if (y-or-n-p "Dead REPL buffers exist. Select one to reuse? ") + (get-buffer (completing-read "REPL buffer to reuse: " (mapcar #'buffer-name sorted-repls) + nil t nil nil (car sorted-repls))) + (and (y-or-n-p "Kill all dead REPL buffers?") +(mapc #'kill-buffer sorted-repls) +nil))) +(cider-reuse-dead-repls ;; fallthrough for 'auto / 'any / other non-nil values + (car sorted-repls)) (declare-function cider-default-err-handler "cider-eval") (declare-function cider-repl-mode "cider-repl")
[nongnu] elpa/cider aa51f13ce6 1/5: Disable Cider only when cider-auto-mode is enabled
branch: elpa/cider commit aa51f13ce655afa014ebc68edbd2327617dd90e2 Author: yuhan0 Commit: Bozhidar Batsov Disable Cider only when cider-auto-mode is enabled --- cider-connection.el | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cider-connection.el b/cider-connection.el index 9d0aad8fd0..6421e45362 100644 --- a/cider-connection.el +++ b/cider-connection.el @@ -55,7 +55,14 @@ available) and the matching REPL buffer." :package-version '(cider . "0.17.0")) (defcustom cider-auto-mode t - "When non-nil, automatically enable cider mode for all Clojure buffers." + "When non-nil, automatically enable and disable CIDER in all Clojure buffers. + +After an initial connection, `cider-mode' is added to `clojure-mode-hook' and +automatically enabled on all existing Clojure buffers. After the last +connection has been closed, `cider-mode' is disabled in all Clojure buffers, and +has to be manually re-enabled via \\[cider-mode]. + +Useful for switching between alternative minor modes like `inf-clojure-mode'." :type 'boolean :group 'cider :safe #'booleanp @@ -395,7 +402,8 @@ buffer." This function is appended to `nrepl-disconnected-hook' in the client process buffer." ;; `nrepl-connected-hook' is run in the connection buffer - (cider-possibly-disable-on-existing-clojure-buffers) + (when cider-auto-mode +(cider-possibly-disable-on-existing-clojure-buffers)) (run-hooks 'cider-disconnected-hook))
[nongnu] elpa/cider updated (049eb30caf -> 5d91ffcc75)
elpasync pushed a change to branch elpa/cider. from 049eb30caf Add section about dead REPLs to user manual new aa51f13ce6 Disable Cider only when cider-auto-mode is enabled new c61689c7b2 perf: only call cider-mode if not already enabled new 69d6bcba44 Update changelog new 1f0e6c3507 Ignore errors when filtering for dead REPLs new 5d91ffcc75 Prompt to kill dead repls after choosing not to reuse them Summary of changes: CHANGELOG.md| 1 + cider-connection.el | 68 + 2 files changed, 44 insertions(+), 25 deletions(-)
[nongnu] elpa/cider 1f0e6c3507 4/5: Ignore errors when filtering for dead REPLs
branch: elpa/cider commit 1f0e6c350751c7ffd689708d56b5fdbb777a9563 Author: yuhan0 Commit: Bozhidar Batsov Ignore errors when filtering for dead REPLs --- cider-connection.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cider-connection.el b/cider-connection.el index 8e146bcefa..b47a11e575 100644 --- a/cider-connection.el +++ b/cider-connection.el @@ -853,7 +853,7 @@ PARAMS is a plist as received by `cider-repl-create'." (type (plist-get params :repl-type)) (scored-repls (mapcar (lambda (b) - (let ((bparams (cider--gather-connect-params nil b))) + (let ((bparams (ignore-errors (cider--gather-connect-params nil b (when (eq type (plist-get bparams :repl-type)) (cons b (+ (if (equal proj-dir (plist-get bparams :project-dir)) 8 0)
[nongnu] elpa/cider 69d6bcba44 3/5: Update changelog
branch: elpa/cider commit 69d6bcba44b0ddf3f12654d4be3fdc6a3565e71e Author: yuhan0 Commit: Bozhidar Batsov Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80250007ce..8137adf676 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - [#3341](https://github.com/clojure-emacs/cider/issues/3341): Escape clojure-cli args on MS-Windows on non powershell invocations. - [#3353](https://github.com/clojure-emacs/cider/issues/3353): Fix regression which caused new connections to prompt for reusing dead REPLs. +- [#3355](https://github.com/clojure-emacs/cider/pull/3355): Fix `cider-mode` disabling itself after a disconnect when `cider-auto-mode` is set to nil. ## 1.7.0 (2023-03-23)
[nongnu] elpa/cider c61689c7b2 2/5: perf: only call cider-mode if not already enabled
branch: elpa/cider commit c61689c7b25d3f1113d156d568dda1dfd074964f Author: yuhan0 Commit: Bozhidar Batsov perf: only call cider-mode if not already enabled Re-initializing cider-mode across many background buffers can cause significant performance issues. --- cider-connection.el | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/cider-connection.el b/cider-connection.el index 6421e45362..8e146bcefa 100644 --- a/cider-connection.el +++ b/cider-connection.el @@ -296,6 +296,7 @@ message in the REPL area." (cider-nrepl-send-request '("op" "out-subscribe") (cider-interactive-eval-handler (current-buffer +(defvar cider-mode) (declare-function cider-mode "cider-mode") (defun cider-enable-on-existing-clojure-buffers () "Enable CIDER's minor mode on existing Clojure buffers. @@ -304,18 +305,19 @@ See command `cider-mode'." (add-hook 'clojure-mode-hook #'cider-mode) (dolist (buffer (cider-util--clojure-buffers)) (with-current-buffer buffer - (cider-mode +1) - ;; In global-eldoc-mode, a new file-visiting buffer calls - ;; `turn-on-eldoc-mode' which enables eldoc-mode if it's supported in that - ;; buffer as determined by `eldoc--supported-p'. Cider's eldoc support - ;; allows new buffers in cider-mode to enable eldoc-mode. As of 2021-04, - ;; however, clojure-mode itself has no eldoc support, so old clojure - ;; buffers opened before cider started aren't necessarily in eldoc-mode. - ;; Here, we've enabled cider-mode for this old clojure buffer, and now, if - ;; global-eldoc-mode is enabled, try to enable eldoc-mode as if the buffer - ;; had just been created with cider-mode. - (when global-eldoc-mode -(turn-on-eldoc-mode) + (unless cider-mode +(cider-mode +1) +;; In global-eldoc-mode, a new file-visiting buffer calls +;; `turn-on-eldoc-mode' which enables eldoc-mode if it's supported in that +;; buffer as determined by `eldoc--supported-p'. Cider's eldoc support +;; allows new buffers in cider-mode to enable eldoc-mode. As of 2021-04, +;; however, clojure-mode itself has no eldoc support, so old clojure +;; buffers opened before cider started aren't necessarily in eldoc-mode. +;; Here, we've enabled cider-mode for this old clojure buffer, and now, if +;; global-eldoc-mode is enabled, try to enable eldoc-mode as if the buffer +;; had just been created with cider-mode. +(when global-eldoc-mode + (turn-on-eldoc-mode)) (declare-function cider--debug-mode "cider-debug") (defun cider-disable-on-existing-clojure-buffers ()
[nongnu] elpa/haskell-mode c27bf04c77 1/6: Add dependabot config
branch: elpa/haskell-mode commit c27bf04c77ad7eb5d736c578360f735cfd1473b4 Author: Steve Purcell Commit: Steve Purcell Add dependabot config --- .github/dependabot.yml | 10 ++ 1 file changed, 10 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00..ba29cb1dad --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: +- package-ecosystem: github-actions + directory: "/" + schedule: +interval: daily + open-pull-requests-limit: 10 + commit-message: +prefix: "chore" +include: "scope"
[nongnu] elpa/haskell-mode 13ae2d5047 3/6: chore(deps): bump cachix/install-nix-action from 20 to 22
branch: elpa/haskell-mode commit 13ae2d5047aee5cc1f38db90b568b69547063f22 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Commit: GitHub chore(deps): bump cachix/install-nix-action from 20 to 22 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 20 to 22. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v20...v22) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 627ba4b419..9f3a518b80 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: - emacs_version: 28.2 target: deploy-manual steps: -- uses: cachix/install-nix-action@v20 +- uses: cachix/install-nix-action@v22 with: nix_path: nixpkgs=channel:nixos-unstable - uses: purcell/setup-emacs@master
[nongnu] elpa/haskell-mode updated (98d0e193a6 -> 41c0cf6159)
elpasync pushed a change to branch elpa/haskell-mode. from 98d0e193a6 Merge pull request #1805 from jasagredo/jasagredo/sublibs-and-program-options new c27bf04c77 Add dependabot config new ac3592c71f chore(deps): bump actions/checkout from 2 to 3 new bc37058b11 Merge pull request #1807 from haskell/dependabot/github_actions/actions/checkout-3 new 13ae2d5047 chore(deps): bump cachix/install-nix-action from 20 to 22 new 73153f7f3b Merge pull request #1808 from haskell/dependabot/github_actions/cachix/install-nix-action-22 new 41c0cf6159 Disable flaky test Summary of changes: .github/dependabot.yml| 10 ++ .github/workflows/test.yml| 4 ++-- tests/haskell-indent-tests.el | 16 +--- 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 .github/dependabot.yml
[nongnu] elpa/haskell-mode 73153f7f3b 5/6: Merge pull request #1808 from haskell/dependabot/github_actions/cachix/install-nix-action-22
branch: elpa/haskell-mode commit 73153f7f3b6a6e24c4d3a9dc4d9085b9f9e28865 Merge: bc37058b11 13ae2d5047 Author: Steve Purcell Commit: GitHub Merge pull request #1808 from haskell/dependabot/github_actions/cachix/install-nix-action-22 chore(deps): bump cachix/install-nix-action from 20 to 22 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4f0e1184e4..bba2e2f837 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: - emacs_version: 28.2 target: deploy-manual steps: -- uses: cachix/install-nix-action@v20 +- uses: cachix/install-nix-action@v22 with: nix_path: nixpkgs=channel:nixos-unstable - uses: purcell/setup-emacs@master
[nongnu] elpa/haskell-mode 41c0cf6159 6/6: Disable flaky test
branch: elpa/haskell-mode commit 41c0cf61591279a22ac511f925c041c40969bdb8 Author: Steve Purcell Commit: Steve Purcell Disable flaky test --- tests/haskell-indent-tests.el | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/haskell-indent-tests.el b/tests/haskell-indent-tests.el index 946a0a68ea..7196405b8b 100644 --- a/tests/haskell-indent-tests.el +++ b/tests/haskell-indent-tests.el @@ -30,13 +30,15 @@ (haskell-indent-put-region-in-literate (point-min) (point-max)) (buffer-substring-no-properties (point-min) (point-max)) -(ert-deftest haskell-indent-put-region-in-literate-2 () - (should (equal "literate" - (with-temp-buffer - (insert "> literate") - (haskell-literate-mode) - (haskell-indent-put-region-in-literate (point-min) (point-max) -1) - (buffer-substring-no-properties (point-min) (point-max)) +;; ;; This test has been consistently flaky for unknown reasons, but +;; ;; usually passes in recent Emacsen +;; (ert-deftest haskell-indent-put-region-in-literate-2 () +;; (should (equal "literate" +;; (with-temp-buffer +;;(insert "> literate") +;;(haskell-literate-mode) +;;(haskell-indent-put-region-in-literate (point-min) (point-max) -1) +;;(buffer-substring-no-properties (point-min) (point-max)) (defsubst string-trim-left (string) "Remove leading whitespace from STRING."
[nongnu] elpa/haskell-mode ac3592c71f 2/6: chore(deps): bump actions/checkout from 2 to 3
branch: elpa/haskell-mode commit ac3592c71f384c32976186db5d699c5ad9735f4b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Commit: GitHub chore(deps): bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 627ba4b419..4f0e1184e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,7 +32,7 @@ jobs: with: version: ${{ matrix.emacs_version }} -- uses: actions/checkout@v2 +- uses: actions/checkout@v3 - name: Install stack and ghc run: nix-env -iA stack ghc -f '' - name: Install texinfo
[nongnu] elpa/haskell-mode bc37058b11 4/6: Merge pull request #1807 from haskell/dependabot/github_actions/actions/checkout-3
branch: elpa/haskell-mode commit bc37058b1140d5c32f0a13b9439a9d039a85bfa0 Merge: c27bf04c77 ac3592c71f Author: Steve Purcell Commit: GitHub Merge pull request #1807 from haskell/dependabot/github_actions/actions/checkout-3 chore(deps): bump actions/checkout from 2 to 3 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 627ba4b419..4f0e1184e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,7 +32,7 @@ jobs: with: version: ${{ matrix.emacs_version }} -- uses: actions/checkout@v2 +- uses: actions/checkout@v3 - name: Install stack and ghc run: nix-env -iA stack ghc -f '' - name: Install texinfo
[elpa] externals/org 1ec3a43c58: org-lint: Add checker for misspelled export options in properties
branch: externals/org commit 1ec3a43c58161609b34dfaa03e27d6e193348399 Author: Ihor Radchenko Commit: Ihor Radchenko org-lint: Add checker for misspelled export options in properties * lisp/org-lint.el (org-lint-export-option-keywords): New linter checking export properties without EXPORT_. Link: https://orgmode.org/list/87ttv7kp2j@k-7.ch --- lisp/org-lint.el | 28 1 file changed, 28 insertions(+) diff --git a/lisp/org-lint.el b/lisp/org-lint.el index c2ed007abb..418ed8c6f5 100644 --- a/lisp/org-lint.el +++ b/lisp/org-lint.el @@ -742,6 +742,29 @@ Use \"export %s\" instead" reports reports)) +(defun org-lint-export-option-keywords (ast) + "Check for options keyword properties without EXPORT_." + (require 'ox) + (let (options reports) +(dolist (opt org-export-options-alist) + (when (stringp (nth 1 opt)) +(cl-pushnew (nth 1 opt) options :test #'equal))) +(dolist (backend org-export-registered-backends) + (dolist (opt (org-export-backend-options backend)) +(when (stringp (nth 1 opt)) + (cl-pushnew (nth 1 opt) options :test #'equal +(org-element-map ast 'node-property + (lambda (node) +(when (member + (org-element-property :key node) + options) + (push (list (org-element-property :post-affiliated node) + (format "Potentially misspelled option \"%s\". Consider \"EXPORT_%s\"." + (org-element-property :key node) + (org-element-property :key node))) +reports +reports)) + (defun org-lint-invalid-macro-argument-and-template (ast) (let* ((reports nil) (extract-placeholders @@ -1443,6 +1466,11 @@ AST is the buffer parse tree." #'org-lint-unknown-options-item :categories '(export) :trust 'low) +(org-lint-add-checker 'misspelled-export-option + "Report potentially misspelled export options in properties." + #'org-lint-export-option-keywords + :categories '(export) :trust 'low) + (org-lint-add-checker 'invalid-macro-argument-and-template "Report spurious macro arguments or invalid macro templates" #'org-lint-invalid-macro-argument-and-template
[nongnu] elpa/keycast updated (a0549f420b -> 0b16d6aa3a)
elpasync pushed a change to branch elpa/keycast. from a0549f420b Release version 1.3.1 new 2da7852039 keycast--tree-member: Fix pasto new 0b16d6aa3a Release version 1.3.2 Summary of changes: keycast.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[nongnu] elpa/keycast 0b16d6aa3a 2/2: Release version 1.3.2
branch: elpa/keycast commit 0b16d6aa3ae965bcd6b4d1fd0173cfde9dc8e275 Author: Jonas Bernoulli Commit: Jonas Bernoulli Release version 1.3.2 --- keycast.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keycast.el b/keycast.el index d85f15331c..6dcf86681e 100644 --- a/keycast.el +++ b/keycast.el @@ -7,7 +7,7 @@ ;; Keywords: multimedia ;; Package-Requires: ((emacs "25.3") (compat "29.1.4.1")) -;; Package-Version: 1.3.1 +;; Package-Version: 1.3.2 ;; SPDX-License-Identifier: GPL-3.0-or-later
[nongnu] elpa/keycast 2da7852039 1/2: keycast--tree-member: Fix pasto
branch: elpa/keycast commit 2da7852039c6c0d01388d54d975b326f1618902d Author: Jonas Bernoulli Commit: Jonas Bernoulli keycast--tree-member: Fix pasto --- keycast.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keycast.el b/keycast.el index 5ac62d342d..d85f15331c 100644 --- a/keycast.el +++ b/keycast.el @@ -463,7 +463,7 @@ t to show the actual COMMAND, or a symbol to be shown instead." (defun keycast--tree-member (elt tree) ;; Also known as auto-compile--tree-member. - (and (listp sub) + (and (listp tree) (or (member elt tree) (catch 'found (dolist (sub tree)
[elpa] externals/debbugs 8e529f90b1: Code cleanup, adapt copyright years
branch: externals/debbugs commit 8e529f90b1cb82f48bf269bd77dcf8066efd3ce4 Author: Michael Albinus Commit: Michael Albinus Code cleanup, adapt copyright years * debbugs-gnu.el; Use #' read syntax where appropriate. (vc-git-log-view-mode): Declare. (debbugs-gnu-post-patch): Fix docstring. (debbugs-gnu-usertags): Avoid useless `unwind-protect'. * debbugs.el (debbugs-url-display-message-or-percentage-function): New variable. (debbugs-url-display-message-or-percentage): Rename from `debbugs-url-display-percentage'. (debbugs-get-bugs, debbugs-get-status, debbugs-search-est): Use them. --- Debbugs.wsdl | 2 +- debbugs-browse.el | 2 +- debbugs-compat.el | 2 +- debbugs-gnu.el| 141 +++--- debbugs-guix.el | 6 ++- debbugs-org.el| 2 +- debbugs-ug.texi | 2 +- debbugs.el| 52 debbugs.texi | 2 +- 9 files changed, 112 insertions(+), 99 deletions(-) diff --git a/Debbugs.wsdl b/Debbugs.wsdl index a0ff28d280..899f452877 100644 --- a/Debbugs.wsdl +++ b/Debbugs.wsdl @@ -1,6 +1,6 @@ -
[elpa] externals/lin 75983a770d: Add archive and tar to lin-mode-hooks
branch: externals/lin commit 75983a770d70b57c090db8cd503a340c32f51827 Author: Nicolas De Jaeghere Commit: Protesilaos Stavrou Add archive and tar to lin-mode-hooks Archive and Tar make good candidates for inclusion in the default hooks. --- lin.el | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lin.el b/lin.el index 4a00ff8d49..f4037993a9 100644 --- a/lin.el +++ b/lin.el @@ -73,7 +73,8 @@ :link '(info-link "(lin) Top")) (defcustom lin-mode-hooks - '(bongo-mode-hook + '(archive-mode-hook +bongo-mode-hook dired-mode-hook elfeed-search-mode-hook git-rebase-mode-hook @@ -90,7 +91,8 @@ org-agenda-mode-hook pdf-outline-buffer-mode-hook proced-mode-hook -tabulated-list-mode-hook) +tabulated-list-mode-hook +tar-mode-hook) "List of hooks that should be used by the `lin-global-mode'. Lin activates `hl-line-mode' and remaps its face to `lin-face'. This makes it possible to tweak the `lin-face' in order to
[elpa] externals/ztree 878375adf6: Updated readme
branch: externals/ztree commit 878375adf66a7993cfbc42f831acf92eee2b705b Author: Alexey Veretennikov Commit: Alexey Veretennikov Updated readme --- README.md | 122 -- 1 file changed, 6 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index 1a2274f8a0..8e4ea16fc0 100644 --- a/README.md +++ b/README.md @@ -1,121 +1,11 @@ -# ztree -Ztree is a project dedicated to implementation of several text-tree applications inside [GNU Emacs](http://www.gnu.org/software/emacs/). It consists of 2 subprojects: **ztree-diff** and **ztree-dir** (the basis of **ztree-diff**). Available in [GNU ELPA](https://elpa.gnu.org/) and [MELPA](http://melpa.org/#/). +# Give Up GitHub -## Installation +This project has given up GitHub. ([See Software Freedom Conservancy's *Give Up GitHub* site for details](https://GiveUpGitHub.org).) -### Using ELPA -Press `M-x` in GNU Emacs and write `list-packages`. Find the `ztree` in the list of packages and press `i` to select this package, `x` to install the package. +You can now find this project at [https://codeberg.org/fourier/ztree](https://codeberg.org/fourier/ztree) instead. -### Using MELPA -Add to your `.emacs` or `.emacs.d/init.el` following lines: +Any use of this project's code by GitHub Copilot, past or present, is done without our permission. We do not consent to GitHub's use of this project's code in Copilot. -```scheme -(setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/";) - ("melpa" . "http://melpa.milkbox.net/packages/";))) -``` - -Follow the installation instructions for the GNU ELPA above. - -### Manual -Add the following to your .emacs file: - -```scheme -(push (substitute-in-file-name "path-to-ztree-directory") load-path) -(require 'ztree) -``` - -## ztree-diff -**ztree-diff** is a directory-diff tool for Emacs inspired by commercial tools like Beyond Compare or Araxis Merge. It supports showing the difference between two directories; calling **Ediff** for not matching files, copying between directories, deleting file/directories, hiding/showing equal files/directories. - -The comparison itself performed with the external **GNU diff** tool, so make sure to have one in the executable path. Verified on OSX and Linux. - -If one wants to have a stand-alone application, consider the (WIP)[zdircmp](https://github.com/fourier/zdircmp) project based on **ztree-diff**. - -Call the `ztree-diff` interactive function: - -``` -M-x ztree-diff -``` -Then you need to specify the left and right directories to compare. - -### Hotkeys supported - * Open/close directories with double-click, `RET` or `Space` keys. - * To jump to the parent directory, hit the `Backspace` key. - * To toggle open/closed state of the subtree of the current directory, hit the `x` key. - * `RET` on different files starts the **Ediff** (or open file if one absent or the same) - * `Space` show the simple diff window for the current file instead of **Ediff** (or view file if one absent or the same) - * `TAB` to fast switch between panels - * `h` key to toggle show/hide identical files/directories - * `H` key to toggle show/hide hidden/ignored files/directories - * `C` key to copy current file or directory to the left or right panel - * `D` key to delete current file or directory - * `v` key to quick view the current file - * `r` initiates the rescan/refresh of current file or subdirectory - * `F5` forces the full rescan. - -### Customizations -By default all files starting with dot (like `.gitignore`) are not shown and excluded from the difference status for directories. One can add an additional regexps to the list `ztree-diff-filter-list`. - -One also could turn on unicode characters to draw the tree with instead of normal ASCII-characters. This is controlled by the `ztree-draw-unicode-lines` variable. - -The variable `ztree-diff-consider-file-permissions` (which is `nil` by default) if set to `t` allows to compare file attributes as well, the files will be considered different if they have different mode. - -The special variable `ztree-diff-additional-options` -introduced to provide an additional arguments -to the 'diff' tool. -For example one could specify -``` -(setq ztree-diff-additional-options '("-w" "-i")) -``` -to ignore case differences and whitespace differences. - - -### Screenshots - - - - - -## ztree-dir - -**ztree-dir** is a simple text-mode directory tree for Emacs. See screenshots below for the GUI and the terminal versions of the **ztree-dir**. - -Call the `ztree-dir` interactive function: - -``` -M-x ztree-dir -``` -
[elpa] externals/dash d5182da04c: No longer mark some functions as pure
branch: externals/dash commit d5182da04ca54c026ea0bf381f2c1642a30e2686 Author: Basil L. Contovounesios Commit: Basil L. Contovounesios No longer mark some functions as pure Functions that guarantee a fresh return value should not be pure, since their return value is likely to be mutated destructively: https://bugs.gnu.org/64127 * NEWS.md (2.20.0): List affected functions. * dash.el (-non-nil, -cons*, -snoc, -slice, -take, -take-last) (-drop-last, -split-at, -interpose, -interleave, -repeat, -iota) (-clone): No longer mark as pure. * dev/examples.el (-powerset): Avoid mutating constant. Fixes #405. --- NEWS.md | 9 + dash.el | 26 +- dev/examples.el | 2 +- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/NEWS.md b/NEWS.md index c0a306fbb3..3502e333b3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -35,6 +35,15 @@ See the end of the file for license conditions. (-permutations '(1 1 2)) ; => '((1 1 2) (1 2 1) (2 1 1)) ``` +- Several functions which are documented as returning a fresh, mutable + object (such as a copy of one of their arguments) are no longer + marked as `pure`. Pure functions called with constant arguments are + evaluated during byte-compilation; the resulting value is an + immutable constant, and thus unsafe to modify destructively. The + functions in question are: `-clone`, `-cons*`, `-drop-last`, + `-interleave`, `-interpose`, `-iota`, `-non-nil`, `-repeat`, + `-slice`, `-snoc`, `-split-at`, `-take`, `-take-last`. + New features - The function `-contains?` now returns the matching tail of the list diff --git a/dash.el b/dash.el index f02a534538..11f20faaac 100644 --- a/dash.el +++ b/dash.el @@ -607,7 +607,7 @@ Its anaphoric counterpart is `--keep'." (defun -non-nil (list) "Return a copy of LIST with all nil items removed." - (declare (pure t) (side-effect-free t)) + (declare (side-effect-free t)) (--filter it list)) (defmacro --map-indexed (form list) @@ -856,7 +856,7 @@ See also: `-splice', `-insert-at'" The last 2 elements of ARGS are used as the final cons of the result, so if the final element of ARGS is not a list, the result is a dotted list. With no ARGS, return nil." - (declare (pure t) (side-effect-free t)) + (declare (side-effect-free t)) (let* ((len (length args)) (tail (nthcdr (- len 2) args)) (last (cdr tail))) @@ -871,7 +871,7 @@ is a dotted list. With no ARGS, return nil." This is like `cons', but operates on the end of list. If any ELEMENTS are given, append them to the list as well." - (declare (pure t) (side-effect-free t)) + (declare (side-effect-free t)) (-concat list (list elem) elements)) (defmacro --first (form list) @@ -1172,7 +1172,7 @@ modulo the length of the list. If STEP is a number, only each STEPth item in the resulting section is returned. Defaults to 1." - (declare (pure t) (side-effect-free t)) + (declare (side-effect-free t)) (let ((length (length list)) (new-list nil)) ;; to defaults to the end of the list @@ -1247,7 +1247,7 @@ Return a copy of LIST if it contains N items or fewer. Return nil if N is zero or less. See also: `-take-last'." - (declare (pure t) (side-effect-free t)) + (declare (side-effect-free t)) (--take-while (< it-index n) list)) (defun -take-last (n list) @@ -1256,7 +1256,7 @@ Return a copy of LIST if it contains N items or fewer. Return nil if N is zero or less. See also: `-take'." - (declare (pure t) (side-effect-free t)) + (declare (side-effect-free t)) (copy-sequence (last list n))) (defalias '-drop #'nthcdr @@ -1273,7 +1273,7 @@ Return a copy of LIST if N is zero or less. Return nil if LIST contains N items or fewer. See also: `-drop'." - (declare (pure t) (side-effect-free t)) + (declare (side-effect-free t)) (nbutlast (copy-sequence list) n)) (defun -split-at (n list) @@ -1283,7 +1283,7 @@ new list of the first N elements of LIST, and DROP is the remaining elements of LIST (not a copy). TAKE and DROP are like the results of `-take' and `-drop', respectively, but the split is done in a single list traversal." - (declare (pure t) (side-effect-free t)) + (declare (side-effect-free t)) (let (result) (--each-while list (< it-index n) (push (pop list) result)) @@ -1641,7 +1641,7 @@ elements of LIST. Keys are compared by `equal'." (defun -interpose (sep list) "Return a new list of all elements in LIST separated by SEP." - (declare (pure t) (side-effect-free t)) + (declare (side-effect-free t)) (let (result) (when list (!cons (car list) result) @@ -1653,7 +1653,7 @@ elements of LIST. Keys are compared by `equal'." (defun -interleave (&rest lists) "Return a new list of the first item in each list, then the second etc." - (declare (pure t) (side-effect-free t)) + (declare (side-effect-free t)) (when lists (let (result)
[elpa] externals/urgrep a2cc745cb1: Lint test files too
branch: externals/urgrep commit a2cc745cb166a9e319b58dbb03e0751bbf8a2256 Author: Jim Porter Commit: Jim Porter Lint test files too --- Makefile | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 75e567a316..8efdcff1ae 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,9 @@ all: compile autoloads .PHONY: compile compile: $(OBJS) +.PHONY: compile-tests +compile-tests: $(TEST_OBJS) + .PHONY: autoloads autoloads: $(AUTOLOADS) @@ -78,7 +81,7 @@ run: all .PHONY: lint lint: - @$(MAKE) --always-make STRICT=1 compile + @$(MAKE) --always-make STRICT=1 compile compile-tests .PHONY: check check: $(if $(NO_COMPILE),,$(OBJS) $(TEST_OBJS))