aliens/org-contacts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change how completion is done

Browse source
This commit is contained in:
Morgan Smith 2021-10-28 02:00:20 -04:00 committed by stardiviner
parent c98281fcfe
commit 80ab4708b7
1 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
org-contacts.el
View file

@ -502,7 +502,7 @@ prefixes rather than just the beginning of the string."
((cycle-sort-function . org-contacts-display-sort-function) ((cycle-sort-function . org-contacts-display-sort-function)
(display-sort-function . org-contacts-display-sort-function)))) (display-sort-function . org-contacts-display-sort-function))))
(defun org-contacts-complete-group (start end string) (defun org-contacts-complete-group (string)
"Complete text at START from a group. "Complete text at START from a group.
A group FOO is composed of contacts with the tag FOO." A group FOO is composed of contacts with the tag FOO."
@ -520,12 +520,11 @@ A group FOO is composed of contacts with the tag FOO."
(cl-loop for contact in (org-contacts-filter) (cl-loop for contact in (org-contacts-filter)
nconc (org-split-string nconc (org-split-string
(or (cdr (assoc-string "ALLTAGS" (caddr contact))) "") ":"))))))) (or (cdr (assoc-string "ALLTAGS" (caddr contact))) "") ":")))))))
(list start end
(if (= (length completion-list) 1) (if (= (length completion-list) 1)
;; We've found the correct group, returns the address ;; We've found the correct group, returns the address
(let ((tag (get-text-property 0 'org-contacts-group (let ((tag (get-text-property 0 'org-contacts-group
(car completion-list)))) (car completion-list))))
(lambda (string pred &optional to-ignore)
(mapconcat 'identity (mapconcat 'identity
(cl-loop for contact in (org-contacts-filter (cl-loop for contact in (org-contacts-filter
nil nil
@ -542,12 +541,12 @@ A group FOO is composed of contacts with the tag FOO."
""))) "")) ""))) ""))
;; If the user has an email address, append USER <EMAIL>. ;; If the user has an email address, append USER <EMAIL>.
if email collect (org-contacts-format-email contact-name email)) if email collect (org-contacts-format-email contact-name email))
", "))) ", "))
;; We haven't found the correct group ;; We haven't found the correct group
(completion-table-case-fold completion-list (completion-table-case-fold completion-list
(not org-contacts-completion-ignore-case)))))))) (not org-contacts-completion-ignore-case)))))))
(defun org-contacts-complete-tags-props (start end string) (defun org-contacts-complete-tags-props (string)
"Insert emails that match the tags expression. "Insert emails that match the tags expression.
For example: FOO-BAR will match entries tagged with FOO but not For example: FOO-BAR will match entries tagged with FOO but not
@ -581,11 +580,8 @@ description."
(eval (cdr (org-make-tags-matcher (cl-subseq string 1))))))) (eval (cdr (org-make-tags-matcher (cl-subseq string 1)))))))
collect (org-contacts-format-email contact-name email)) collect (org-contacts-format-email contact-name email))
","))) ",")))
(when (not (string= "" result)) (when (not (string= "" result))
;; return (start end function) result)))))
(let* ((to-return result))
(list start end
(lambda (string pred &optional to-ignore) to-return))))))))
(defun org-contacts-remove-ignored-property-values (ignore-list list) (defun org-contacts-remove-ignored-property-values (ignore-list list)
"Remove all ignore-list's elements from list and you can use "Remove all ignore-list's elements from list and you can use
@ -596,7 +592,7 @@ description."
ignore-list)) ignore-list))
list)) list))
(defun org-contacts-complete-name (start end string) (defun org-contacts-complete-name (string)
"Complete text at START with a user name and email." "Complete text at START with a user name and email."
(let* ((completion-ignore-case org-contacts-completion-ignore-case) (let* ((completion-ignore-case org-contacts-completion-ignore-case)
(completion-list (completion-list
@ -625,27 +621,26 @@ description."
string string
(org-uniquify completion-list)))) (org-uniquify completion-list))))
(when completion-list (when completion-list
(list start end (org-contacts-make-collection-prefix completion-list))))
(org-contacts-make-collection-prefix completion-list)))))
(defun org-contacts-message-complete-function (&optional start) (defun org-contacts-message-complete-function ()
"Function used in `completion-at-point-functions' in `message-mode'." "Function used in `completion-at-point-functions' in `message-mode'."
;; Avoid to complete in `post-command-hook'.
(when completion-in-region-mode
(remove-hook 'post-command-hook #'completion-in-region--postch))
(let ((mail-abbrev-mode-regexp (let ((mail-abbrev-mode-regexp
"^\\(Resent-To\\|To\\|B?Cc\\|Reply-To\\|From\\|Mail-Followup-To\\|Mail-Copies-To\\|Disposition-Notification-To\\|Return-Receipt-To\\):")) "^\\(Resent-To\\|To\\|B?Cc\\|Reply-To\\|From\\|Mail-Followup-To\\|Mail-Copies-To\\|Disposition-Notification-To\\|Return-Receipt-To\\):"))
(when (mail-abbrev-in-expansion-header-p) (when (mail-abbrev-in-expansion-header-p)
(let* (let
((end (point)) ((beg
(start (or start (save-excursion
(save-excursion (re-search-backward "\\(\\`\\|[\n:,]\\)[ \t]*")
(re-search-backward "\\(\\`\\|[\n:,]\\)[ \t]*") (goto-char (match-end 0))
(goto-char (match-end 0)) (point)))
(point)))) (end (point)))
(string (buffer-substring start end))) (list beg
(run-hook-with-args-until-success end
'org-contacts-complete-functions start end string))))) (completion-table-dynamic
(lambda (string)
(run-hook-with-args-until-success
'org-contacts-complete-functions string))))))))
(defun org-contacts-gnus-get-name-email () (defun org-contacts-gnus-get-name-email ()
"Get name and email address from Gnus message." "Get name and email address from Gnus message."