From 08e62edb3a8f9b670fad2700688162697fa92360 Mon Sep 17 00:00:00 2001 From: David Asabina Date: Mon, 19 Apr 2021 12:53:16 +0200 Subject: [PATCH 1/3] org-protocol: Fix missing '+' in js snippet * org-protocol (org-protocol-capture): Add missing plus-sign to javascript snippet to allow readers of the doc string to use example snippet with minimal edits. TINYCHANGE --- lisp/org-protocol.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index be74057cb..878423d21 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -462,7 +462,7 @@ This function detects an URL, title and optional text, separated by `/'. The location for a browser's bookmark looks like this: javascript:location.href = \\='org-protocol://capture?url=\\='+ \\ - encodeURIComponent(location.href) + \\='&title=\\=' \\ + encodeURIComponent(location.href) + \\='&title=\\=' + \\ encodeURIComponent(document.title) + \\='&body=\\=' + \\ encodeURIComponent(window.getSelection()) From 5be650714d14631038aa0ab1e6dcec155efa6146 Mon Sep 17 00:00:00 2001 From: Juan Manuel Macias Date: Wed, 28 Apr 2021 07:45:05 +0200 Subject: [PATCH 2/3] org.el (org-sort-remove-invisible): Remove spurious spaces * org.el (org-sort-remove-invisible): Remove spurious spaces. TINYCHANGE --- lisp/org.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index d972c63ef..e59424f3f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8081,11 +8081,12 @@ Optional argument WITH-CASE means sort case-sensitively." "Remove invisible part of links and emphasis markers from string S." (remove-text-properties 0 (length s) org-rm-props s) (replace-regexp-in-string - org-verbatim-re (lambda (m) (format "%s " (match-string 4 m))) + org-verbatim-re (lambda (m) (format "%s" (match-string 4 m))) (replace-regexp-in-string - org-emph-re (lambda (m) (format " %s " (match-string 4 m))) + org-emph-re (lambda (m) (format "%s" (match-string 4 m))) (org-link-display-format s) - t t) t t)) + t t) + t t)) (defvar org-after-sorting-entries-or-items-hook nil "Hook that is run after a bunch of entries or items have been sorted. From ebcee052fd23b7abe7fd4e24341615b66dd0fa06 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 28 Apr 2021 08:48:29 +0200 Subject: [PATCH 3/3] Revert "org.el (org-sort-remove-invisible): Remove spurious spaces" This reverts commit 5be650714d14631038aa0ab1e6dcec155efa6146. --- lisp/org.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index e59424f3f..d972c63ef 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8081,12 +8081,11 @@ Optional argument WITH-CASE means sort case-sensitively." "Remove invisible part of links and emphasis markers from string S." (remove-text-properties 0 (length s) org-rm-props s) (replace-regexp-in-string - org-verbatim-re (lambda (m) (format "%s" (match-string 4 m))) + org-verbatim-re (lambda (m) (format "%s " (match-string 4 m))) (replace-regexp-in-string - org-emph-re (lambda (m) (format "%s" (match-string 4 m))) + org-emph-re (lambda (m) (format " %s " (match-string 4 m))) (org-link-display-format s) - t t) - t t)) + t t) t t)) (defvar org-after-sorting-entries-or-items-hook nil "Hook that is run after a bunch of entries or items have been sorted.