summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2020-12-19 17:26:58 +0100
committerKyle Meyer <kyle@kyleam.com>2021-02-14 17:38:07 -0500
commitce22aa15fd48c7c54d09044e14b683d98772a68f (patch)
tree907fcdf5215786cb460e29fab03b04e313cade03
parentec52bfef54cfd7292f7e44184638f84443f50e6e (diff)
downloadorg-mode-ce22aa15fd48c7c54d09044e14b683d98772a68f.tar.gz
Backport commit 5ab5c3898 from Emacs
* lisp/org-indent.el (org-indent-mode-turns-off-org-adapt-indentation) (org-indent-mode-turns-on-hiding-stars): * lisp/org-protocol.el (org-protocol-project-alist): Shorten doc strings to not exceed 80-column limits. (Bug#44858) Shorten over-wide docstrings in defcustoms 5ab5c3898778406103e7183bf41c7d018077092b Stefan Kangas Sat Dec 19 18:21:06 2020 +0100
-rw-r--r--lisp/org-indent.el6
-rw-r--r--lisp/org-protocol.el6
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index af2485c..c6bf416 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -85,15 +85,13 @@ it may be prettier to customize the `org-indent' face."
:type 'character)
(defcustom org-indent-mode-turns-off-org-adapt-indentation t
- "Non-nil means setting the variable `org-indent-mode' will \
-turn off indentation adaptation.
+ "Non-nil means setting `org-indent-mode' will turn off indentation adaptation.
For details see the variable `org-adapt-indentation'."
:group 'org-indent
:type 'boolean)
(defcustom org-indent-mode-turns-on-hiding-stars t
- "Non-nil means setting the variable `org-indent-mode' will \
-turn on `org-hide-leading-stars'."
+ "Non-nil means setting `org-indent-mode' will turn on `org-hide-leading-stars'."
:group 'org-indent
:type 'boolean)
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 7f9a6ae..74043f8 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -181,7 +181,8 @@ Possible properties are:
:working-directory - the local working directory. This is, what base-url will
be replaced with.
:redirects - A list of cons cells, each of which maps a regular
- expression to match to a path relative to :working-directory.
+ expression to match to a path relative to
+ :working-directory.
Example:
@@ -202,7 +203,8 @@ Example:
:working-directory \"~/site/content/post/\"
:online-suffix \".html\"
:working-suffix \".md\"
- :rewrites ((\"\\(https://site.com/[0-9]+/[0-9]+/[0-9]+/\\)\" . \".md\")))
+ :rewrites ((\"\\(https://site.com/[0-9]+/[0-9]+/[0-9]+/\\)\"
+ . \".md\")))
(\"GNU emacs OpenGrok\"
:base-url \"https://opengrok.housegordon.com/source/xref/emacs/\"
:working-directory \"~/dev/gnu-emacs/\")))