org-mac-link.el: Tweak AppleScript to grab Mail.app messages

* contrib/lisp/org-mac-link.el (org-as-get-selected-mail): Make sure
no extra new line is present in the string returned from the
AppleScript.

* contrib/lisp/org-mac-link.el (org-mac-message-get-links): Get rid of
the enclosing quotes before splitting the string.
This commit is contained in:
Alan Schmitt 2014-06-04 11:47:09 +02:00
parent 6fb033c791
commit 73bada5d84
1 changed files with 6 additions and 2 deletions

View File

@ -8,6 +8,7 @@
;; John Wiegley <johnw@gnu.org> ;; John Wiegley <johnw@gnu.org>
;; Christopher Suckling <suckling at gmail dot com> ;; Christopher Suckling <suckling at gmail dot com>
;; Daniil Frumin <difrumin@gmail.com> ;; Daniil Frumin <difrumin@gmail.com>
;; Alan Schmitt <alan.schmitt@polytechnique.org>
;; ;;
;; ;;
;; Version: 1.1 ;; Version: 1.1
@ -727,7 +728,10 @@ This will use the command `open' with the message URL."
"repeat with theMessage in theSelection\n" "repeat with theMessage in theSelection\n"
"set theID to message id of theMessage\n" "set theID to message id of theMessage\n"
"set theSubject to subject of theMessage\n" "set theSubject to subject of theMessage\n"
"set theLink to \"message://\" & theID & \"::split::\" & theSubject & \"\n\"\n" "set theLink to \"message://\" & theID & \"::split::\" & theSubject\n"
"if (theLinkList is not equal to {}) then\n"
"set theLink to \"\n\" & theLink\n"
"end if\n"
"copy theLink to end of theLinkList\n" "copy theLink to end of theLinkList\n"
"end repeat\n" "end repeat\n"
"return theLinkList as string\n" "return theLinkList as string\n"
@ -801,7 +805,7 @@ The Org-syntax text will be pushed to the kill ring, and also returned."
(link-list (link-list
(mapcar (mapcar
(lambda (x) (if (string-match "\\`\"\\(.*\\)\"\\'" x) (setq x (match-string 1 x))) x) (lambda (x) (if (string-match "\\`\"\\(.*\\)\"\\'" x) (setq x (match-string 1 x))) x)
(split-string as-link-list "[\r\n]+"))) (split-string (substring as-link-list 1 -1) "[\r\n]+")))
split-link URL description orglink orglink-insert rtn orglink-list) split-link URL description orglink orglink-insert rtn orglink-list)
(while link-list (while link-list
(setq split-link (split-string (pop link-list) "::split::")) (setq split-link (split-string (pop link-list) "::split::"))