diff options
| author | Bastien <bzg@gnu.org> | 2018-12-21 09:52:49 +0100 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2018-12-21 09:52:49 +0100 |
| commit | 495c7c6a5774a4d3035c582a3b4c95eb04e83dd5 (patch) | |
| tree | e689a6293c9f2a5062f5c905e5bd76796ff14379 | |
| parent | 67ee27cec2c8c83336f8b1dc0f0f3f5d930919f0 (diff) | |
| parent | 908b55124cb1abdcb3b7b6e3276e0ac22c86d254 (diff) | |
| download | org-mode-495c7c6a5774a4d3035c582a3b4c95eb04e83dd5.tar.gz | |
Merge branch 'master' of code.orgmode.org:bzg/org-mode
| -rw-r--r-- | doc/org-manual.org | 2 | ||||
| -rw-r--r-- | lisp/org-protocol.el | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/org-manual.org b/doc/org-manual.org index 90b5c04..173a052 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -583,7 +583,7 @@ buffer: #+cindex: @samp{VISIBILITY}, property Furthermore, any entries with a =VISIBILITY= property (see [[*Properties and Columns]]) get their visibility adapted accordingly. Allowed values -for this property are =folded=, =children=, =content=, and ~all~. +for this property are =folded=, =children=, =content=, and =all=. - {{{kbd(C-u C-u TAB)}}} (~org-set-startup-visibility~) :: diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 88f471e..a0a10d3 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -503,8 +503,11 @@ Now template ?b will be used." :initial region :query parts) (raise-frame) - (org-capture nil template)) - (message "Item captured.")) + (org-capture nil template) + (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) "Convert QUERY key=value pairs in the URL to a property list." |