[elpa] externals/visual-filename-abbrev 4af7868db7: Release visual-filename-abbrev 1.3
branch: externals/visual-filename-abbrev commit 4af7868db7bbc6a3c185540ba4e257d4c4c560c0 Author: Tassilo Horn Commit: Tassilo Horn Release visual-filename-abbrev 1.3 There's a new predicate visual-filename-abbrev--line-wider-than-window-p one can add to visual-filename-abbrev-predicates in which case it is only abbreviated if the line the filename is on is wider than the width of the window. --- visual-filename-abbrev.el | 24 +--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/visual-filename-abbrev.el b/visual-filename-abbrev.el index c5e9017ade..b06084cab0 100644 --- a/visual-filename-abbrev.el +++ b/visual-filename-abbrev.el @@ -1,12 +1,12 @@ ;;; visual-filename-abbrev.el --- Visually abbreviate filenames -*- lexical-binding: t; -*- -;; Copyright (C) 2019-2022 Free Software Foundation, Inc +;; Copyright (C) 2019-2022, 2024 Free Software Foundation, Inc ;; Author: Tassilo Horn ;; Maintainer: Tassilo Horn ;; Keywords: tools ;; Package-Requires: ((emacs "26.1")) -;; Version: 1.2 +;; Version: 1.3 ;; This file is part of GNU Emacs. @@ -122,6 +122,15 @@ This takes the font at POS into account." (< (visual-filename-abbrev--get-visual-width abbrev font) (visual-filename-abbrev--get-visual-width filename font)) +(defun visual-filename-abbrev--line-wider-than-window-p (_buffer pos _filename _abbrev) + "Return non-nil if the line with POS is wider than the width of the window." + (save-excursion +(goto-char pos) +(< (window-width nil t) + (string-pixel-width +(buffer-substring (line-beginning-position) + (line-end-position)) + (defcustom visual-filename-abbrev-predicates (list #'visual-filename-abbrev--abbrev-visually-shorter-p) "A list of predicates inhibiting abbreviation of a filename. @@ -148,7 +157,16 @@ These predicates are available: that an abbreviation is only shown if it is visually shorter than the original filename, i.e., it takes the current font and, e.g., double-width unicode characters into account. -This predicate is a bit more expensive to compute." +This predicate is a bit more expensive to compute. + + - `visual-filename-abbrev--line-wider-than-window-p' allows +abbreviations only if the line the filename is on is wider than the +width of the window, i.e., abbreviations are only shown if the +window is too narrow for the unabbreviated filename. This predicate +is best used together with one of the other predicates. It also +allows to relax `visual-filename-abbrev-regex' a bit to cover +filenames without extension which can lead to too many false +positives otherwise." :group 'visual-filename-abbrev :type '(repeat function))
[elpa] externals/denote c3c70801d7 2/2: Merge pull request #399 from jeanphilippegg/denote-templates
branch: externals/denote commit c3c70801d7633f02d75151bc9e5d5b3d99acce21 Merge: 259d04aeaa af1eab81e8 Author: Protesilaos Stavrou Commit: GitHub Merge pull request #399 from jeanphilippegg/denote-templates Add support for function templates in denote-org-capture --- denote.el | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/denote.el b/denote.el index 5b8e04f111..1ffd53e954 100644 --- a/denote.el +++ b/denote.el @@ -4815,13 +4815,16 @@ Consult the manual for template samples." (denote--creation-prepare-note-data title keywords 'org directory date template signature)) (id (denote--find-first-unused-id (denote-get-identifier date))) (front-matter (denote--format-front-matter - title (denote--date nil 'org) keywords id 'org))) + title (denote--date nil 'org) keywords id 'org)) + (template-string (cond ((stringp template) template) + ((functionp template) (funcall template)) + (t (user-error "Invalid template") (setq denote-last-path (denote-format-file-name directory id keywords title ".org" signature)) (when (file-regular-p denote-last-path) (user-error "A file named `%s' already exists" denote-last-path)) (denote--keywords-add-to-history keywords) -(concat front-matter template denote-org-capture-specifiers))) +(concat front-matter template-string denote-org-capture-specifiers))) ;; TODO 2023-12-02: Maybe simplify `denote-org-capture-with-prompts' ;; by passing a single PROMPTS that is the same value as `denote-prompts'?
[elpa] externals/denote af1eab81e8 1/2: Add support for function templates in denote-org-capture
branch: externals/denote commit af1eab81e8e95e61f852abae8c42497143428e85 Author: Jean-Philippe Gagné Guay Commit: Jean-Philippe Gagné Guay Add support for function templates in denote-org-capture --- denote.el | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/denote.el b/denote.el index 5b8e04f111..1ffd53e954 100644 --- a/denote.el +++ b/denote.el @@ -4815,13 +4815,16 @@ Consult the manual for template samples." (denote--creation-prepare-note-data title keywords 'org directory date template signature)) (id (denote--find-first-unused-id (denote-get-identifier date))) (front-matter (denote--format-front-matter - title (denote--date nil 'org) keywords id 'org))) + title (denote--date nil 'org) keywords id 'org)) + (template-string (cond ((stringp template) template) + ((functionp template) (funcall template)) + (t (user-error "Invalid template") (setq denote-last-path (denote-format-file-name directory id keywords title ".org" signature)) (when (file-regular-p denote-last-path) (user-error "A file named `%s' already exists" denote-last-path)) (denote--keywords-add-to-history keywords) -(concat front-matter template denote-org-capture-specifiers))) +(concat front-matter template-string denote-org-capture-specifiers))) ;; TODO 2023-12-02: Maybe simplify `denote-org-capture-with-prompts' ;; by passing a single PROMPTS that is the same value as `denote-prompts'?
[nongnu] elpa/helm ef4e7b96ce: encode helm-pattern and directory to make helm-grep-ag work with non-utf8 chars
branch: elpa/helm commit ef4e7b96ce6ea12d3728ac6a0fcb349fc42e2ce9 Author: zbelial Commit: Thierry Volpiatto encode helm-pattern and directory to make helm-grep-ag work with non-utf8 chars --- helm-grep.el | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/helm-grep.el b/helm-grep.el index 0c5342cb71..41cb8016b0 100644 --- a/helm-grep.el +++ b/helm-grep.el @@ -1635,8 +1635,12 @@ returns if available with current AG version." (helm-default-directory) default-directory)) (cmd-line (helm-grep-ag-prepare-cmd-line - helm-pattern (or (file-remote-p directory 'localname) -directory) + ;; NOTE Encode directory name and pattern, + ;; or it may not work with Chinese and maybe other non-utf8 + ;; characters on MSWindows systems issue#2677 and issue#2678. + (encode-coding-string helm-pattern locale-coding-system) + (or (file-remote-p directory 'localname) + (encode-coding-string directory locale-coding-system)) type)) (start-time (float-time)) (proc-name (helm-grep--ag-command)))
[nongnu] elpa/treesit-fold 1382743f95: ci: Test Emacs 29.4
branch: elpa/treesit-fold commit 1382743f95eb0de0ad675d0e56a622bb06822d04 Author: JenChieh Commit: JenChieh ci: Test Emacs 29.4 --- .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 9994bac1da..53355b300a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] emacs-version: - - 29.3 + - 29.4 experimental: [false] include: - os: ubuntu-latest
[nongnu] elpa/helm-core updated (d5878c24e0 -> ef4e7b96ce)
elpasync pushed a change to branch elpa/helm-core. from d5878c24e0 Merge pull request #2676 from taquangtrung/master adds ef4e7b96ce encode helm-pattern and directory to make helm-grep-ag work with non-utf8 chars No new revisions were added by this update. Summary of changes: helm-grep.el | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-)
[nongnu] elpa/popup c83d6e5f5f: Update test.yml
branch: elpa/popup commit c83d6e5f5fa693e08a542ea9ad7c06eced652de9 Author: Jen-Chieh Shen Commit: GitHub Update test.yml --- .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 cffa08b417..950269dabc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: - 26.3 - 27.2 - 28.2 - - 29.3 + - 29.4 experimental: [false] include: - os: ubuntu-latest
[elpa] externals/cursor-undo a8f93f73ea: * cursor-undo.el: change the global enabling flag to a customized variable
branch: externals/cursor-undo commit a8f93f73eafb8a2519f0e50b418a44421082f848 Author: Luke Lee Commit: Luke Lee * cursor-undo.el: change the global enabling flag to a customized variable (disable-cursor-tracking): prevent duplicated advise to the same function. --- cursor-undo.el | 24 +--- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/cursor-undo.el b/cursor-undo.el index 3af2dc8d23..6e9e0e3b17 100644 --- a/cursor-undo.el +++ b/cursor-undo.el @@ -93,7 +93,10 @@ ;;; Code: -(defvar cundo-enable-cursor-tracking t) ; global enable flag +;; Global enabling control flag +(defcustom cundo-enable-cursor-tracking t + "Global control flag to enable cursor undo tracking." + :type 'boolean) ;; Local disable flag, use reverse logic as NIL is still a list and we can ;; pop it again and again (defvar cundo-disable-local-cursor-tracking nil) @@ -219,8 +222,16 @@ relative screen position (screen-pos=NIL) nor `point' position (no-move=t).")) ;; temporarily cursor jump ;; (defmacro disable-cursor-tracking (func-sym) - (let ((advice-sym (make-symbol ;; gensym - (concat (symbol-name func-sym) "-disable-cursor-tracking" + (let* ((func-sym-str (symbol-name func-sym)) + (advice-sym-str (concat func-sym-str "-disable-cursor-tracking")) + (advice-sym (make-symbol advice-sym-str)) + (def-advice-sym (intern-soft + (concat func-sym-str "@" advice-sym-str +;; prevent duplicate definition +(if def-advice-sym +(error (message (format +"Error: Redefining cursor tracking disabling advice for `%S'" + func-sym `(progn (define-advice ,func-sym (:around (orig-func &rest args) ,advice-sym) (let ((cundo-enable-cursor-tracking nil)) @@ -266,7 +277,6 @@ relative screen position (screen-pos=NIL) nor `point' position (no-move=t).")) (apply orig-func args)) (apply orig-func args - (provide 'cursor-undo) ;;; @@ -297,6 +307,8 @@ relative screen position (screen-pos=NIL) nor `point' position (no-move=t).")) (def-cursor-undo recenter nil t t) (def-cursor-undo recenter-top-bottomnil t t) (def-cursor-undo mark-whole-buffer t t) +(def-cursor-undo goto-line t t) +(def-cursor-undo move-to-window-linet) (disable-cursor-tracking save-buffer) (disable-cursor-tracking write-file) @@ -314,9 +326,7 @@ relative screen position (screen-pos=NIL) nor `point' position (no-move=t).")) (def-cursor-undo cua-resize-rectangle-left nil nil nil) (def-cursor-undo cua-resize-rectangle-right nil nil nil) (def-cursor-undo cua-resize-rectangle-page-up nil nil nil) - (def-cursor-undo cua-resize-rectangle-page-down nil nil nil) - (def-cursor-undo goto-line t t) - (def-cursor-undo move-to-window-linet))) + (def-cursor-undo cua-resize-rectangle-page-down nil nil nil))) ;; ;; Brief Editor Mode cursor movements
[elpa] externals/elisa 80fa89bb73 1/3: Add progress reporter to async operations
branch: externals/elisa commit 80fa89bb73ada98d19e8926b30d1574637e5f968 Author: Sergey Kostyaev Commit: Sergey Kostyaev Add progress reporter to async operations --- elisa.el | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/elisa.el b/elisa.el index 653b5d1450..65412abc90 100644 --- a/elisa.el +++ b/elisa.el @@ -1152,7 +1152,11 @@ WHERE d.rowid in %s;" (defun elisa--async-do (func &optional on-done) "Do FUNC asyncronously. Call ON-DONE callback with result as an argument after FUNC evaluation done." - (let ((command real-this-command)) + (let* ((command real-this-command) +(reporter (make-progress-reporter (if command + (prin1-to-string command) +"elisa async processing"))) +(timer (run-at-time t 0.2 (lambda () (progress-reporter-update reporter) (async-start `(lambda () ,(async-inject-variables "elisa-embeddings-provider") ,(async-inject-variables "elisa-db-directory") @@ -1176,12 +1180,12 @@ Call ON-DONE callback with result as an argument after FUNC evaluation done." (require 'elisa) (,func)) (lambda (res) + (cancel-timer timer) + (progress-reporter-done reporter) (sqlite-close elisa-db) (elisa--reopen-db) (when on-done -(funcall on-done res)) - (message "%s done." - (or command "async elisa processing")) +(funcall on-done res)) (defun elisa-extact-webpage-chunks (url) "Extract semantic chunks for webpage fetched from URL."
[elpa] externals/ellama 8270e71c33 4/4: Bump version
branch: externals/ellama commit 8270e71c335b1656384e6c1b9d61c2a7ecc65bbb Author: Sergey Kostyaev Commit: Sergey Kostyaev Bump version --- NEWS.org | 2 ++ ellama.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS.org b/NEWS.org index dd0b552fa2..dcb639c8e2 100644 --- a/NEWS.org +++ b/NEWS.org @@ -1,3 +1,5 @@ +* Version 0.11.13 +- Add ability to use sessions in other elisp packages. * Version 0.11.12 - Fix ellama providers validation. * Version 0.11.11 diff --git a/ellama.el b/ellama.el index d7c675d657..e3210bacca 100644 --- a/ellama.el +++ b/ellama.el @@ -6,7 +6,7 @@ ;; URL: http://github.com/s-kostyaev/ellama ;; Keywords: help local tools ;; Package-Requires: ((emacs "28.1") (llm "0.6.0") (spinner "1.7.4") (compat "29.1")) -;; Version: 0.11.12 +;; Version: 0.11.13 ;; SPDX-License-Identifier: GPL-3.0-or-later ;; Created: 8th Oct 2023
[elpa] externals/elisa f89691796c 2/3: Merge pull request #23 from s-kostyaev/add-progress-reporter
branch: externals/elisa commit f89691796c94241bd2afb6f3a9a27eb0bc945774 Merge: 7298d3ee8d 80fa89bb73 Author: Sergey Kostyaev Commit: GitHub Merge pull request #23 from s-kostyaev/add-progress-reporter Add progress reporter to async operations --- elisa.el | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/elisa.el b/elisa.el index 653b5d1450..65412abc90 100644 --- a/elisa.el +++ b/elisa.el @@ -1152,7 +1152,11 @@ WHERE d.rowid in %s;" (defun elisa--async-do (func &optional on-done) "Do FUNC asyncronously. Call ON-DONE callback with result as an argument after FUNC evaluation done." - (let ((command real-this-command)) + (let* ((command real-this-command) +(reporter (make-progress-reporter (if command + (prin1-to-string command) +"elisa async processing"))) +(timer (run-at-time t 0.2 (lambda () (progress-reporter-update reporter) (async-start `(lambda () ,(async-inject-variables "elisa-embeddings-provider") ,(async-inject-variables "elisa-db-directory") @@ -1176,12 +1180,12 @@ Call ON-DONE callback with result as an argument after FUNC evaluation done." (require 'elisa) (,func)) (lambda (res) + (cancel-timer timer) + (progress-reporter-done reporter) (sqlite-close elisa-db) (elisa--reopen-db) (when on-done -(funcall on-done res)) - (message "%s done." - (or command "async elisa processing")) +(funcall on-done res)) (defun elisa-extact-webpage-chunks (url) "Extract semantic chunks for webpage fetched from URL."
[elpa] externals/elisa updated (7298d3ee8d -> 8537392489)
elpasync pushed a change to branch externals/elisa. from 7298d3ee8d Add GNU ELPA badge new 80fa89bb73 Add progress reporter to async operations new f89691796c Merge pull request #23 from s-kostyaev/add-progress-reporter new 8537392489 Bump version Summary of changes: NEWS.org | 2 ++ elisa.el | 14 +- 2 files changed, 11 insertions(+), 5 deletions(-)
[elpa] externals/ellama 3bfb3b383c 1/4: Add ability to call ellama functions with selected session
branch: externals/ellama commit 3bfb3b383c76f3cc9b5eaa97d288f7bb72e373eb Author: Sergey Kostyaev Commit: Sergey Kostyaev Add ability to call ellama functions with selected session --- ellama.el | 76 ++- 1 file changed, 56 insertions(+), 20 deletions(-) diff --git a/ellama.el b/ellama.el index 705d26bab2..73fd43240f 100644 --- a/ellama.el +++ b/ellama.el @@ -1248,6 +1248,24 @@ If EPHEMERAL non nil new session will not be associated with any file." (with-current-buffer buffer (not (not ellama--current-session +(defun ellama-get-current-session-id () + "Return current session id. +If buffer contains ellama session return its id. +Otherwire return id of current active session." + (if ellama--current-session + (ellama-session-id ellama--current-session) +ellama--current-session-id)) + +(defun ellama-get-current-session () + "Return current session. +If buffer contains ellama session return it. +Otherwire return current active session." + (if ellama--current-session + ellama--current-session +(when ellama--current-session-id + (with-current-buffer (ellama-get-session-buffer ellama--current-session-id) + ellama--current-session + (defun ellama-stream (prompt &rest args) "Query ellama for PROMPT. ARGS contains keys for fine control. @@ -1264,6 +1282,8 @@ strings before they're inserted into the BUFFER. :session SESSION -- SESSION is a ellama conversation session. +:session-id ID -- ID is a ellama session unique identifier. + :ephemeral-session BOOL -- if BOOL is set session will not be saved to named file by default. @@ -1272,7 +1292,11 @@ failure (with BUFFER current). :on-done ON-DONE -- ON-DONE a function or list of functions that's called with the full response text when the request completes (with BUFFER current)." - (let* ((session (plist-get args :session)) + (let* ((session-id (plist-get args :session-id)) +(session (or (plist-get args :session) + (when session-id + (with-current-buffer (ellama-get-session-buffer session-id) + ellama--current-session (provider (if session (ellama-session-provider session) (or (plist-get args :provider) ellama-provider))) @@ -1372,6 +1396,8 @@ prompt. FUCTION will be called with two arguments INITIAL-PROMPT and ACC. :session SESSION - use SESSION in current step. +:session-id ID -- ID is a ellama session unique identifier. + :chat BOOL - if BOOL use chat buffer, otherwise use temp buffer. Make sense for last step only. @@ -1383,7 +1409,11 @@ last step only. (prompt (if transform (apply transform (list initial-prompt acc)) initial-prompt)) -(session (plist-get hd :session)) +(session-id (plist-get hd :session-id)) +(session (or (plist-get hd :session) + (when session-id + (with-current-buffer (ellama-get-session-buffer session-id) + ellama--current-session (chat (plist-get hd :chat)) (show (or (plist-get hd :show) ellama-always-show-chain-steps)) (buf (if (or (and (not chat)) (not session)) @@ -1549,6 +1579,10 @@ ARGS contains keys for fine control. :provider PROVIDER -- PROVIDER is an llm provider for generation. +:session SESSION -- SESSION is a ellama conversation session. + +:session-id ID -- ID is a ellama session unique identifier. + :on-done ON-DONE -- ON-DONE a function that's called with the full response text when the request completes (with BUFFER current)." (interactive "sAsk ellama: ") @@ -1569,24 +1603,26 @@ the full response text when the request completes (with BUFFER current)." providers nil nil #'string=))) (or (plist-get args :provider) ellama-provider))) -(session (if (or create-session - current-prefix-arg - (and provider - (or (plist-get args :provider) - (not (equal provider ellama-provider))) - ellama--current-session-id - (with-current-buffer (ellama-get-session-buffer -ellama--current-session-id) -(not (equal - provider - (ellama-session-provider ellama--current-session) - (and (not ellama--current-session) - (not ellama--current-session-id))) - (ellama-new-session provider prompt) - (or ellama--current-session - (with-current-buffer (ellama-get-session-buffer -
[elpa] externals/elisa 8537392489 3/3: Bump version
branch: externals/elisa commit 85373924896c92b7c27d6737d247f0084df99d6a Author: Sergey Kostyaev Commit: Sergey Kostyaev Bump version --- NEWS.org | 2 ++ elisa.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS.org b/NEWS.org index 823e732856..ccfaf8fe4c 100644 --- a/NEWS.org +++ b/NEWS.org @@ -1,3 +1,5 @@ +* Version 1.0.4 +- Add progress reporter for async operations. * Version 1.0.3 - Make sql syntax uppercased to improve readability. * Version 1.0.2 diff --git a/elisa.el b/elisa.el index 65412abc90..4d68c90045 100644 --- a/elisa.el +++ b/elisa.el @@ -6,7 +6,7 @@ ;; URL: http://github.com/s-kostyaev/elisa ;; Keywords: help local tools ;; Package-Requires: ((emacs "29.2") (ellama "0.11.2") (llm "0.9.1") (async "1.9.8") (plz "0.9")) -;; Version: 1.0.3 +;; Version: 1.0.4 ;; SPDX-License-Identifier: GPL-3.0-or-later ;; Created: 18th Feb 2024
[elpa] externals/ellama 03a65ca738 2/4: Add function to activate session by id
branch: externals/ellama commit 03a65ca738d7cadf54b6f564b14694ccc85ccad7 Author: Sergey Kostyaev Commit: Sergey Kostyaev Add function to activate session by id --- ellama.el | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ellama.el b/ellama.el index 73fd43240f..d7c675d657 100644 --- a/ellama.el +++ b/ellama.el @@ -780,6 +780,10 @@ If EPHEMERAL non nil new session will not be associated with any file." (when (file-exists-p translation-file) (delete-file translation-file t +(defun ellama-activate-session (id) + "Change current active session to session with ID." + (setq ellama--current-session-id id)) + ;;;###autoload (defun ellama-session-switch () "Change current active session." @@ -788,7 +792,7 @@ If EPHEMERAL non nil new session will not be associated with any file." "Select session to activate: " (hash-table-keys ellama--active-sessions))) (buffer (ellama-get-session-buffer id))) -(setq ellama--current-session-id id) +(ellama-activate-session id) (display-buffer buffer))) ;;;###autoload
[elpa] externals/ellama updated (a791ec0a70 -> 8270e71c33)
elpasync pushed a change to branch externals/ellama. from a791ec0a70 Bump version new 3bfb3b383c Add ability to call ellama functions with selected session new 03a65ca738 Add function to activate session by id new 1bebb51698 Merge pull request #153 from s-kostyaev/make-sessions-awailable new 8270e71c33 Bump version Summary of changes: NEWS.org | 2 ++ ellama.el | 84 ++- 2 files changed, 64 insertions(+), 22 deletions(-)
[elpa] externals/ellama 1bebb51698 3/4: Merge pull request #153 from s-kostyaev/make-sessions-awailable
branch: externals/ellama commit 1bebb51698d572f6da9a65e3eb7ce9b2039b1f2a Merge: a791ec0a70 03a65ca738 Author: Sergey Kostyaev Commit: GitHub Merge pull request #153 from s-kostyaev/make-sessions-awailable Add ability to call ellama functions with selected session --- ellama.el | 82 +++ 1 file changed, 61 insertions(+), 21 deletions(-) diff --git a/ellama.el b/ellama.el index 705d26bab2..d7c675d657 100644 --- a/ellama.el +++ b/ellama.el @@ -780,6 +780,10 @@ If EPHEMERAL non nil new session will not be associated with any file." (when (file-exists-p translation-file) (delete-file translation-file t +(defun ellama-activate-session (id) + "Change current active session to session with ID." + (setq ellama--current-session-id id)) + ;;;###autoload (defun ellama-session-switch () "Change current active session." @@ -788,7 +792,7 @@ If EPHEMERAL non nil new session will not be associated with any file." "Select session to activate: " (hash-table-keys ellama--active-sessions))) (buffer (ellama-get-session-buffer id))) -(setq ellama--current-session-id id) +(ellama-activate-session id) (display-buffer buffer))) ;;;###autoload @@ -1248,6 +1252,24 @@ If EPHEMERAL non nil new session will not be associated with any file." (with-current-buffer buffer (not (not ellama--current-session +(defun ellama-get-current-session-id () + "Return current session id. +If buffer contains ellama session return its id. +Otherwire return id of current active session." + (if ellama--current-session + (ellama-session-id ellama--current-session) +ellama--current-session-id)) + +(defun ellama-get-current-session () + "Return current session. +If buffer contains ellama session return it. +Otherwire return current active session." + (if ellama--current-session + ellama--current-session +(when ellama--current-session-id + (with-current-buffer (ellama-get-session-buffer ellama--current-session-id) + ellama--current-session + (defun ellama-stream (prompt &rest args) "Query ellama for PROMPT. ARGS contains keys for fine control. @@ -1264,6 +1286,8 @@ strings before they're inserted into the BUFFER. :session SESSION -- SESSION is a ellama conversation session. +:session-id ID -- ID is a ellama session unique identifier. + :ephemeral-session BOOL -- if BOOL is set session will not be saved to named file by default. @@ -1272,7 +1296,11 @@ failure (with BUFFER current). :on-done ON-DONE -- ON-DONE a function or list of functions that's called with the full response text when the request completes (with BUFFER current)." - (let* ((session (plist-get args :session)) + (let* ((session-id (plist-get args :session-id)) +(session (or (plist-get args :session) + (when session-id + (with-current-buffer (ellama-get-session-buffer session-id) + ellama--current-session (provider (if session (ellama-session-provider session) (or (plist-get args :provider) ellama-provider))) @@ -1372,6 +1400,8 @@ prompt. FUCTION will be called with two arguments INITIAL-PROMPT and ACC. :session SESSION - use SESSION in current step. +:session-id ID -- ID is a ellama session unique identifier. + :chat BOOL - if BOOL use chat buffer, otherwise use temp buffer. Make sense for last step only. @@ -1383,7 +1413,11 @@ last step only. (prompt (if transform (apply transform (list initial-prompt acc)) initial-prompt)) -(session (plist-get hd :session)) +(session-id (plist-get hd :session-id)) +(session (or (plist-get hd :session) + (when session-id + (with-current-buffer (ellama-get-session-buffer session-id) + ellama--current-session (chat (plist-get hd :chat)) (show (or (plist-get hd :show) ellama-always-show-chain-steps)) (buf (if (or (and (not chat)) (not session)) @@ -1549,6 +1583,10 @@ ARGS contains keys for fine control. :provider PROVIDER -- PROVIDER is an llm provider for generation. +:session SESSION -- SESSION is a ellama conversation session. + +:session-id ID -- ID is a ellama session unique identifier. + :on-done ON-DONE -- ON-DONE a function that's called with the full response text when the request completes (with BUFFER current)." (interactive "sAsk ellama: ") @@ -1569,24 +1607,26 @@ the full response text when the request completes (with BUFFER current)." providers nil nil #'string=))) (or (plist-get args :provider) ellama-provider))) -(session (if (or create-session - current-prefix-arg - (a
[elpa] externals/marginalia 8c6b3f6aac: Minor README cleanup
branch: externals/marginalia commit 8c6b3f6aacb3d8fecbb3262408c8cd98e6869c15 Author: Daniel Mendler Commit: Daniel Mendler Minor README cleanup --- README.org | 52 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/README.org b/README.org index c83bc4ce76..c249fccf17 100644 --- a/README.org +++ b/README.org @@ -156,20 +156,26 @@ Marginalia activates rich annotators by default. Depending on your preference you may want to use the builtin annotators or even no annotators by default and only activate the annotators on demand by invoking ~marginalia-cycle~. -In order to use the builtin annotators by default, you can use the following -command. Replace =builtin= by =none= to disable annotators by default. +In order to disable an annotator permanently, the ~marginalia-annotator-registry~ +can be modified. For example if you prefer to never see file annotations, you +can delete all file annotators from the registry. #+begin_src emacs-lisp - (defun marginalia-use-builtin () -(interactive) -(mapc - (lambda (x) - (setcdr x (cons 'builtin (remq 'builtin (cdr x) - marginalia-annotator-registry)) + (setq marginalia-annotator-registry +(assq-delete-all 'file marginalia-annotator-registry)) +#+end_src + +To use the builtin annotators by default, you can run the following code. +Replace =builtin= by =none= to disable annotators by default. + +#+begin_src emacs-lisp +(mapc (lambda (x) +(setcdr x (cons 'builtin (remq 'builtin (cdr x) + marginalia-annotator-registry) #+end_src -If a completion category supports two annotators, you can toggle between -those using this command. +As an alternative to ~marginalia-cycle~, if a completion category supports two +annotators, you can toggle between them using the following command. #+begin_src emacs-lisp (defun marginalia-toggle () @@ -194,27 +200,17 @@ configuration. This can be achieved using an advice which calls marginalia-annotator-registry #+end_src -In order to disable an annotator permanently, the ~marginalia-annotator-registry~ -can be modified. For example if you prefer to never see file annotations, you -can delete all file annotators from the registry. - -#+begin_src emacs-lisp - (setq marginalia-annotator-registry -(assq-delete-all 'file marginalia-annotator-registry)) -#+end_src - * Icons in the minibuffer -Icons in the minibuffer completion UI are a commonly requested feature. -Marginalia focuses on text annotations only. The following packages are -compatible with Marginalia and use special fonts to add icons in front of -completion candidates. There also exist related packages to enhance Dired, -Ibuffer and other modes with icons consistently. +Marginalia focuses on text annotations. The following packages are compatible +with Marginalia and use special fonts to add icons in front of completion +candidates. There also exist related packages to enhance Dired, Ibuffer, Corfu +and other modes with icons consistently. -- [[https://github.com/iyefrat/all-the-icons-completion][all-the-icons-completion]]: Relies on the =all-the-icons.el= package which - configures multiple icon fonts. -- [[https://github.com/rainstormstudio/nerd-icons-completion][nerd-icons-completion]]: Relies on patched fonts including icons. This package - works even in the terminal where only a single font can be used. +- [[https://github.com/rainstormstudio/nerd-icons-completion][nerd-icons-completion]]: Uses the NerdFonts. It can even work even in the + terminal where only a single font can be used. +- [[https://github.com/iyefrat/all-the-icons-completion][all-the-icons-completion]]: Uses the =all-the-icons.el= package which configures + multiple icon fonts. * Contributions
[elpa] main 0d533c6274: * elpa-packages (cursor-undo): fix :doc spec.
branch: main commit 0d533c62740180c6e9e25116ec2f925517b535ac Author: Luke Lee Commit: Luke Lee * elpa-packages (cursor-undo): fix :doc spec. --- elpa-packages | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/elpa-packages b/elpa-packages index 7ef0bc8099..509c2eba4f 100644 --- a/elpa-packages +++ b/elpa-packages @@ -198,8 +198,7 @@ (csharp-mode :url "https://github.com/emacs-csharp/csharp-mode"; :readme "README.org") (csv-mode :url nil) - (cursor-undo :url nil - :doc "README.txt") + (cursor-undo :url nil) (cursory :url "https://github.com/protesilaos/cursory"; :doc "README.org" :news "CHANGELOG.org"
[elpa] externals/org-modern 851254db89 2/2: Update changelog
branch: externals/org-modern commit 851254db892c07467973810604cbdc13b43b96da Author: Daniel Mendler Commit: Daniel Mendler Update changelog --- CHANGELOG.org | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.org b/CHANGELOG.org index 7c54fec59a..d0aed96b26 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -5,6 +5,7 @@ * Development - Fix date formatting after #+date keyword. +- Fix table divider line scaling. - Bump Compat dependency to Compat 30. * Version 1.3 (2024-06-02)
[elpa] externals/org-modern 1074133d9d 1/2: Fix org-modern divider line scaling (Fix #99 and #155)
branch: externals/org-modern commit 1074133d9dd1ce4eb6c9ab1d1dbc7b78b3d8733b Author: Daniel Mendler Commit: Daniel Mendler Fix org-modern divider line scaling (Fix #99 and #155) --- org-modern.el | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org-modern.el b/org-modern.el index 5a541dc949..97c8440d3e 100644 --- a/org-modern.el +++ b/org-modern.el @@ -661,8 +661,12 @@ whole buffer; otherwise, for the line at point." (unless (equal (and (listp box) (plist-get box :color)) (face-attribute 'default :background nil t)) (org-modern--update-label-face))) - (setf org-modern--table-sp-width (default-font-width) -(cadr org-modern--table-overline) (face-attribute 'org-table :foreground nil t))) + (let ((face-remapping-alist + (if-let (h (cadr (assq :height (assq 'default face-remapping-alist + `((default (:inherit org-table :height ,h))) + '((default (:inherit org-table)) +(setq org-modern--table-sp-width (default-font-width))) + (setf (cadr org-modern--table-overline) (face-attribute 'org-table :foreground nil t))) (defun org-modern--update-label-face () "Update border of the `org-modern-label' face."
[elpa] externals/org-modern updated (e5928353c8 -> 851254db89)
elpasync pushed a change to branch externals/org-modern. from e5928353c8 Update changelog new 1074133d9d Fix org-modern divider line scaling (Fix #99 and #155) new 851254db89 Update changelog Summary of changes: CHANGELOG.org | 1 + org-modern.el | 8 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)
[nongnu] elpa/evil 404875a211: Fix: perf improvements broke macro repeatability. Restore it.
branch: elpa/evil
commit 404875a2119adbe2c989ac660b06a37fd2f25240
Author: Tom Dalziel
Commit: Tom Dalziel
Fix: perf improvements broke macro repeatability. Restore it.
---
evil-commands.el | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/evil-commands.el b/evil-commands.el
index 2e3a26a232..cd8a66d670 100644
--- a/evil-commands.el
+++ b/evil-commands.el
@@ -2510,6 +2510,14 @@ will be opened instead."
(setq evil-macro-buffer (current-buffer)))
(t (error "Invalid register `%s'" register)
+(defun evil-repeat-execute-macro (flag)
+ "Called to record a macro execution.
+FLAG is either `pre' or `post' if the function is called before resp.
+after executing the command."
+ (pcase flag
+('pre (evil-repeat-record (this-command-keys)))
+('post (evil-repeat-record (string evil-last-register)
+
(evil-define-command evil-execute-macro (count macro)
"Execute keyboard macro MACRO, COUNT times.
When called with a non-numerical prefix \
@@ -2518,6 +2526,7 @@ COUNT is infinite. MACRO is read from a register
when called interactively."
:keep-visual t
:suppress-operator t
+ :repeat evil-repeat-execute-macro
(interactive
(let (count macro register)
(setq count (cond ((null current-prefix-arg) 1)
@@ -2554,7 +2563,8 @@ when called interactively."
(evil-with-single-undo
(let (pre-command-hook post-command-hook) ; For performance
(combine-after-change-calls
- (execute-kbd-macro macro count
+ (execute-kbd-macro macro count)
+ (setq this-command 'evil-execute-macro ; For repeatability
;; enter Normal state if the macro fails
(error
(evil-normal-state)
[nongnu] elpa/git-commit ad68015aa1 2/4: magit-confirm: Directly support two rounds of prompt formatting
branch: elpa/git-commit commit ad68015aa1f7cab19eae0d86983193fa2b7038ca Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-confirm: Directly support two rounds of prompt formatting The PROMPT and PROMPT-N arguments are used as f-strings passed to `format'. Many callers of this function themselves use `format' themselves to prepare these arguments. The "%s" in the original f-string, which isn't to be replaced until the second round, has to be escaped as "%%s". Many of the first round `format' calls are used to embed branch names and other refs into the prompt, and here a problem arises: "%" is allowed in Git refs, so we may end up with unescaped "%d" in the final f-string. To avoid having to escape "%s" in many callers, add support for handling the first round of prompt formatting inside `magit-confirm'. PROMPT and PROMPT-N can now be lists of the form (F-STRING . ARGS), in which case they applied to `format', after escaping every "%s" in every argument that is a string. Closes #5178. --- lisp/magit-apply.el | 13 +++-- lisp/magit-base.el | 10 ++ lisp/magit-branch.el | 16 lisp/magit-push.el | 12 lisp/magit-remote.el | 4 ++-- lisp/magit-stash.el | 2 +- 6 files changed, 32 insertions(+), 25 deletions(-) diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el index 2c7a79601f..7ad55e1401 100644 --- a/lisp/magit-apply.el +++ b/lisp/magit-apply.el @@ -548,9 +548,10 @@ of a side, then keep that side without prompting." (funcall apply section "--reverse" "--index" (defun magit-discard-hunks (sections) - (magit-confirm 'discard (format "Discard %d hunks from %s" - (length sections) - (magit-section-parent-value (car sections + (magit-confirm 'discard +(list "Discard %d hunks from %s" + (length sections) + (magit-section-parent-value (car sections (magit-discard-apply-n sections #'magit-apply-hunks)) (defun magit-discard-apply-n (sections apply) @@ -738,9 +739,9 @@ so causes the change to be applied to the index as well." (defun magit-reverse-hunks (sections args) (magit-confirm 'reverse -(format "Reverse %d hunks from %s" -(length sections) -(magit-section-parent-value (car sections +(list "Reverse %d hunks from %s" + (length sections) + (magit-section-parent-value (car sections (magit-reverse-apply sections #'magit-apply-hunks args)) (defun magit-reverse-file (section args) diff --git a/lisp/magit-base.el b/lisp/magit-base.el index a1c00f27d5..af809b286d 100644 --- a/lisp/magit-base.el +++ b/lisp/magit-base.el @@ -794,6 +794,16 @@ ACTION is a member of option `magit-slow-confirm'." (cl-defun magit-confirm ( action &optional prompt prompt-n noabort (items nil sitems) prompt-suffix) (declare (indent defun)) + (when (and prompt (listp prompt)) +(setq prompt + (apply #'format (car prompt) + (mapcar (lambda (a) (if (stringp a) (string-replace "%" "%%" a) a)) + (cdr prompt) + (when (and prompt-n (listp prompt-n)) +(setq prompt-n + (apply #'format (car prompt-n) + (mapcar (lambda (a) (if (stringp a) (string-replace "%" "%%" a) a)) + (cdr prompt-n) (setq prompt-n (format (concat (or prompt-n prompt) "? ") (length items))) (setq prompt (format (concat (or prompt (magit-confirm-make-prompt action)) "? ") diff --git a/lisp/magit-branch.el b/lisp/magit-branch.el index e313da4f78..d696265935 100644 --- a/lisp/magit-branch.el +++ b/lisp/magit-branch.el @@ -633,12 +633,12 @@ prompt is confusing." (offset (1+ (length remote (cond ((magit-confirm 'delete-branch-on-remote -(format "Deleting local %s. Also delete on %s" -(magit-ref-fullname (car branches)) -remote) -(format "Deleting %d local refs. Also delete on %s" -(length refs) -remote) +(list "Deleting local %s. Also delete on %s" + (magit-ref-fullname (car branches)) + remote) +(list "Deleting %d local refs. Also delete on %s" + (length refs) + remote) 'noabort refs) ;; The ref may actually point at another rev on the remote, ;; but this is better than nothing. @@ -724,8 +724,8 @@ prompt is confusing." (when (member refspec refspecs) (if (and (length= refspecs 1) (magit-confirm 'delete-pr-remote - (format "Also delete remote %s (%s)" remote - "no pull-request branch remains") +
[nongnu] elpa/helm dc6382a212 1/2: New user var helm-M-x-history-transformer-sort (#2679)
branch: elpa/helm commit dc6382a212e3fd1db3cfbf15f98c1d51e5b3aa18 Author: zbelial Commit: Thierry Volpiatto New user var helm-M-x-history-transformer-sort (#2679) Allow customizing whether helm-M-x history is sorted or not. --- helm-command.el | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/helm-command.el b/helm-command.el index bf7c4e1ca7..7ff93b66ae 100644 --- a/helm-command.el +++ b/helm-command.el @@ -55,6 +55,10 @@ This value can be toggled with [helm-M-x-toggle-short-doc] while in helm-M-x session." :type 'boolean) +(defcustom helm-M-x-history-transformer-sort t + "When nil, do not sort helm-M-x's commands history." + :type 'boolean) + ;;; Faces ;; @@ -258,7 +262,7 @@ algorithm." (defclass helm-M-x-class (helm-source-in-buffer helm-type-command) ((requires-pattern :initform 0) (must-match :initform t) - (filtered-candidate-transformer :initform 'helm-M-x-transformer) + (filtered-candidate-transformer :initform #'helm-M-x-transformer) (persistent-help :initform "Describe this command") (help-message :initform 'helm-M-x-help-message) (nomark :initform t) @@ -287,9 +291,11 @@ Arg HISTORY default to `extended-command-history'." (setq helm--mode-line-display-prefarg t) (let* ((pred (or predicate #'commandp)) (helm-fuzzy-sort-fn (lambda (candidates _source) - ;; Sort on real candidate otherwise - ;; "symbol ()" is used when sorting. - (helm-fuzzy-matching-default-sort-fn-1 candidates t))) + (if helm-M-x-history-transformer-sort + ;; Sort on real candidate otherwise + ;; "symbol ()" is used when sorting. + (helm-fuzzy-matching-default-sort-fn-1 candidates t) + candidates))) (sources `(,(helm-make-source "Emacs Commands history" 'helm-M-x-class :data (lambda () (helm-comp-read-get-candidates @@ -301,6 +307,10 @@ Arg HISTORY default to `extended-command-history'." ;; Ensure using empty string to ;; not defeat helm matching fns [1] pred nil nil "")) + :filtered-candidate-transformer + (if helm-M-x-history-transformer-sort + #'helm-M-x-transformer + #'helm-M-x-transformer-no-sort) :fuzzy-match helm-M-x-fuzzy-match) ,(helm-make-source "Emacs Commands" 'helm-M-x-class :data (lambda ()
[nongnu] elpa/git-commit f31cf79b27 4/4: magit-parse-git-async: Discard stderr for now
branch: elpa/git-commit commit f31cf79b2731765d63899ef16bc8be0fa2cc7d32 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-parse-git-async: Discard stderr for now Currently the only caller is `magit-blame-run-process' and that requires that we discard stderr because we would otherwise have to explicitly discard gc output. This will require more work, but not so close before a release. Closes #5175. --- lisp/magit-blame.el | 1 + lisp/magit-process.el | 19 +++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lisp/magit-blame.el b/lisp/magit-blame.el index 084e1e1923..bdcccb5db2 100644 --- a/lisp/magit-blame.el +++ b/lisp/magit-blame.el @@ -453,6 +453,7 @@ modes is toggled, then this mode also gets toggled automatically. (let ((status (process-status process))) (when (memq status '(exit signal)) (kill-buffer (process-buffer process)) + (kill-buffer (process-get process 'stderr-buf)) (if (and (eq status 'exit) (zerop (process-exit-status process))) (unless quiet diff --git a/lisp/magit-process.el b/lisp/magit-process.el index dad69c6719..bce02aaebe 100644 --- a/lisp/magit-process.el +++ b/lisp/magit-process.el @@ -651,18 +651,21 @@ Magit status buffer." (defun magit-parse-git-async (&rest args) (setq args (magit-process-git-arguments args)) (let ((command-buf (current-buffer)) -(process-buf (generate-new-buffer " *temp*")) +(stdout-buf (generate-new-buffer " *git-stdout*")) +(stderr-buf (generate-new-buffer " *git-stderr*")) (toplevel (magit-toplevel))) -(with-current-buffer process-buf +(with-current-buffer stdout-buf (setq default-directory toplevel) (let ((process - (let ((process-connection-type nil) - (process-environment (magit-process-environment)) - (default-process-coding-system -(magit--process-coding-system))) - (apply #'start-file-process "git" process-buf - (magit-git-executable) args + (let ((process-environment (magit-process-environment))) + (make-process :name "git" + :buffer stdout-buf + :stderr stderr-buf + :command (cons (magit-git-executable) args) + :coding (magit--process-coding-system) + :file-handler t (process-put process 'command-buf command-buf) +(process-put process 'stderr-buf stderr-buf) (process-put process 'parsed (point)) (setq magit-this-process process) process
[nongnu] elpa/helm-core updated (ef4e7b96ce -> 1595254721)
elpasync pushed a change to branch elpa/helm-core. from ef4e7b96ce encode helm-pattern and directory to make helm-grep-ag work with non-utf8 chars adds dc6382a212 New user var helm-M-x-history-transformer-sort (#2679) adds 1595254721 Merge branch 'zbelial-customizable-M-x-filtered-transformer' No new revisions were added by this update. Summary of changes: helm-command.el | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-)
[nongnu] elpa/git-commit updated (538cb2f90b -> f31cf79b27)
elpasync pushed a change to branch elpa/git-commit.
from 538cb2f90b magit-file-section-indent: New variable
new c2e2640488 magit-{discard,reverse}-hunks: Use %d in format string
new ad68015aa1 magit-confirm: Directly support two rounds of prompt
formatting
new 89e9bf4e2c magit-read-file-from-rev: Update function declaration
new f31cf79b27 magit-parse-git-async: Discard stderr for now
Summary of changes:
lisp/magit-apply.el | 13 +++--
lisp/magit-base.el| 10 ++
lisp/magit-blame.el | 1 +
lisp/magit-branch.el | 16
lisp/magit-log.el | 2 +-
lisp/magit-process.el | 19 +++
lisp/magit-push.el| 12
lisp/magit-remote.el | 4 ++--
lisp/magit-stash.el | 2 +-
9 files changed, 45 insertions(+), 34 deletions(-)
[nongnu] elpa/helm 1595254721 2/2: Merge branch 'zbelial-customizable-M-x-filtered-transformer'
branch: elpa/helm commit 1595254721d1aee950f0775f8da0cd5cc9a066e9 Merge: ef4e7b96ce dc6382a212 Author: Thierry Volpiatto Commit: Thierry Volpiatto Merge branch 'zbelial-customizable-M-x-filtered-transformer' --- helm-command.el | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/helm-command.el b/helm-command.el index bf7c4e1ca7..7ff93b66ae 100644 --- a/helm-command.el +++ b/helm-command.el @@ -55,6 +55,10 @@ This value can be toggled with [helm-M-x-toggle-short-doc] while in helm-M-x session." :type 'boolean) +(defcustom helm-M-x-history-transformer-sort t + "When nil, do not sort helm-M-x's commands history." + :type 'boolean) + ;;; Faces ;; @@ -258,7 +262,7 @@ algorithm." (defclass helm-M-x-class (helm-source-in-buffer helm-type-command) ((requires-pattern :initform 0) (must-match :initform t) - (filtered-candidate-transformer :initform 'helm-M-x-transformer) + (filtered-candidate-transformer :initform #'helm-M-x-transformer) (persistent-help :initform "Describe this command") (help-message :initform 'helm-M-x-help-message) (nomark :initform t) @@ -287,9 +291,11 @@ Arg HISTORY default to `extended-command-history'." (setq helm--mode-line-display-prefarg t) (let* ((pred (or predicate #'commandp)) (helm-fuzzy-sort-fn (lambda (candidates _source) - ;; Sort on real candidate otherwise - ;; "symbol ()" is used when sorting. - (helm-fuzzy-matching-default-sort-fn-1 candidates t))) + (if helm-M-x-history-transformer-sort + ;; Sort on real candidate otherwise + ;; "symbol ()" is used when sorting. + (helm-fuzzy-matching-default-sort-fn-1 candidates t) + candidates))) (sources `(,(helm-make-source "Emacs Commands history" 'helm-M-x-class :data (lambda () (helm-comp-read-get-candidates @@ -301,6 +307,10 @@ Arg HISTORY default to `extended-command-history'." ;; Ensure using empty string to ;; not defeat helm matching fns [1] pred nil nil "")) + :filtered-candidate-transformer + (if helm-M-x-history-transformer-sort + #'helm-M-x-transformer + #'helm-M-x-transformer-no-sort) :fuzzy-match helm-M-x-fuzzy-match) ,(helm-make-source "Emacs Commands" 'helm-M-x-class :data (lambda ()
[nongnu] elpa/git-commit c2e2640488 1/4: magit-{discard, reverse}-hunks: Use %d in format string
branch: elpa/git-commit
commit c2e264048845b9ba5bb42f8c7c9d904ab7c0fc09
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
magit-{discard,reverse}-hunks: Use %d in format string
---
lisp/magit-apply.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index 81357ce287..2c7a79601f 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -548,7 +548,7 @@ of a side, then keep that side without prompting."
(funcall apply section "--reverse" "--index"
(defun magit-discard-hunks (sections)
- (magit-confirm 'discard (format "Discard %s hunks from %s"
+ (magit-confirm 'discard (format "Discard %d hunks from %s"
(length sections)
(magit-section-parent-value (car sections
(magit-discard-apply-n sections #'magit-apply-hunks))
@@ -738,7 +738,7 @@ so causes the change to be applied to the index as well."
(defun magit-reverse-hunks (sections args)
(magit-confirm 'reverse
-(format "Reverse %s hunks from %s"
+(format "Reverse %d hunks from %s"
(length sections)
(magit-section-parent-value (car sections
(magit-reverse-apply sections #'magit-apply-hunks args))
[nongnu] elpa/magit updated (538cb2f90b -> f31cf79b27)
elpasync pushed a change to branch elpa/magit.
from 538cb2f90b magit-file-section-indent: New variable
adds c2e2640488 magit-{discard,reverse}-hunks: Use %d in format string
adds ad68015aa1 magit-confirm: Directly support two rounds of prompt
formatting
adds 89e9bf4e2c magit-read-file-from-rev: Update function declaration
adds f31cf79b27 magit-parse-git-async: Discard stderr for now
No new revisions were added by this update.
Summary of changes:
lisp/magit-apply.el | 13 +++--
lisp/magit-base.el| 10 ++
lisp/magit-blame.el | 1 +
lisp/magit-branch.el | 16
lisp/magit-log.el | 2 +-
lisp/magit-process.el | 19 +++
lisp/magit-push.el| 12
lisp/magit-remote.el | 4 ++--
lisp/magit-stash.el | 2 +-
9 files changed, 45 insertions(+), 34 deletions(-)
[nongnu] elpa/git-commit 89e9bf4e2c 3/4: magit-read-file-from-rev: Update function declaration
branch: elpa/git-commit commit 89e9bf4e2c42f09c56b4053d80443a8b366c21ff Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-read-file-from-rev: Update function declaration --- lisp/magit-log.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/magit-log.el b/lisp/magit-log.el index 4682b38128..831c18f0dd 100644 --- a/lisp/magit-log.el +++ b/lisp/magit-log.el @@ -38,7 +38,7 @@ (declare-function magit-insert-upstream-branch-header "magit-status" (&optional branch pull keyword)) (declare-function magit-read-file-from-rev "magit-files" - (rev prompt &optional default)) + (rev prompt &optional default include-dirs)) (declare-function magit-rebase--get-state-lines "magit-sequence" (file)) (declare-function magit-show-commit "magit-diff"
[nongnu] elpa/magit-section updated (538cb2f90b -> f31cf79b27)
elpasync pushed a change to branch elpa/magit-section.
from 538cb2f90b magit-file-section-indent: New variable
adds c2e2640488 magit-{discard,reverse}-hunks: Use %d in format string
adds ad68015aa1 magit-confirm: Directly support two rounds of prompt
formatting
adds 89e9bf4e2c magit-read-file-from-rev: Update function declaration
adds f31cf79b27 magit-parse-git-async: Discard stderr for now
No new revisions were added by this update.
Summary of changes:
lisp/magit-apply.el | 13 +++--
lisp/magit-base.el| 10 ++
lisp/magit-blame.el | 1 +
lisp/magit-branch.el | 16
lisp/magit-log.el | 2 +-
lisp/magit-process.el | 19 +++
lisp/magit-push.el| 12
lisp/magit-remote.el | 4 ++--
lisp/magit-stash.el | 2 +-
9 files changed, 45 insertions(+), 34 deletions(-)
[elpa] externals/cursor-undo bbe2c5a6de: cursor-undo is now a minor mode to make enable/disable easier.
branch: externals/cursor-undo commit bbe2c5a6de06d8ae6881b4a11eb74008334251b0 Author: Luke Lee Commit: Luke Lee cursor-undo is now a minor mode to make enable/disable easier. Followed some review changes. --- README.txt | 63 cursor-undo.el | 492 + 2 files changed, 249 insertions(+), 306 deletions(-) diff --git a/README.txt b/README.txt deleted file mode 100644 index af6e9ba7af..00 --- a/README.txt +++ /dev/null @@ -1,63 +0,0 @@ -Cursor-undo allows you to undo cursor movement commands using the Emacs -standard `undo' command. - -For frequent cursor movements such as up/down/left/right, it combines -the movements of the same direction into a single undo entry. This -prevents the undo command from reversing each individual character -movement separately. For example, if you move the cursor 20 characters -to the right and then 10 lines up, the first undo will go down 10 lines -back, and the next undo move back 20 characters left. On the other -hand, for search commands that often jump across multiple pages, each -search command has its own undo entry, allowing you to undo them one at -a time rather than as a combined operation. - -This cursor-undo functionality has existed in my local Emacs init file -for over 11+ years, since version 0 on 2013-06-26. It was originally -intended to support my Brief Editor Mode only, but I later found it -would be more useful if implemented in a more generalized way. For -years I have hoped for an official implementation of this feature, -which is commonly seen among various editors. Considering my -implementation using advice functions a bit inelegant so I have always -hesitated to release it till recently. - -Until there is official support for the cursor undo feature, this -package serves most common daily needs. The core design is to align -with Emacs's native `undo' function by recording cursor positions -and screen-relative position undo entries in the `buffer-undo-list' -in accordance with its documentation. - -As this package primarily consists of advice functions to wrap cursor -movement commands, each cursor movement command needs to be manually -wrapped with `def-cursor-undo'. For interactive functions that -heavily invoke advised cursor movement commands, you may even need to -advise them with `disable-cursor-tracking' to prevent generating -numerous distinct cursor undo entries from a single command. For user -convenience, we have prepared ready `def-cursor-undo' advice sets for -standard Emacs cursor movement commands, Brief Editor mode, Viper -mode, and EVIL mode. - -Usage: - - In theory, once this package is installed, you should already have - cursor-undo autoloaded and enabled. If not, or if you downloaded this - package as source, put "cursor-undo.el" file in a `load-path' and add - the following line into your Emacs init file .emacs or init.el: - -(require 'cursor-undo) - -Notes for EVIL mode user: - - If you choose to use default Emacs `undo' system, you should be able - to use `evil-undo' to undo cursor movements. If your choice is - tree-undo or another undo system, you might need to use Emacs default - `undo' (C-_, C-/ or C-x u ...) to undo cursor movements. - -Notes for Viper mode user: - - The default `viper-undo' is advised to allow cursor-undo. If you - find the advised function not working properly, consider comment out - the following source code `(define-advice viper-undo ...' to restore - the original `viper-undo' function and use Emacs default `undo' - (C-_, C-/ or C-x u ...) to undo cursor movements. - -Luke Lee [2024-07-20] diff --git a/cursor-undo.el b/cursor-undo.el index 6e9e0e3b17..19088049d1 100644 --- a/cursor-undo.el +++ b/cursor-undo.el @@ -63,12 +63,11 @@ ;; ;; Usage: ;; -;; In theory, once this package is installed, you should already have -;; cursor-undo autoloaded and enabled. If not, or if you downloaded this -;; package as source, put "cursor-undo.el" file in a `load-path' and add -;; the following line into your Emacs init file .emacs or init.el: +;; Once this package is installed, you only need to enable cursor-undo +;; mode by adding the following line into your Emacs init file .emacs or +;; init.el: ;; -;; (require 'cursor-undo) +;; (cursor-undo 1) ;; ;; Notes for EVIL mode user: ;; @@ -93,27 +92,36 @@ ;;; Code: +;;;###autoload +(define-minor-mode cursor-undo + "Global minor mode for tracking cursor undo." + :lighter " cu" + :variable cundo-enable-cursor-tracking) + ;; Global enabling control flag -(defcustom cundo-enable-cursor-tracking t +;;;###autoload +(defcustom cundo-enable-cursor-tracking nil "Global control flag to enable cursor undo tracking." :type 'boolean) + ;; Local disable flag, use reverse logic as NIL is still a list and we can ;; pop it again and again -(defvar cundo-disable-local-cursor-tracking nil) -(make-variable-buffer-local 'cundo
[elpa] externals/org-modern updated (851254db89 -> 63df971a82)
elpasync pushed a change to branch externals/org-modern. from 851254db89 Update changelog new 6550abc8c7 Fix TODO state formatting in custom agendas new 842749f515 org-modern-agenda: Minor simplification new 63df971a82 org-modern-agenda: Simplify Summary of changes: CHANGELOG.org | 1 + org-modern.el | 19 +-- 2 files changed, 10 insertions(+), 10 deletions(-)
[elpa] externals/org-modern 6550abc8c7 1/3: Fix TODO state formatting in custom agendas
branch: externals/org-modern commit 6550abc8c7b059cfa8b1653c280dde030787a6e7 Author: Daniel Mendler Commit: Daniel Mendler Fix TODO state formatting in custom agendas Fix #26, #85, #199, #210, #211 --- CHANGELOG.org | 1 + org-modern.el | 20 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index d0aed96b26..3300d5b0c3 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -6,6 +6,7 @@ - Fix date formatting after #+date keyword. - Fix table divider line scaling. +- Fix TODO state formatting in custom agendas. - Bump Compat dependency to Compat 30. * Version 1.3 (2024-06-02) diff --git a/org-modern.el b/org-modern.el index 97c8440d3e..ab7e8a67a2 100644 --- a/org-modern.el +++ b/org-modern.el @@ -481,9 +481,8 @@ the font.") (if-let ((face (or (cdr (assoc todo org-modern-todo-faces)) (cdr (assq t org-modern-todo-faces) `(:inherit (,face org-modern-label)) - (if (member todo org-done-keywords) - 'org-modern-done - 'org-modern-todo) + (if (string-match-p org-not-done-regexp todo) + 'org-modern-todo 'org-modern-done) (defun org-modern--timestamp () "Prettify timestamps." @@ -902,13 +901,14 @@ whole buffer; otherwise, for the line at point." (let (case-fold-search) (when org-modern-todo (goto-char (point-min)) - (let ((re (format " %s " -(regexp-opt - (append org-todo-keywords-for-agenda - org-done-keywords-for-agenda) t))) -(org-done-keywords org-done-keywords-for-agenda)) -(while (re-search-forward re nil 'noerror) - (org-modern--todo + (while (< (point) (point-max)) +(when-let (((get-text-property (point) 'todo-state)) + (re (get-text-property (point) 'org-todo-regexp)) + (re (concat " " re " ")) + (pos (re-search-forward re (pos-eol) 'noerror)) + (org-not-done-regexp (get-text-property (point) 'org-not-done-regexp))) + (org-modern--todo)) +(goto-char (min (1+ (pos-eol)) (point-max) (when org-modern-tag (goto-char (point-min)) (let ((re (concat "\\( \\)\\(:\\(?:" org-tag-re "::?\\)+\\)[ \t]*$")))
[elpa] externals/org-modern 842749f515 2/3: org-modern-agenda: Minor simplification
branch: externals/org-modern
commit 842749f5157e861559cf690fc8eb4a440814ab47
Author: Daniel Mendler
Commit: Daniel Mendler
org-modern-agenda: Minor simplification
---
org-modern.el | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/org-modern.el b/org-modern.el
index ab7e8a67a2..b9e3bf4cf4 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -902,9 +902,8 @@ whole buffer; otherwise, for the line at point."
(when org-modern-todo
(goto-char (point-min))
(while (< (point) (point-max))
-(when-let (((get-text-property (point) 'todo-state))
- (re (get-text-property (point) 'org-todo-regexp))
- (re (concat " " re " "))
+(when-let ((todo (get-text-property (point) 'todo-state))
+ (re (concat " \\(" todo "\\) "))
(pos (re-search-forward re (pos-eol) 'noerror))
(org-not-done-regexp (get-text-property (point)
'org-not-done-regexp)))
(org-modern--todo))
[elpa] externals/org-modern 63df971a82 3/3: org-modern-agenda: Simplify
branch: externals/org-modern
commit 63df971a82d03e9007c671de5edc5d3549f90df5
Author: Daniel Mendler
Commit: Daniel Mendler
org-modern-agenda: Simplify
---
org-modern.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/org-modern.el b/org-modern.el
index b9e3bf4cf4..9bfd78fcc6 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -903,9 +903,9 @@ whole buffer; otherwise, for the line at point."
(goto-char (point-min))
(while (< (point) (point-max))
(when-let ((todo (get-text-property (point) 'todo-state))
+ (org-not-done-regexp (get-text-property (point)
'org-not-done-regexp))
(re (concat " \\(" todo "\\) "))
- (pos (re-search-forward re (pos-eol) 'noerror))
- (org-not-done-regexp (get-text-property (point)
'org-not-done-regexp)))
+ ((re-search-forward re (pos-eol) 'noerror)))
(org-modern--todo))
(goto-char (min (1+ (pos-eol)) (point-max)
(when org-modern-tag
[nongnu] elpa/evil 30ebe6df27: Remove unnecessary post-command hook run
branch: elpa/evil
commit 30ebe6df27c36fdf2ea3c82a916edec31acc2647
Author: Tom Dalziel
Commit: Tom Dalziel
Remove unnecessary post-command hook run
---
evil-states.el | 3 +--
evil-tests.el | 19 +--
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/evil-states.el b/evil-states.el
index 62a612a9f0..1e09ae73fb 100644
--- a/evil-states.el
+++ b/evil-states.el
@@ -179,8 +179,7 @@ Handles the repeat-count of the insertion command."
(move-to-column col t)
(funcall col))
(dotimes (_ (or evil-insert-count 1))
-(evil-execute-repeat-info (cdr
evil-insert-repeat-info))
-(run-hooks 'post-command-hook))
+(evil-execute-repeat-info (cdr
evil-insert-repeat-info)))
(and evil-want-fine-undo (evil-end-undo-step)))
;;; Visual state
diff --git a/evil-tests.el b/evil-tests.el
index 96bf2a63f5..01af626091 100644
--- a/evil-tests.el
+++ b/evil-tests.el
@@ -1652,6 +1652,17 @@ New Tex[t]
((kbd "C-v") "jj$AXXX" [escape])
"line 1line 1line 1XX[X]\nline 2XXX\nline 3line 3XXX\n")))
+(ert-deftest evil-visual-block-insert ()
+ "Test inserting (prepending) in visual block."
+ :tags '(evil visual insert)
+ (ert-info ("Prepend and repeat")
+(evil-test-buffer
+ "[a]lpha\nbravo\ncharlie\ndelta\necho\nfoxtrot\ngolf"
+ ("\C-v" "jj" "I" "zulu" [escape])
+ "zul[u]alpha\nzulubravo\nzulucharlie\ndelta\necho\nfoxtrot\ngolf"
+ ("/delta" [return] ".")
+
"zulualpha\nzulubravo\nzulucharlie\nzul[u]delta\nzuluecho\nzulufoxtrot\ngolf")))
+
(ert-deftest evil-test-repeat-digraph ()
"Test repeat of insertion of a digraph."
:tags '(evil digraph repeat)
@@ -9734,7 +9745,9 @@ parameter set."
"new buffe[r]")
(delete-file temp-file)
(let ((buf (file-name-nondirectory temp-file)))
-(when (get-buffer buf) (kill-buffer buf))
+(when (get-buffer buf)
+ (with-current-buffer buf (set-buffer-modified-p nil))
+ (kill-buffer buf))
(ert-info ("Jump multiple times between files")
(let ((a (make-temp-file "evil-aa-" nil nil "evil-bb\n\nthis is a"))
(b (make-temp-file "evil-bb-" nil nil "evil-cc\n\nthis is b"))
@@ -9752,7 +9765,9 @@ parameter set."
"this is c")
(dolist (f (list a b c))
(let ((buf (file-name-nondirectory f)))
- (when (get-buffer buf) (kill-buffer buf)))
+ (when (get-buffer buf)
+(with-current-buffer buf (set-buffer-modified-p nil))
+(kill-buffer buf)))
(delete-file f)))
(ert-deftest evil-test-find-file ()
[nongnu] elpa/vm updated (7566b1ea46 -> bd7e1f9429)
elpasync pushed a change to branch elpa/vm. from 7566b1ea46 Merge branch 'fix-paren-typo' into 'main' new 69f12470d6 backed out commit 310d8ff, which was support to remove a spurious &optional, but undid other changes for unknown reasons new 06c7290094 removed spurious &optional, which is now an error in emacs new 8ec23d2ccc Merge branch 'backout-suprious-optional' into 'main' new bd7e1f9429 Merge branch 'main' into 'main' Summary of changes: info/vm.texinfo | 19 +++-- lisp/vm-imap.el | 129 +--- lisp/vm-mime.el | 11 ++--- lisp/vm.el | 9 ++-- 4 files changed, 63 insertions(+), 105 deletions(-)
[nongnu] elpa/vm 69f12470d6 1/4: backed out commit 310d8ff, which was support to remove a spurious &optional, but undid other changes for unknown reasons
branch: elpa/vm
commit 69f12470d61b21c35b2c941d02bf3c4313596b5e
Author: Mark Diekhans
Commit: Mark Diekhans
backed out commit 310d8ff, which was support to remove a spurious
&optional, but undid other changes for unknown reasons
---
info/vm.texinfo| 19 +++-
lisp/vm-imap.el| 129 -
lisp/vm-mime.el| 11 ++---
lisp/vm-pcrisis.el | 2 +-
lisp/vm.el | 9 ++--
5 files changed, 64 insertions(+), 106 deletions(-)
diff --git a/info/vm.texinfo b/info/vm.texinfo
index bb03409d13..af3288f473 100644
--- a/info/vm.texinfo
+++ b/info/vm.texinfo
@@ -2299,9 +2299,9 @@ which are described in this section.
The Emacs-w3m browser has its own key bindings for use within HTML text.
These are disabled by default so that VM's key bindings will continue to
have effect. To switch to the Emacs-w3m key bindings, set the variable
-@code{vm-use-presentation-minor-modes} to @code{t}. This asks VM to use the
-minor modes specified in @code{vm-presentation-minor-modes}. By default the
-presentation-minor-mode for emacs-w3m is set to @code{w3m-minor-mode}.
+@code{vm-use-presentation-minor-modes} to @code{t}. The minor mode to be
+used for the Emacs-w3m generated text can be set using the variable
+@code{vm-presentation-minor-modes}.
@vindex vm-w3m-display-inline-images
@cindex multipart/related
@@ -2325,7 +2325,7 @@ customize the variable @code{vm-w3m-safe-url-regexp}.
You can set it to
expression that identifies which @acronym{URL}'s should be regarded as safe.
The Emacs-w3m browser has numerous
-option settings that you may customize. Some important
+option settings that may customize. Some important
settings for use with VM are the following:
@table @code
@@ -2951,7 +2951,6 @@ parent of this composition.
@item C-c C-v
All VM commands may be accessed in a VM Mail mode buffer by prefixing them
with C-c C-v.
-
@kindex C-c C-a
@vindex vm-send-using-mime
@cindex drag and drop
@@ -2988,7 +2987,6 @@ message to be attached. If you invoke the command on
marked
messages by running
@code{vm-next-command-uses-marks} first, the marked messages in
the selected folder will be attached as a @acronym{MIME} digest.
-
@kindex C-c C-b
@item C-c C-b (@code{vm-attach-buffer})
Attaches an Emacs buffer to the composition.
@@ -3017,12 +3015,10 @@ composing your message.
@kindex m
@findex vm-mail-from-folder
-@cindex parent folder
@anchor{vm-mail-from-folder}
The simplest command is @kbd{m} (@code{vm-mail-from-folder}) which sends a mail
message much as @kbd{M-x mail} does but allows the added commands
-described above. The mail folder from which the command is invoked is
-designated as the @emph{parent folder} of the mail composition.
+described above.
@findex vm-mail
@anchor{vm-mail}
@@ -3416,9 +3412,8 @@ Replies to the all recipients of the current message.
@item F (@code{vm-followup-include-text})
Replies to the all recipients of the current message and provides
included text.
-@kindex m
-@findex vm-mail-from-folder
-@item m (@code{vm-mail-from-folder})
+@findex vm-mail-to-sender
+@item vm-mail-to-sender
Writes a message to the sender of the current message. (This is similar to
@code{vm-reply} but meant for writing a message about a new subject.)
@end table
diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index d5c6f207be..1dc300e9e0 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -1106,8 +1106,6 @@ of the current folder, or nil if none has been recorded."
;; -- lower level I/O
;; vm-imap-send-command: (process command &optional tag no-tag) ->
;; void
-;; vm-imap-send-string: (process string &optional tag no-tag) ->
-;; void
;; vm-imap-select-mailbox: (process & mailbox &optional bool bool) ->
;; (int int uid-validity bool bool (flag list))
;; vm-imap-read-capability-response: process -> ?
@@ -1489,58 +1487,52 @@ as well."
(when (and process (memq (process-status process) '(open run))
(buffer-live-p (process-buffer process)))
(unwind-protect
- (save-excursion ; = save-current-buffer?
- (set-buffer imap-buffer)
- ;;
- (vm-buffer-type:enter 'process)
- ;;
- ;; vm-imap-end-session might have already been called on
- ;; this process, so don't logout and schedule the killing
- ;; the process again if it's already been done.
- (unwind-protect
- (condition-case nil
- (if vm-imap-session-done
- ;;-
- ;; Don't bother checking because it might fail if
- ;; the user typed C-g.
- ;; (vm-imap-session-type:assert 'inactive)
- ;;-
- nil
- (
[nongnu] elpa/vm 06c7290094 2/4: removed spurious &optional, which is now an error in emacs
branch: elpa/vm commit 06c72900948b747b1fe89c885c7d21101bc051b4 Author: Mark Diekhans Commit: Mark Diekhans removed spurious &optional, which is now an error in emacs --- lisp/vm-pcrisis.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/vm-pcrisis.el b/lisp/vm-pcrisis.el index e471b25d3b..8a0a3638fe 100644 --- a/lisp/vm-pcrisis.el +++ b/lisp/vm-pcrisis.el @@ -1244,7 +1244,7 @@ PROMPT argument and call this function interactively in the composition buffer." ;; Functions for vmpc-conditions: ;; --- -(defun vmpc-none-true-yet (&optional &rest exceptions) +(defun vmpc-none-true-yet (&rest exceptions) "True if none of the previous evaluated conditions was true. This is a condition that can appear in `vmpc-conditions'. If EXCEPTIONS are specified, it means none were true except those. For example, if you wanted
[nongnu] elpa/vm 8ec23d2ccc 3/4: Merge branch 'backout-suprious-optional' into 'main'
branch: elpa/vm
commit 8ec23d2ccc79a920a75ce912d6f9805373e2df9a
Merge: 7566b1ea46 06c7290094
Author: Mark Diekhans
Commit: Mark Diekhans
Merge branch 'backout-suprious-optional' into 'main'
backed out commit 310d8ff, which causes Internal display failed on
multi-part mime
See merge request diekhans/vm!1
---
info/vm.texinfo | 19 +++--
lisp/vm-imap.el | 129 +---
lisp/vm-mime.el | 11 ++---
lisp/vm.el | 9 ++--
4 files changed, 63 insertions(+), 105 deletions(-)
diff --git a/info/vm.texinfo b/info/vm.texinfo
index bb03409d13..af3288f473 100644
--- a/info/vm.texinfo
+++ b/info/vm.texinfo
@@ -2299,9 +2299,9 @@ which are described in this section.
The Emacs-w3m browser has its own key bindings for use within HTML text.
These are disabled by default so that VM's key bindings will continue to
have effect. To switch to the Emacs-w3m key bindings, set the variable
-@code{vm-use-presentation-minor-modes} to @code{t}. This asks VM to use the
-minor modes specified in @code{vm-presentation-minor-modes}. By default the
-presentation-minor-mode for emacs-w3m is set to @code{w3m-minor-mode}.
+@code{vm-use-presentation-minor-modes} to @code{t}. The minor mode to be
+used for the Emacs-w3m generated text can be set using the variable
+@code{vm-presentation-minor-modes}.
@vindex vm-w3m-display-inline-images
@cindex multipart/related
@@ -2325,7 +2325,7 @@ customize the variable @code{vm-w3m-safe-url-regexp}.
You can set it to
expression that identifies which @acronym{URL}'s should be regarded as safe.
The Emacs-w3m browser has numerous
-option settings that you may customize. Some important
+option settings that may customize. Some important
settings for use with VM are the following:
@table @code
@@ -2951,7 +2951,6 @@ parent of this composition.
@item C-c C-v
All VM commands may be accessed in a VM Mail mode buffer by prefixing them
with C-c C-v.
-
@kindex C-c C-a
@vindex vm-send-using-mime
@cindex drag and drop
@@ -2988,7 +2987,6 @@ message to be attached. If you invoke the command on
marked
messages by running
@code{vm-next-command-uses-marks} first, the marked messages in
the selected folder will be attached as a @acronym{MIME} digest.
-
@kindex C-c C-b
@item C-c C-b (@code{vm-attach-buffer})
Attaches an Emacs buffer to the composition.
@@ -3017,12 +3015,10 @@ composing your message.
@kindex m
@findex vm-mail-from-folder
-@cindex parent folder
@anchor{vm-mail-from-folder}
The simplest command is @kbd{m} (@code{vm-mail-from-folder}) which sends a mail
message much as @kbd{M-x mail} does but allows the added commands
-described above. The mail folder from which the command is invoked is
-designated as the @emph{parent folder} of the mail composition.
+described above.
@findex vm-mail
@anchor{vm-mail}
@@ -3416,9 +3412,8 @@ Replies to the all recipients of the current message.
@item F (@code{vm-followup-include-text})
Replies to the all recipients of the current message and provides
included text.
-@kindex m
-@findex vm-mail-from-folder
-@item m (@code{vm-mail-from-folder})
+@findex vm-mail-to-sender
+@item vm-mail-to-sender
Writes a message to the sender of the current message. (This is similar to
@code{vm-reply} but meant for writing a message about a new subject.)
@end table
diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index d5c6f207be..1dc300e9e0 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -1106,8 +1106,6 @@ of the current folder, or nil if none has been recorded."
;; -- lower level I/O
;; vm-imap-send-command: (process command &optional tag no-tag) ->
;; void
-;; vm-imap-send-string: (process string &optional tag no-tag) ->
-;; void
;; vm-imap-select-mailbox: (process & mailbox &optional bool bool) ->
;; (int int uid-validity bool bool (flag list))
;; vm-imap-read-capability-response: process -> ?
@@ -1489,58 +1487,52 @@ as well."
(when (and process (memq (process-status process) '(open run))
(buffer-live-p (process-buffer process)))
(unwind-protect
- (save-excursion ; = save-current-buffer?
- (set-buffer imap-buffer)
- ;;
- (vm-buffer-type:enter 'process)
- ;;
- ;; vm-imap-end-session might have already been called on
- ;; this process, so don't logout and schedule the killing
- ;; the process again if it's already been done.
- (unwind-protect
- (condition-case nil
- (if vm-imap-session-done
- ;;-
- ;; Don't bother checking because it might fail if
- ;; the user typed C-g.
- ;; (vm-imap-session-type:assert 'inactive)
- ;;---
[nongnu] elpa/vm bd7e1f9429 4/4: Merge branch 'main' into 'main'
branch: elpa/vm
commit bd7e1f9429c721e41c55eec603bef8bb68e5f837
Merge: 7566b1ea46 8ec23d2ccc
Author: Mark Diekhans
Commit: Mark Diekhans
Merge branch 'main' into 'main'
backed out commit 310d8fff, which causes Internal display failed on
multi-part mime
See merge request emacs-vm/vm!13
---
info/vm.texinfo | 19 +++--
lisp/vm-imap.el | 129 +---
lisp/vm-mime.el | 11 ++---
lisp/vm.el | 9 ++--
4 files changed, 63 insertions(+), 105 deletions(-)
diff --git a/info/vm.texinfo b/info/vm.texinfo
index bb03409d13..af3288f473 100644
--- a/info/vm.texinfo
+++ b/info/vm.texinfo
@@ -2299,9 +2299,9 @@ which are described in this section.
The Emacs-w3m browser has its own key bindings for use within HTML text.
These are disabled by default so that VM's key bindings will continue to
have effect. To switch to the Emacs-w3m key bindings, set the variable
-@code{vm-use-presentation-minor-modes} to @code{t}. This asks VM to use the
-minor modes specified in @code{vm-presentation-minor-modes}. By default the
-presentation-minor-mode for emacs-w3m is set to @code{w3m-minor-mode}.
+@code{vm-use-presentation-minor-modes} to @code{t}. The minor mode to be
+used for the Emacs-w3m generated text can be set using the variable
+@code{vm-presentation-minor-modes}.
@vindex vm-w3m-display-inline-images
@cindex multipart/related
@@ -2325,7 +2325,7 @@ customize the variable @code{vm-w3m-safe-url-regexp}.
You can set it to
expression that identifies which @acronym{URL}'s should be regarded as safe.
The Emacs-w3m browser has numerous
-option settings that you may customize. Some important
+option settings that may customize. Some important
settings for use with VM are the following:
@table @code
@@ -2951,7 +2951,6 @@ parent of this composition.
@item C-c C-v
All VM commands may be accessed in a VM Mail mode buffer by prefixing them
with C-c C-v.
-
@kindex C-c C-a
@vindex vm-send-using-mime
@cindex drag and drop
@@ -2988,7 +2987,6 @@ message to be attached. If you invoke the command on
marked
messages by running
@code{vm-next-command-uses-marks} first, the marked messages in
the selected folder will be attached as a @acronym{MIME} digest.
-
@kindex C-c C-b
@item C-c C-b (@code{vm-attach-buffer})
Attaches an Emacs buffer to the composition.
@@ -3017,12 +3015,10 @@ composing your message.
@kindex m
@findex vm-mail-from-folder
-@cindex parent folder
@anchor{vm-mail-from-folder}
The simplest command is @kbd{m} (@code{vm-mail-from-folder}) which sends a mail
message much as @kbd{M-x mail} does but allows the added commands
-described above. The mail folder from which the command is invoked is
-designated as the @emph{parent folder} of the mail composition.
+described above.
@findex vm-mail
@anchor{vm-mail}
@@ -3416,9 +3412,8 @@ Replies to the all recipients of the current message.
@item F (@code{vm-followup-include-text})
Replies to the all recipients of the current message and provides
included text.
-@kindex m
-@findex vm-mail-from-folder
-@item m (@code{vm-mail-from-folder})
+@findex vm-mail-to-sender
+@item vm-mail-to-sender
Writes a message to the sender of the current message. (This is similar to
@code{vm-reply} but meant for writing a message about a new subject.)
@end table
diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index d5c6f207be..1dc300e9e0 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -1106,8 +1106,6 @@ of the current folder, or nil if none has been recorded."
;; -- lower level I/O
;; vm-imap-send-command: (process command &optional tag no-tag) ->
;; void
-;; vm-imap-send-string: (process string &optional tag no-tag) ->
-;; void
;; vm-imap-select-mailbox: (process & mailbox &optional bool bool) ->
;; (int int uid-validity bool bool (flag list))
;; vm-imap-read-capability-response: process -> ?
@@ -1489,58 +1487,52 @@ as well."
(when (and process (memq (process-status process) '(open run))
(buffer-live-p (process-buffer process)))
(unwind-protect
- (save-excursion ; = save-current-buffer?
- (set-buffer imap-buffer)
- ;;
- (vm-buffer-type:enter 'process)
- ;;
- ;; vm-imap-end-session might have already been called on
- ;; this process, so don't logout and schedule the killing
- ;; the process again if it's already been done.
- (unwind-protect
- (condition-case nil
- (if vm-imap-session-done
- ;;-
- ;; Don't bother checking because it might fail if
- ;; the user typed C-g.
- ;; (vm-imap-session-type:assert 'inactive)
- ;;-
-
[nongnu] elpa/d-mode def1806551 2/2: Merge pull request #119 from jtbx-patches/version
branch: elpa/d-mode commit def180655199b1143207545f63bd188852082b2b Merge: cbdabb9ca5 7d280251de Author: Vladimir Panteleev Commit: GitHub Merge pull request #119 from jtbx-patches/version update version to 202405290611 --- d-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d-mode.el b/d-mode.el index 1c1f56cf92..85200c06e9 100644 --- a/d-mode.el +++ b/d-mode.el @@ -7,7 +7,7 @@ ;; Maintainer: Russel Winder ;; Vladimir Panteleev ;; Created: March 2007 -;; Version: 202003130913 +;; Version: 202405290611 ;; Keywords: D programming language emacs cc-mode ;; Package-Requires: ((emacs "25.1"))
[nongnu] elpa/d-mode 7d280251de 1/2: update version to 202405290611
branch: elpa/d-mode commit 7d280251de13c0042c0846ff4eaa5b1937fcbe01 Author: Jeremy Baxter Commit: Jeremy Baxter update version to 202405290611 The version hasn't been updated in four years, blocking NonGNU ELPA from building newer releases with changes such as 9443cea. The timestamp was taken from commit cbdabb9. --- d-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d-mode.el b/d-mode.el index 1c1f56cf92..85200c06e9 100644 --- a/d-mode.el +++ b/d-mode.el @@ -7,7 +7,7 @@ ;; Maintainer: Russel Winder ;; Vladimir Panteleev ;; Created: March 2007 -;; Version: 202003130913 +;; Version: 202405290611 ;; Keywords: D programming language emacs cc-mode ;; Package-Requires: ((emacs "25.1"))
[nongnu] elpa/treesit-fold 918d4e5290: docs: Use built-in warning
branch: elpa/treesit-fold commit 918d4e5290f412af654e45534482e80f6dccf186 Author: Jen-Chieh Shen Commit: GitHub docs: Use built-in warning --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2aa22bef7b..d5d7129b2a 100644 --- a/README.md +++ b/README.md @@ -656,7 +656,7 @@ To look for the correct node you have three options: function is seeing. - use `M-x treesit-inspect-mode` which diplay in the mode-line the current node at point. -> ⚠️ Warning +> [!WARNING] > > Make sure you look into the correct repository. Some repositories are managed > under https://github.com/tree-sitter/[lang].
