[elpa] externals/diff-hl 256461d8d4: Try resolving diff-hl-reference-revision to a concrete revision first
branch: externals/diff-hl commit 256461d8d4facc58db665c9450919735b38b944a Author: Dmitry Gutov Commit: Dmitry Gutov Try resolving diff-hl-reference-revision to a concrete revision first Fixes #224 --- diff-hl.el | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/diff-hl.el b/diff-hl.el index 8f83851f31..3fb8b1180f 100644 --- a/diff-hl.el +++ b/diff-hl.el @@ -328,6 +328,7 @@ If any returns non-nil, `diff-hl-update' will run synchronously anyway." diff-hl-reference-revision (declare-function vc-git-command "vc-git") +(declare-function vc-git--rev-parse "vc-git") (defun diff-hl-changes-buffer (file backend) (diff-hl-with-diff-switches @@ -1124,7 +1125,7 @@ CONTEXT-LINES is the size of the unified diff context, defaults to 0." (diff-hl-git-index-object-name file)) (diff-hl-create-revision file - (or diff-hl-reference-revision + (or (diff-hl-resolved-reference-revision backend) (diff-hl-working-revision file backend) (switches (format "-U %d --strip-trailing-cr" (or context-lines 0 (diff-no-select rev (current-buffer) switches 'noasync @@ -1135,6 +1136,16 @@ CONTEXT-LINES is the size of the unified diff context, defaults to 0." (delete-matching-lines "^Diff finished.*"))) (get-buffer-create dest-buffer +(defun diff-hl-resolved-reference-revision (backend) + (cond + ((null diff-hl-reference-revision) +nil) + ((eq backend 'Git) +(vc-git--rev-parse diff-hl-reference-revision)) + ;; Symbolic refs resolution needed for Hg too? + (t + diff-hl-reference-revision))) + ;; TODO: Cache based on .git/index's mtime, maybe. (defun diff-hl-git-index-object-name (file) (with-temp-buffer
[elpa] externals/dape 3d4b8086d9 2/2: Bump version to 0.16.0
branch: externals/dape commit 3d4b8086d94ca93fe19ec72362782386abf35bde Author: Daniel Pettersson Commit: Daniel Pettersson Bump version to 0.16.0 --- CHANGELOG.org | 16 dape.el | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index d5f4a6b67c..eeefc73235 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -2,6 +2,22 @@ #+author: Daniel Pettersson #+language: en +* Version 0.16.0 +- Decouple breakpoints from buffers killing buffer no longer kills breakpoints +- Add =command-insert-stderr= property to =dape-configs= (stderr in =dlv=) +- Add =command-env= property to =dape-configs= +- Add support for =hl-line-mode= +- Add bash-debug +- Add reverse zapp like parsing with "-" +- Add future history value for for dape command +- Change breakpoint buffer format +- Fix precedence of inlay hint values +- Fix empty inlay hints " " for lines with no hints +- Fix killing of buffers suffix +- Fix misplaced parens in define-key call +- Fix info scope buffer naming before scope name is known +- Fix dropped line arrow due to delayed stack frame fetching + * Version 0.15.0 - Add =defer-launch-attach= to support gdb=>15.1 - Add OCaml support with =ocamlearlybird= diff --git a/dape.el b/dape.el index 99be7b7ebb..2977b1f0c7 100644 --- a/dape.el +++ b/dape.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Pettersson ;; Created: 2023 ;; License: GPL-3.0-or-later -;; Version: 0.15.0 +;; Version: 0.16.0 ;; Homepage: https://github.com/svaante/dape ;; Package-Requires: ((emacs "29.1") (jsonrpc "1.0.25"))
[elpa] externals/dape e922fc6c5f 1/2: Update screenshots
branch: externals/dape commit e922fc6c5f47cdd5302bce27b680bf83df7fadc6 Author: Daniel Pettersson Commit: Daniel Pettersson Update screenshots --- README.org | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.org b/README.org index fa36b6c85c..6568201de9 100644 --- a/README.org +++ b/README.org @@ -26,11 +26,11 @@ For complete functionality, make sure to enable ~eldoc-mode~ in your source buff + No external dependencies outside of core Emacs With ~(setq dape-buffer-window-arrangement 'right)~: -[[https://raw.githubusercontent.com/svaante/dape/resources/c-right-14.0.0.png]] +[[https://raw.githubusercontent.com/svaante/dape/resources/right_0_16_0.png]] And with ~(setq dape-buffer-window-arrangement 'gud)~ + =corfu= as ~completion-in-region-function~: -[[https://raw.githubusercontent.com/svaante/dape/resources/js-gud-14.0.0.png]] +[[https://raw.githubusercontent.com/svaante/dape/resources/gud_0_16_0.png]] With =minibuffer= adapter configuration hints: -[[https://raw.githubusercontent.com/svaante/dape/resources/minibuffer-hints-14.0.0.png]] +[[https://raw.githubusercontent.com/svaante/dape/resources/minibuffer_0_16_0.png]] Screenshots taken with [[https://elpa.gnu.org/packages/standard-themes.html][standard-light]]. * Configuration
[elpa] externals/dape updated (39be2ac273 -> 3d4b8086d9)
elpasync pushed a change to branch externals/dape. from 39be2ac273 Change suggested customization new e922fc6c5f Update screenshots new 3d4b8086d9 Bump version to 0.16.0 Summary of changes: CHANGELOG.org | 16 README.org| 6 +++--- dape.el | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-)
[elpa] externals/debbugs a79cfc08e8: Don't advice in Emacs 31+
branch: externals/debbugs commit a79cfc08e8c3fa683e2782a7373acb6ef45e50b6 Author: Michael Albinus Commit: Michael Albinus Don't advice in Emacs 31+ * debbugs-compat.el (debbugs-compat-add-debbugs-advice) (debbugs-compat-remove-debbugs-advice): Check for Emacs version. * debbugs-gnu.el (current-thread, make-thread): Declare. (debbugs-gnu, debbugs-gnu-show-reports): Don't use `funcall'. * debbugs-org.el (current-thread): Declare. (debbugs-org-show-reports): Don't use `funcall'. --- debbugs-compat.el | 7 --- debbugs-gnu.el| 6 -- debbugs-org.el| 4 +++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/debbugs-compat.el b/debbugs-compat.el index 0e95d8605b..60ffece0db 100644 --- a/debbugs-compat.el +++ b/debbugs-compat.el @@ -39,7 +39,8 @@ ;; This is needed for Bug#73199. ;; `soap-invoke-internal' let-binds `url-http-attempt-keepalives' to -;; t, which is not thread-safe. We override this setting. +;; t, which is not thread-safe. We override this setting. It is +;; fixed in Emacs 31.1. (defvar url-http-attempt-keepalives) (defvar debbugs-gnu-use-threads) (defvar debbugs-compat-url-http-attempt-keepalives nil @@ -51,7 +52,7 @@ (defun debbugs-compat-add-debbugs-advice () "Activate advice for Bug#73199." - (when debbugs-gnu-use-threads + (when (and debbugs-gnu-use-threads (< emacs-major-version 31)) (setq debbugs-compat-url-http-attempt-keepalives url-http-attempt-keepalives) (advice-add @@ -59,7 +60,7 @@ (defun debbugs-compat-remove-debbugs-advice () "Deactivate advice for Bug#73199." - (when debbugs-gnu-use-threads + (when (and debbugs-gnu-use-threads (< emacs-major-version 31)) (setq url-http-attempt-keepalives debbugs-compat-url-http-attempt-keepalives) (advice-remove 'url-http-create-request #'debbugs-compat-debbugs-advice))) diff --git a/debbugs-gnu.el b/debbugs-gnu.el index be744d924f..b5f07ad3cd 100644 --- a/debbugs-gnu.el +++ b/debbugs-gnu.el @@ -221,6 +221,8 @@ (declare-function log-view-current-tag "log-view" (&optional pos)) (declare-function magit-status-setup-buffer "magit" (&optional directory)) (declare-function magit-refresh "magit" ()) +(declare-function current-thread "thread.c" ()) +(declare-function make-thread "thread.c" (function &optional NAME)) (defvar compilation-in-progress) (defvar diff-file-header-re) @@ -892,7 +894,7 @@ value, like in `debbugs-gnu-get-bugs' or `debbubgs-gnu-tagged'." (> (length debbugs-gnu-local-tags) (1- debbugs-gnu-use-threads-lower-limit)) t)) - (funcall 'make-thread + (make-thread (lambda () (let (debbugs-show-progress) (unwind-protect @@ -1038,7 +1040,7 @@ are taken from the cache instead." ;; When we are retrieving the bugs asynchronously (we're not in the ;; main thread), the buffer shall not be shown to the user yet. (funcall - (if (or (not main-thread) (eq main-thread (funcall 'current-thread))) + (if (or (not main-thread) (eq main-thread (current-thread))) #'pop-to-buffer-same-window #'set-buffer) (get-buffer-create debbugs-gnu-current-buffer)) (let ((inhibit-read-only t)) diff --git a/debbugs-org.el b/debbugs-org.el index 17fa8a39b5..e7a7b2892c 100644 --- a/debbugs-org.el +++ b/debbugs-org.el @@ -132,6 +132,8 @@ (require 'org) (eval-when-compile (require 'cl-lib)) +(declare-function current-thread "thread.c" ()) + ;; Buffer-local variables. (defvar debbugs-gnu-local-query) (defvar debbugs-gnu-local-filter) @@ -204,7 +206,7 @@ marked as \"client-side filter\"." ;; the main thread), the buffer shall not be shown to the user ;; yet. (funcall - (if (or (not main-thread) (eq main-thread (funcall 'current-thread))) + (if (or (not main-thread) (eq main-thread (current-thread))) #'pop-to-buffer-same-window #'set-buffer) (get-buffer-create debbugs-org-buffer-name)) (org-mode)
[elpa] externals/denote 19f6aaf0b1: Make denote-add-front-matter default to file title and keywords
branch: externals/denote commit 19f6aaf0b1fbb6f54f93c4750f9e30529c5f3327 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Make denote-add-front-matter default to file title and keywords --- denote.el | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/denote.el b/denote.el index 1b3bd68884..d9347cccd2 100644 --- a/denote.el +++ b/denote.el @@ -3463,10 +3463,13 @@ relevant front matter. That Vertico command is bound to M-RET as of this writing on 2024-02-29 09:24 +0200. ]" (interactive - (list -(buffer-file-name) -(denote-title-prompt nil "Add TITLE (empty to ignore)") -(denote-keywords-sort (denote-keywords-prompt "Add KEYWORDS (empty to ignore)" + (let* ((file buffer-file-name) + (default-title (denote-retrieve-filename-title file)) + (default-keywords (string-join (denote-retrieve-filename-keywords-as-list file) ","))) + (list + file + (denote-title-prompt default-title "Add TITLE (empty to ignore)") + (denote-keywords-sort (denote-keywords-prompt "Add KEYWORDS (empty to ignore)" default-keywords) (when-let ((denote-file-is-writable-and-supported-p file) (id (denote-retrieve-filename-identifier file)) (file-type (denote-filetype-heuristics file)))
