From 919511eb86975353eab78842f6b68e65f55fd44d Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 26 Aug 2022 17:25:50 -0400 Subject: [PATCH] Adding org-contacts to GNU ELPA Hi Miles, AFAICT the copyright status of org-contacts is now cleared (Michael Strey's paperwork is done), so we could add it to GNU ELPA. The only thing missing AFAIK is to change the `copyright` line as in the patch below which also fixes the output of `git status` after installing the package. Stefan --- .gitignore | 3 +++ org-contacts.el | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d17848b --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.elc +/org-contacts-autoloads.el +/org-contacts-pkg.el diff --git a/org-contacts.el b/org-contacts.el index 370e462..9f35d9c 100644 --- a/org-contacts.el +++ b/org-contacts.el @@ -1,6 +1,6 @@ ;;; org-contacts.el --- Contacts management system for Org Mode -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2014, 2021 Julien Danjou +;; Copyright (C) 2010-2022 Free Software Foundation, Inc. ;; Author: Julien Danjou ;; Maintainer: stardiviner @@ -563,9 +563,9 @@ description." (goto-char marker) ;; FIXME: AFAIK, `org-make-tags-matcher' returns ;; a cons whose cdr is a function, so why do we - ;; pass it to `eval' rather than to (say) - ;; `funcall'? - (eval (cdr (org-make-tags-matcher (cl-subseq string 1)))))) + ;; pass it to `eval'? + (eval (cdr (org-make-tags-matcher (cl-subseq string 1))) + t))) collect (org-contacts-format-email contact-name email)) ","))) (when (not (string= "" result)) @@ -634,7 +634,7 @@ description." (defun org-contacts-org-complete--annotation-function (candidate) "Return org-contacts tags of contact candidate." ;; TODO - "Tags: " + "Tags: " ;; FIXME: Ignored! (ignore candidate)) (defun org-contacts-org-complete--doc-function (candidate) @@ -692,7 +692,7 @@ description." ;;;###autoload (defun org-contacts-org-complete-function () "Function used in `completion-at-point-functions' in `org-mode' to complete @name. -Usage: (add-hook 'completion-at-point-functions 'org-contacts-org-complete-function nil 'local)" +Usage: (add-hook \\='completion-at-point-functions #\\='org-contacts-org-complete-function nil \\='local)" (when-let* ((end (point)) (begin (save-excursion (skip-chars-backward "[:alnum:]@") (point))) (symbol (buffer-substring-no-properties begin end))