diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-04-21 11:26:54 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-04-21 11:26:54 +0200 |
| commit | c1ebb6d221914feeb2cf7c5fa642de91c638e2b5 (patch) | |
| tree | f06ea8eb65e0e84bf36502745dc5e8fa72a58748 | |
| parent | 56fe493618b67b54b57ea0a4b4329354bf46b90e (diff) | |
| parent | c75c574d580ca751e28881fcb6acc8a250adec88 (diff) | |
| download | org-mode-c1ebb6d221914feeb2cf7c5fa642de91c638e2b5.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-capture.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 0d6665d..740ed38 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1518,7 +1518,8 @@ The template may still contain \"%?\" for cursor positioning." (v-c (and kill-ring (current-kill 0))) (v-x (or (org-get-x-clipboard 'PRIMARY) (org-get-x-clipboard 'CLIPBOARD) - (org-get-x-clipboard 'SECONDARY))) + (org-get-x-clipboard 'SECONDARY) + "")) ;ensure it is a string ;; `initial' and `annotation' might have been passed. But if ;; the property list has them, we prefer those values. (v-i (or (plist-get org-store-link-plist :initial) |