ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-12-22 09:19:21 +01:00
parent 387e9c303e 22af33a015
commit 060e6eff06
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/lisp/org-mac-link.el
View File

@ -3,13 +3,13 @@
;; ;;
;; Copyright (c) 2010-2013 Free Software Foundation, Inc. ;; Copyright (c) 2010-2013 Free Software Foundation, Inc.
;; ;;
;; Authors: ;; Authors:
;; Anthony Lander <anthony.lander@gmail.com> ;; Anthony Lander <anthony.lander@gmail.com>
;; 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>
;; ;;
;; ;;
;; Version: 1.1 ;; Version: 1.1
;; Keywords: org, mac, hyperlink ;; Keywords: org, mac, hyperlink
;; ;;
@ -201,14 +201,14 @@ applications and inserting them in org documents"
("S" "kim" org-mac-skim-insert-page ,org-mac-grab-Skim-app-p))) ("S" "kim" org-mac-skim-insert-page ,org-mac-grab-Skim-app-p)))
(menu-string (make-string 0 ?x)) (menu-string (make-string 0 ?x))
input) input)
;; Create the menu string for the keymap ;; Create the menu string for the keymap
(mapc '(lambda (descriptor) (mapc '(lambda (descriptor)
(when (elt descriptor 3) (when (elt descriptor 3)
(setf menu-string (concat menu-string "[" (elt descriptor 0) "]" (elt descriptor 1) " ")))) (setf menu-string (concat menu-string "[" (elt descriptor 0) "]" (elt descriptor 1) " "))))
descriptors) descriptors)
(setf (elt menu-string (- (length menu-string) 1)) ?:) (setf (elt menu-string (- (length menu-string) 1)) ?:)
;; Prompt the user, and grab the link ;; Prompt the user, and grab the link
(message menu-string) (message menu-string)
(setq input (read-char-exclusive)) (setq input (read-char-exclusive))
@ -368,7 +368,7 @@ applications and inserting them in org documents"
"set links to {}\n" "set links to {}\n"
"copy theResult to the end of links\n" "copy theResult to the end of links\n"
"return links as string\n")))) "return links as string\n"))))
(car (split-string result "[\r\n]+" t)))) (substring (car (split-string result "[\r\n]+" t)) 1 -1)))
(defun org-mac-chrome-get-frontmost-url () (defun org-mac-chrome-get-frontmost-url ()
(interactive) (interactive)