tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into next

This commit is contained in:
Nicolas Goaziou 2018-12-19 22:39:24 +01:00
parent 9c3a9a9687 255c9c1655
commit 6aa7c798d5
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lisp/org-colview.el
View File

@ -233,21 +233,27 @@ See `org-columns-summary-types' for details.")
"--" "--"
["Quit" org-columns-quit t])) ["Quit" org-columns-quit t]))
(defun org-columns--displayed-value (spec value) (defun org-columns--displayed-value (spec value &optional no-star)
"Return displayed value for specification SPEC in current entry. "Return displayed value for specification SPEC in current entry.
SPEC is a column format specification as stored in SPEC is a column format specification as stored in
`org-columns-current-fmt-compiled'. VALUE is the real value to `org-columns-current-fmt-compiled'. VALUE is the real value to
display, as a string." display, as a string.
When NO-STAR is non-nil, do not add asterisks before displayed
value for ITEM property."
(or (and (functionp org-columns-modify-value-for-display-function) (or (and (functionp org-columns-modify-value-for-display-function)
(funcall org-columns-modify-value-for-display-function (funcall org-columns-modify-value-for-display-function
(nth 1 spec) ;column name (nth 1 spec) ;column name
value)) value))
(pcase spec (pcase spec
(`("ITEM" . ,_) (`("ITEM" . ,_)
(let ((stars
(and (not no-star)
(concat (make-string (1- (org-current-level)) (concat (make-string (1- (org-current-level))
(if org-hide-leading-stars ?\s ?*)) (if org-hide-leading-stars ?\s ?*))
"* " "* "))))
(org-link-display-format value))) (concat stars (org-columns-compact-links value))))
(`(,_ ,_ ,_ ,_ nil) value) (`(,_ ,_ ,_ ,_ nil) value)
;; If PRINTF is set, assume we are displaying a number and ;; If PRINTF is set, assume we are displaying a number and
;; obey to the format string. ;; obey to the format string.
@ -280,7 +286,11 @@ possible to override it with optional argument COMPILED-FMT."
(get-text-property (point) 'duration)) (get-text-property (point) 'duration))
'face 'org-warning)) 'face 'org-warning))
""))) "")))
(list spec v (org-columns--displayed-value spec v)))))) ;; A non-nil COMPILED-FMT means we're calling from Org
;; Agenda mode, where we do not want leading stars for
;; ITEM. Hence the optional argument for
;; `org-columns--displayed-value'.
(list spec v (org-columns--displayed-value spec v compiled-fmt))))))
(or compiled-fmt org-columns-current-fmt-compiled)))) (or compiled-fmt org-columns-current-fmt-compiled))))
(defun org-columns--set-widths (cache) (defun org-columns--set-widths (cache)

7
lisp/org-protocol.el
View File

@ -503,8 +503,11 @@ Now template ?b will be used."
:initial region :initial region
:query parts) :query parts)
(raise-frame) (raise-frame)
(org-capture nil template)) (org-capture nil template)
(message "Item captured.")) (message "Item captured.")
;; Make sure we do not return a string, as `server-visit-files',
;; through `server-edit', would interpret it as a file name.
nil))
(defun org-protocol-convert-query-to-plist (query) (defun org-protocol-convert-query-to-plist (query)
"Convert QUERY key=value pairs in the URL to a property list." "Convert QUERY key=value pairs in the URL to a property list."