Merge branch 'master' of orgmode.org:org-mode
This commit is contained in:
David Arroyo Menendez
commit
dcddfae281
File diff suppressed because it is too large
Load Diff
215
lisp/org.el
215
lisp/org.el
|
|
@ -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,103 +15244,102 @@ 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-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))
|
||||
(setq beg (point))
|
||||
(setq sum-props (get-text-property (point) 'org-summaries))
|
||||
(setq clocksum (get-text-property (point) :org-clock-minutes)
|
||||
clocksumt (get-text-property (point) :org-clock-minutes-today))
|
||||
(outline-next-heading)
|
||||
(setq end (point))
|
||||
(when (memq which '(all special))
|
||||
;; Get the special properties, like TODO and tags
|
||||
(goto-char beg)
|
||||
(when (and (or (not specific) (string= specific "TODO"))
|
||||
(looking-at org-todo-line-regexp) (match-end 2))
|
||||
(push (cons "TODO" (org-match-string-no-properties 2)) props))
|
||||
(when (and (or (not specific) (string= specific "PRIORITY"))
|
||||
(looking-at org-priority-regexp))
|
||||
(push (cons "PRIORITY" (org-match-string-no-properties 2)) props))
|
||||
(when (or (not specific) (string= specific "FILE"))
|
||||
(push (cons "FILE" buffer-file-name) props))
|
||||
(when (and (or (not specific) (string= specific "TAGS"))
|
||||
(setq value (org-get-tags-string))
|
||||
(string-match "\\S-" value))
|
||||
(push (cons "TAGS" value) props))
|
||||
(when (and (or (not specific) (string= specific "ALLTAGS"))
|
||||
(setq value (org-get-tags-at)))
|
||||
(push (cons "ALLTAGS" (concat ":" (mapconcat 'identity value ":")
|
||||
":"))
|
||||
props))
|
||||
(when (or (not specific) (string= specific "BLOCKED"))
|
||||
(push (cons "BLOCKED" (if (org-entry-blocked-p) "t" "")) props))
|
||||
(when (or (not specific)
|
||||
(member specific
|
||||
'("SCHEDULED" "DEADLINE" "CLOCK" "CLOSED"
|
||||
"TIMESTAMP" "TIMESTAMP_IA")))
|
||||
(catch 'match
|
||||
(while (re-search-forward org-maybe-keyword-time-regexp end t)
|
||||
(setq key (if (match-end 1)
|
||||
(substring (org-match-string-no-properties 1)
|
||||
0 -1))
|
||||
string (if (equal key clockstr)
|
||||
(org-trim
|
||||
(buffer-substring-no-properties
|
||||
(match-beginning 3) (goto-char
|
||||
(point-at-eol))))
|
||||
(substring (org-match-string-no-properties 3)
|
||||
1 -1)))
|
||||
;; Get the correct property name from the key. This is
|
||||
;; necessary if the user has configured time keywords.
|
||||
(setq key1 (concat key ":"))
|
||||
(cond
|
||||
((not key)
|
||||
(setq key
|
||||
(if (= (char-after (match-beginning 3)) ?\[)
|
||||
"TIMESTAMP_IA" "TIMESTAMP")))
|
||||
((equal key1 org-scheduled-string) (setq key "SCHEDULED"))
|
||||
((equal key1 org-deadline-string) (setq key "DEADLINE"))
|
||||
((equal key1 org-closed-string) (setq key "CLOSED"))
|
||||
((equal key1 org-clock-string) (setq key "CLOCK")))
|
||||
(if (and specific (equal key specific) (not (equal key "CLOCK")))
|
||||
(progn
|
||||
(push (cons key string) props)
|
||||
;; no need to search further if match is found
|
||||
(throw 'match t))
|
||||
(when (or (equal key "CLOCK") (not (assoc key props)))
|
||||
(push (cons key string) props)))))))
|
||||
(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)
|
||||
(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)
|
||||
clocksumt (get-text-property (point) :org-clock-minutes-today))
|
||||
(outline-next-heading)
|
||||
(setq end (point))
|
||||
(when (memq which '(all special))
|
||||
;; Get the special properties, like TODO and tags
|
||||
(goto-char beg)
|
||||
(when (and (or (not specific) (string= specific "TODO"))
|
||||
(looking-at org-todo-line-regexp) (match-end 2))
|
||||
(push (cons "TODO" (org-match-string-no-properties 2)) props))
|
||||
(when (and (or (not specific) (string= specific "PRIORITY"))
|
||||
(looking-at org-priority-regexp))
|
||||
(push (cons "PRIORITY" (org-match-string-no-properties 2)) props))
|
||||
(when (or (not specific) (string= specific "FILE"))
|
||||
(push (cons "FILE" buffer-file-name) props))
|
||||
(when (and (or (not specific) (string= specific "TAGS"))
|
||||
(setq value (org-get-tags-string))
|
||||
(string-match "\\S-" value))
|
||||
(push (cons "TAGS" value) props))
|
||||
(when (and (or (not specific) (string= specific "ALLTAGS"))
|
||||
(setq value (org-get-tags-at)))
|
||||
(push (cons "ALLTAGS" (concat ":" (mapconcat 'identity value ":")
|
||||
":"))
|
||||
props))
|
||||
(when (or (not specific) (string= specific "BLOCKED"))
|
||||
(push (cons "BLOCKED" (if (org-entry-blocked-p) "t" "")) props))
|
||||
(when (or (not specific)
|
||||
(member specific
|
||||
'("SCHEDULED" "DEADLINE" "CLOCK" "CLOSED"
|
||||
"TIMESTAMP" "TIMESTAMP_IA")))
|
||||
(catch 'match
|
||||
(while (re-search-forward org-maybe-keyword-time-regexp end t)
|
||||
(setq key (if (match-end 1)
|
||||
(substring (org-match-string-no-properties 1)
|
||||
0 -1))
|
||||
string (if (equal key clockstr)
|
||||
(org-trim
|
||||
(buffer-substring-no-properties
|
||||
(match-beginning 3) (goto-char
|
||||
(point-at-eol))))
|
||||
(substring (org-match-string-no-properties 3)
|
||||
1 -1)))
|
||||
;; Get the correct property name from the key. This is
|
||||
;; necessary if the user has configured time keywords.
|
||||
(setq key1 (concat key ":"))
|
||||
(cond
|
||||
((not key)
|
||||
(setq key
|
||||
(if (= (char-after (match-beginning 3)) ?\[)
|
||||
"TIMESTAMP_IA" "TIMESTAMP")))
|
||||
((equal key1 org-scheduled-string) (setq key "SCHEDULED"))
|
||||
((equal key1 org-deadline-string) (setq key "DEADLINE"))
|
||||
((equal key1 org-closed-string) (setq key "CLOSED"))
|
||||
((equal key1 org-clock-string) (setq key "CLOCK")))
|
||||
(if (and specific (equal key specific) (not (equal key "CLOCK")))
|
||||
(progn
|
||||
(push (cons key string) props)
|
||||
;; no need to search further if match is found
|
||||
(throw 'match t))
|
||||
(when (or (equal key "CLOCK") (not (assoc key props)))
|
||||
(push (cons key string) props)))))))
|
||||
|
||||
(when (memq which '(all standard))
|
||||
;; Get the standard properties, like :PROP: ...
|
||||
(setq range (org-get-property-block beg end))
|
||||
(when range
|
||||
(goto-char (car range))
|
||||
(while (re-search-forward org-property-re
|
||||
(cdr range) t)
|
||||
(setq key (org-match-string-no-properties 2)
|
||||
value (org-trim (or (org-match-string-no-properties 3) "")))
|
||||
(unless (member key excluded)
|
||||
(push (cons key (or value "")) props)))))
|
||||
(if clocksum
|
||||
(push (cons "CLOCKSUM"
|
||||
(org-columns-number-to-string (/ (float clocksum) 60.)
|
||||
'add_times))
|
||||
props))
|
||||
(if clocksumt
|
||||
(push (cons "CLOCKSUM_T"
|
||||
(org-columns-number-to-string (/ (float clocksumt) 60.)
|
||||
'add_times))
|
||||
props))
|
||||
(unless (assoc "CATEGORY" props)
|
||||
(push (cons "CATEGORY" (org-get-category)) props))
|
||||
(append sum-props (nreverse props)))))))
|
||||
(when (memq which '(all standard))
|
||||
;; Get the standard properties, like :PROP: ...
|
||||
(setq range (org-get-property-block beg end))
|
||||
(when range
|
||||
(goto-char (car range))
|
||||
(while (re-search-forward org-property-re
|
||||
(cdr range) t)
|
||||
(setq key (org-match-string-no-properties 2)
|
||||
value (org-trim (or (org-match-string-no-properties 3) "")))
|
||||
(unless (member key excluded)
|
||||
(push (cons key (or value "")) props)))))
|
||||
(if clocksum
|
||||
(push (cons "CLOCKSUM"
|
||||
(org-columns-number-to-string (/ (float clocksum) 60.)
|
||||
'add_times))
|
||||
props))
|
||||
(if clocksumt
|
||||
(push (cons "CLOCKSUM_T"
|
||||
(org-columns-number-to-string (/ (float clocksumt) 60.)
|
||||
'add_times))
|
||||
props))
|
||||
(unless (assoc "CATEGORY" props)
|
||||
(push (cons "CATEGORY" (org-get-category)) props))
|
||||
(append sum-props (nreverse props)))))))
|
||||
|
||||
(defun org-entry-get (pom property &optional inherit literal-nil)
|
||||
"Get value of PROPERTY for entry or content at point-or-marker POM.
|
||||
|
|
|
|||
|
|
@ -205,31 +205,32 @@ 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)
|
||||
(goto-char (point-min)))))
|
||||
(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))
|
||||
|
||||
(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))
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue