[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ebdb 903ae94 2/2: Swap sense of insert/kill arg to ebdb
From: |
Eric Abrahamsen |
Subject: |
[elpa] externals/ebdb 903ae94 2/2: Swap sense of insert/kill arg to ebdb-cite-records |
Date: |
Tue, 15 Aug 2017 11:36:53 -0400 (EDT) |
branch: externals/ebdb
commit 903ae9403848d7637d32186c6b0e9a6d66f1372f
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>
Swap sense of insert/kill arg to ebdb-cite-records
* ebdb.el (ebdb-cite-records): This led to backwards behavior when
called from ebdb-cite-records-ebdb.
* ebdb-com.el (ebdb-cite-records-ebdb): Pass arg.
---
ebdb-com.el | 2 +-
ebdb.el | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ebdb-com.el b/ebdb-com.el
index 97e0d07..4290613 100644
--- a/ebdb-com.el
+++ b/ebdb-com.el
@@ -2039,7 +2039,7 @@ for `ebdb-field-action'."
("org" (org-mode))
("html" (html-mode))
(_ (message-mode)))
- (ebdb-cite-records records arg)))
+ (ebdb-cite-records records arg t)))
;;; completion
diff --git a/ebdb.el b/ebdb.el
index 1daaf86..e6bcb0e 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -4794,7 +4794,7 @@ The formatting rules are defined in
`ebdb-address-format-list'."
;; "Citation" means inserting some sort of string representing the
;; record(s) into the current buffer.
-(defun ebdb-cite-records (&optional records arg insert)
+(defun ebdb-cite-records (&optional records arg kill)
(interactive (list (ebdb-prompt-for-record)
current-prefix-arg))
(let ((recs (if (listp records) records (list records)))
@@ -4806,10 +4806,11 @@ The formatting rules are defined in
`ebdb-address-format-list'."
(car m)))
usable)))
(setq str (ebdb-records-cite style usable))
- (if insert
- (insert str)
- (kill-new str)
- (message "Citation added to kill ring"))))
+ (if kill
+ (progn
+ (kill-new str)
+ (message "Citation added to kill ring"))
+ (insert str))))
(cl-defgeneric ebdb-records-cite (style records)
"Insert mode-appropriate mail strings for RECORDS.