Merge branch 'master' of code.orgmode.org:bzg/org-mode

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~) ::
 

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."