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

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
David Arroyo Menendez 2013-11-19 08:13:57 +01:00
parent 381a2f14e4 d35233f84a
commit dcddfae281
3 changed files with 511 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

491
contrib/lisp/org-drill.el
View File

File diff suppressed because it is too large Load Diff

31
lisp/org.el
View File

@ -10520,11 +10520,29 @@ application the system uses for this file type."
(apply cmd (nreverse args1))))
((member type '("http" "https" "ftp" "news"))
(browse-url (concat type ":" (org-link-escape-browser path))))
;; In the example of the http Org link
;; [[http://lists.gnu.org/archive/cgi-bin/namazu.cgi?idxname=emacs-orgmode&query=%252Bsubject:"Release+8.2"]]
;; to open a browser with +subject:"Release 8.2" in the
;; query field the variable `path' contains
;; [...]=%2Bsubject:"Release+8.2", `url-encode-url'
;; converts correct to [...]=%2Bsubject:%22Release+8.2%22
;; and `org-link-escape-browser' converts wrong to
;; [...]=%252Bsubject:%22Release+8.2%22.
;;
;; `url-encode-url' is available since Emacs 24.3.1 and
;; `org-link-escape-browser' can be removed altogether
;; once Org drops support for Emacs 24.1 and 24.2.
(browse-url (funcall (if (fboundp 'url-encode-url)
#'url-encode-url
#'org-link-escape-browser)
(concat type ":" path))))
((string= type "doi")
(browse-url (concat org-doi-server-url
(org-link-escape-browser path))))
;; See comments for type http above
(browse-url (funcall (if (fboundp 'url-encode-url)
#'url-encode-url
#'org-link-escape-browser)
(concat org-doi-server-url path))))
((member type '("message"))
(browse-url (concat type ":" path)))
@ -15226,15 +15244,14 @@ is a string only get exactly this property. SPECIFIC can be a string, the
specific property we are interested in. Specifying it can speed
things up because then unnecessary parsing is avoided."
(setq which (or which 'all))
(org-with-wide-buffer
(org-with-point-at pom
(let ((clockstr (substring org-clock-string 0 -1))
(excluded '("TODO" "TAGS" "ALLTAGS" "PRIORITY" "BLOCKED"))
(case-fold-search nil)
beg end range props sum-props key key1 value string clocksum clocksumt)
(save-excursion
(when (condition-case nil
(and (derived-mode-p 'org-mode) (org-back-to-heading t))
(error nil))
(when (and (derived-mode-p 'org-mode)
(ignore-errors (org-back-to-heading t)))
(setq beg (point))
(setq sum-props (get-text-property (point) 'org-summaries))
(setq clocksum (get-text-property (point) :org-clock-minutes)

27
testing/org-test.el
View File

@ -205,14 +205,14 @@ mode holding TEXT. If the string \"<point>\" appears in TEXT
then remove it and place the point there before running BODY,
otherwise place the point at the beginning of the inserted text."
(declare (indent 1))
(let ((inside-text (if (stringp text) text (eval text))))
`(with-temp-buffer
`(let ((inside-text (if (stringp ,text) ,text (eval ,text))))
(with-temp-buffer
(org-mode)
,(let ((point (string-match (regexp-quote "<point>") inside-text)))
(let ((point (string-match (regexp-quote "<point>") inside-text)))
(if point
`(progn (insert `(replace-match "" nil nil inside-text))
(goto-char ,(match-beginning 0)))
`(progn (insert ,inside-text)
(progn (insert (replace-match "" nil nil inside-text))
(goto-char (match-beginning 0)))
(progn (insert inside-text)
(goto-char (point-min)))))
,@body)))
(def-edebug-spec org-test-with-temp-text (form body))
@ -220,16 +220,17 @@ otherwise place the point at the beginning of the inserted text."
(defmacro org-test-with-temp-text-in-file (text &rest body)
"Run body in a temporary file buffer with Org-mode as the active mode."
(declare (indent 1))
(let ((file (make-temp-file "org-test"))
(inside-text (if (stringp text) text (eval text)))
(results (gensym)))
`(let ((kill-buffer-query-functions nil) ,results)
(with-temp-file ,file (insert ,inside-text))
(find-file ,file)
(let ((results (gensym)))
`(let ((file (make-temp-file "org-test"))
(kill-buffer-query-functions nil)
(inside-text (if (stringp ,text) ,text (eval ,text)))
,results)
(with-temp-file file (insert inside-text))
(find-file file)
(org-mode)
(setq ,results (progn ,@body))
(save-buffer) (kill-buffer (current-buffer))
(delete-file ,file)
(delete-file file)
,results)))
(def-edebug-spec org-test-with-temp-text-in-file (form body))