summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2020-12-19 17:35:50 +0100
committerKyle Meyer <kyle@kyleam.com>2021-02-14 17:38:07 -0500
commitd904f9e5dad0adc0269c06d095e809e2c13b8342 (patch)
treef0dafa110ed8b969056add63266615da374660f2
parentce22aa15fd48c7c54d09044e14b683d98772a68f (diff)
downloadorg-mode-d904f9e5dad0adc0269c06d095e809e2c13b8342.tar.gz
Backport commit f88a7897a from Emacs
* lisp/ob-R.el (org-babel-R-write-object-command): * lisp/org-attach.el (org-attach-after-change-hook): * lisp/org.el (org-stamp-time-of-day-regexp): Shorten doc strings to not exceed 80-column limits. (Bug#44858) Shorten over-wide docstrings in variables f88a7897a80ee9129bdc444cafff32d026c4b6d8 Stefan Kangas Sat Dec 19 18:21:06 2020 +0100
-rw-r--r--lisp/ob-R.el2
-rw-r--r--lisp/org-attach.el2
-rw-r--r--lisp/org.el3
3 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 89430de..309a0ac 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -361,7 +361,7 @@ Each member of this list is a list with three members:
)
}
}(object=%s,transfer.file=\"%s\")"
- "A template for an R command to evaluate a block of code and write the result to a file.
+ "Template for an R command to evaluate a block of code and write result to file.
Has four %s escapes to be filled in:
1. Row names, \"TRUE\" or \"FALSE\"
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 5eb5b74..46decac 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -182,7 +182,7 @@ attachment folders based on ID."
:type '(repeat (function :tag "Function with ID as input")))
(defvar org-attach-after-change-hook nil
- "Hook to be called when files have been added or removed to the attachment folder.")
+ "Hook called when files have been added or removed to the attachment folder.")
(defvar org-attach-open-hook nil
"Hook that is invoked by `org-attach-open'.
diff --git a/lisp/org.el b/lisp/org.el
index c61b8fb..43aa0a1 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4112,7 +4112,8 @@ groups carry important information:
"Regular expression to match a timestamp time or time range.
After a match, the following groups carry important information:
0 the full match
-1 date plus weekday, for back referencing to make sure both times are on the same day
+1 date plus weekday, for back referencing to make sure
+ both times are on the same day
2 the first time, range or not
4 the second time, if it is a range.")