From: Thomas Fitzsimmons <fitzsim@fitzsim.org>
To: emacs-devel@gnu.org
Cc: Alexander Adolf <alexander.adolf@condition-alpha.com>
Subject: Progress for bug#59314 for emacs-29
Date: Tue, 20 Dec 2022 21:59:41 -0500 [thread overview]
Message-ID: <m3fsd9ihr6.fsf@fitzsim.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 129 bytes --]
Hi,
Alexander posted the attached patch, which helps with bug#59314. Can I
push it to the emacs-29 branch?
Thank you,
Thomas
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Untangle-EUDC-s-completion-at-point-function-from-me.patch --]
[-- Type: text/x-diff, Size: 4558 bytes --]
From 658b5ff4dad7f392a9d09f28f6c2bb97f5ae93e8 Mon Sep 17 00:00:00 2001
From: Alexander Adolf <alexander.adolf@condition-alpha.com>
Date: Fri, 9 Dec 2022 22:15:42 +0100
Subject: [PATCH] Untangle EUDC's completion-at-point function from
message-mode
The default completion-styles turned out to not be generous enough to
allow useful email address completion. Hence, this commit sets the
buffer-local value of completion-styles to a better suited value when
performing email completion via eudc-capf-complete, which is also no
longer added to completion-at-point-functions in message-mode.
message-mode has EUDC support already, and that would have been
duplicated functionality. Users are still free to add
eudc-capf-complete to completion-at-point-functions at their own
discretion (for example in mail-mode).
* lisp/net/eudc-capf.el (eudc-capf-complete): Set
completion-styles buffer locally to a more generous value, so that
more candidates can pass the filtering.
(eudc-capf-message-expand-name): Rename to
eudc-capf--message-expand-name to mark it as an internal use
function, and improved the doc string.
* lisp/gnus/message.el (message-mode): No longer add
eudc-capf-complete to the buffer-local value of
completion-at-point-functions.
---
lisp/gnus/message.el | 1 -
lisp/net/eudc-capf.el | 46 ++++++++++++++++++++-----------------------
2 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index e7d11b597b3..6c10a4ae976 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3191,7 +3191,6 @@ message-mode
(mail-abbrevs-setup))
((message-mail-alias-type-p 'ecomplete)
(ecomplete-setup)))
- (add-hook 'completion-at-point-functions #'eudc-capf-complete -1 t)
(add-hook 'completion-at-point-functions #'message-completion-function nil t)
(unless buffer-file-name
(message-set-auto-save-file-name))
diff --git a/lisp/net/eudc-capf.el b/lisp/net/eudc-capf.el
index e2bbd5b28b6..c655c14df6d 100644
--- a/lisp/net/eudc-capf.el
+++ b/lisp/net/eudc-capf.el
@@ -101,34 +101,30 @@ eudc-capf-complete
The return value is either nil when no match is found, or a
completion table as required for functions listed in
`completion-at-point-functions'."
- (if (and (seq-some #'derived-mode-p eudc-capf-modes)
- (let ((mail-abbrev-mode-regexp message-email-recipient-header-regexp))
- (mail-abbrev-in-expansion-header-p)))
- (eudc-capf-message-expand-name)))
+ (when (and (or eudc-server eudc-server-hotlist)
+ (seq-some #'derived-mode-p eudc-capf-modes)
+ (let ((mail-abbrev-mode-regexp message-email-recipient-header-regexp))
+ (mail-abbrev-in-expansion-header-p)))
+ (setq-local completion-styles '(substring partial-completion))
+ (eudc-capf--message-expand-name)))
;;;###autoload
-(defun eudc-capf-message-expand-name ()
- "Email address completion function for `message-completion-alist'.
+(defun eudc-capf--message-expand-name ()
+ "Helper for `eudc-capf-complete'.
-When this function is added to `message-completion-alist',
-replacing any existing entry for `message-expand-name' there,
-with an appropriate regular expression such as for example
-`message-email-recipient-header-regexp', then EUDC will be
-queried for email addresses, and the results delivered to
-`completion-at-point'."
- (if (or eudc-server eudc-server-hotlist)
- (progn
- (let* ((beg (save-excursion
- (re-search-backward "\\([:,]\\|^\\)[ \t]*")
- (match-end 0)))
- (end (point))
- (prefix (save-excursion (buffer-substring-no-properties beg end))))
- (let ((result
- (eudc-query-with-words (split-string prefix "[ \t]+") t)))
- (when result
- (list beg end
- (completion-table-with-cache
- (lambda (_) result) t))))))))
+Computes a completion table as required for functions listed in
+`completion-at-point-functions'."
+ (let* ((beg (save-excursion
+ (re-search-backward "\\([:,]\\|^\\)[ \t]*")
+ (match-end 0)))
+ (end (point))
+ (prefix (save-excursion (buffer-substring-no-properties beg end))))
+ (let ((result
+ (eudc-query-with-words (split-string prefix "[ \t]+") t)))
+ (when result
+ (list beg end
+ (completion-table-with-cache
+ (lambda (_) result) t))))))
(provide 'eudc-capf)
;;; eudc-capf.el ends here
--
2.33.1
next reply other threads:[~2022-12-21 2:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-21 2:59 Thomas Fitzsimmons [this message]
2022-12-21 5:19 ` Progress for bug#59314 for emacs-29 Stefan Monnier
2022-12-23 14:59 ` Alexander Adolf
2022-12-21 12:14 ` Eli Zaretskii
2022-12-21 12:54 ` Thomas Fitzsimmons
2022-12-21 13:46 ` Eli Zaretskii
2022-12-22 11:59 ` Alexander Adolf
2022-12-22 11:56 ` Alexander Adolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3fsd9ihr6.fsf@fitzsim.org \
--to=fitzsim@fitzsim.org \
--cc=alexander.adolf@condition-alpha.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.