Skip to content

Commit 2e36ac2

Browse files
committed
Merge single quote fixes from Emacs's master
This brings in ports of bbf389ea6de (Audit quoting the quote character in doc strings, 2022-04-22), 2d71fd3b041 (Further doc string quoting fixes, 2022-04-22), and b2bce107b15 (Further audits of single quotes in Lisp doc strings, 2022-05-24) from Emacs's master branch, resolving conflicts with 01b0fb1 (Backport from main: Escape single left quotes in docstrings, 2022-07-24). In all cases, take Emacs's side. There are two cases where I think Org's version is preferable, org-babel-lua-read-string and org-agenda-sorting-strategy. Don't keep those _on bugfix_ to avoid conflicts when Emacs's emacs-28 branch is merged to its master branch. When I merge bugfix to main, I'll keep Org's variant, so they'll eventually make it to Emacs's tree, just not as part of the Org 9.5.x to emacs-28 syncing.
2 parents 1c3a462 + 9d29de2 commit 2e36ac2

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

lisp/ob-core.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ value. The value can either be a string or a closure that
480480
evaluates to a string. The closure is evaluated when the source
481481
block is being evaluated (e.g. during execution or export), with
482482
point at the source block. It is not possible to use an
483-
arbitrary function symbol (e.g. \\='some-func), since org uses
483+
arbitrary function symbol (e.g. `some-func'), since org uses
484484
lexical binding. To achieve the same functionality, call the
485485
function within a closure (e.g. (lambda () (some-func))).
486486

lisp/ob-julia.el

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ end")
250250
(defun org-babel-julia-evaluate-external-process
251251
(body result-type result-params column-names-p)
252252
"Evaluate BODY in external julia process.
253-
If RESULT-TYPE equals \\='output then return standard output as a
254-
string. If RESULT-TYPE equals \\='value then return the value of the
253+
If RESULT-TYPE equals `output' then return standard output as a
254+
string. If RESULT-TYPE equals `value' then return the value of the
255255
last statement in BODY, as elisp."
256256
(cl-case result-type
257257
(value
@@ -274,8 +274,8 @@ last statement in BODY, as elisp."
274274
(defun org-babel-julia-evaluate-session
275275
(session body result-type result-params column-names-p)
276276
"Evaluate BODY in SESSION.
277-
If RESULT-TYPE equals \\='output then return standard output as a
278-
string. If RESULT-TYPE equals \\='value then return the value of the
277+
If RESULT-TYPE equals `output' then return standard output as a
278+
string. If RESULT-TYPE equals `value' then return the value of the
279279
last statement in BODY, as elisp."
280280
(cl-case result-type
281281
(value

lisp/ob-lua.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ fd:close()"
395395
(org-babel-lua-table-or-string results)))))
396396

397397
(defun org-babel-lua-read-string (string)
398-
"Strip single quotes from around Lua string."
398+
"Strip \\=' characters from around Lua string."
399399
(org-unbracket-string "'" "'" string))
400400

401401
(provide 'ob-lua)

lisp/ob-table.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ is the equivalent of the following source code block:
8484
#+end_src
8585
8686
NOTE: The quotation marks around the function name,
87-
\\='source-block\\=', are optional.
87+
`source-block', are optional.
8888
8989
NOTE: By default, string variable names are interpreted as
9090
references to source-code blocks, to force interpretation of a

lisp/org-agenda.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,7 +1615,7 @@ alpha-down Sort headlines alphabetically, reversed.
16151615

16161616
The different possibilities will be tried in sequence, and testing stops
16171617
if one comparison returns a \"not-equal\". For example, the default
1618-
\\='(time-up category-keep priority-down)
1618+
`(time-up category-keep priority-down)'
16191619
means: Pull out all entries having a specified time of day and sort them,
16201620
in order to make a time schedule for the current day the first thing in the
16211621
agenda listing for the day. Of the entries without a time indication, keep
@@ -4124,7 +4124,7 @@ dimming them." ;FIXME: The arg isn't used, actually!
41244124

41254125
If the header at `org-hd-marker' is blocked according to
41264126
`org-entry-blocked-p', then if `org-agenda-dim-blocked-tasks' is
4127-
\\='invisible and the header is not blocked by checkboxes, set the
4127+
`invisible' and the header is not blocked by checkboxes, set the
41284128
text property `org-todo-blocked' to `invisible', otherwise set it
41294129
to t."
41304130
(when (get-text-property 0 'todo-state entry)

lisp/org-table.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5465,7 +5465,7 @@ The table is taken from the parameter TXT, or from the buffer at point."
54655465
(nreverse table)))))
54665466

54675467
(defun org-table-collapse-header (table &optional separator max-header-lines)
5468-
"Collapse the lines before \\='hline into a single header.
5468+
"Collapse the lines before `hline' into a single header.
54695469

54705470
The given TABLE is a list of lists as returned by `org-table-to-lisp'.
54715471
The leading lines before the first `hline' symbol are considered

lisp/ox-html.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2909,7 +2909,7 @@ Starred and \"displaymath\" environments are not numbered."
29092909

29102910
(defun org-html--unlabel-latex-environment (latex-frag)
29112911
"Change environment in LATEX-FRAG string to an unnumbered one.
2912-
For instance, change an \\='equation\\=' environment to \\='equation*\\='."
2912+
For instance, change an `equation' environment to `equation*'."
29132913
(replace-regexp-in-string
29142914
"\\`[ \t]*\\\\begin{\\([^*]+?\\)}"
29152915
"\\1*"

0 commit comments

Comments
 (0)