diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2021-03-29 00:34:15 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2021-03-29 00:34:15 -0400 |
| commit | 4d9dabc36fb48b992a8f08adc9dcca4f039eb540 (patch) | |
| tree | 8e46b6f8ef0a1e912869119876cb1be15e0ee808 | |
| parent | 05277f5caf68cd06eac04130c2713d40b066690f (diff) | |
| parent | 7c23fc7efae8cf51f59d4868d2c4a1b967a9a29d (diff) | |
| download | org-mode-4d9dabc36fb48b992a8f08adc9dcca4f039eb540.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | doc/org-manual.org | 6 | ||||
| -rw-r--r-- | lisp/ob-ocaml.el | 2 | ||||
| -rw-r--r-- | lisp/org-protocol.el | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/org-manual.org b/doc/org-manual.org index 258576b..efe9568 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -19588,7 +19588,7 @@ passed to Emacs through the =emacsclient= command, so you also need to ensure an Emacs server is running. More precisely, when the application calls -: emacsclient org-protocol://PROTOCOL?key1=val1&key2=val2 +: emacsclient "org-protocol://PROTOCOL?key1=val1&key2=val2" #+texinfo: @noindent Emacs calls the handler associated to {{{var(PROTOCOL)}}} with @@ -19611,7 +19611,7 @@ Using the ~store-link~ handler, you can copy links, to that they can be inserted using {{{kbd(M-x org-insert-link)}}} or yanking. More precisely, the command -: emacsclient org-protocol://store-link?url=URL&title=TITLE +: emacsclient "org-protocol://store-link?url=URL&title=TITLE" #+texinfo: @noindent stores the following link: @@ -19640,7 +19640,7 @@ javascript:location.href='org-protocol://store-link?url='+ Activating the "capture" handler pops up a =Capture= buffer in Emacs, using acapture template. -: emacsclient org-protocol://capture?template=X?url=URL?title=TITLE?body=BODY +: emacsclient "org-protocol://capture?template=X&url=URL&title=TITLE&body=BODY" To use this feature, add a bookmark with an arbitrary name, e.g., =Org: capture=, and enter this as =Location=: diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el index 5fd6d1e..ea0ceb8 100644 --- a/lisp/ob-ocaml.el +++ b/lisp/ob-ocaml.el @@ -32,7 +32,7 @@ ;;; Requirements: -;; - tuareg-mode :: https://www-rocq.inria.fr/~acohen/tuareg/ +;; - tuareg-mode :: https://elpa.nongnu.org/nongnu/tuareg.html ;;; Code: (require 'ob) diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 6f8cf00..731f51e 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -49,7 +49,7 @@ ;; 4.) Try this from the command line (adjust the URL as needed): ;; ;; $ emacsclient \ -;; org-protocol://store-link?url=http:%2F%2Flocalhost%2Findex.html&title=The%20title +;; "org-protocol://store-link?url=http:%2F%2Flocalhost%2Findex.html&title=The%20title" ;; ;; 5.) Optionally add custom sub-protocols and handlers: ;; |