From 9ac80ede5e4aa128fcd79dfdbec141b89b006c75 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 4 Mar 2018 17:09:52 -0800 Subject: [PATCH] Backport commit f2caf08ca from Emacs ; Spelling fixes f2caf08ca625f64c7eeea8dfa8f65a5b1bac58e2 Paul Eggert Sun Mar 4 17:10:34 2018 -0800 --- doc/org.texi | 2 +- etc/ORG-NEWS | 12 ++++++------ lisp/org-element.el | 2 +- lisp/org.el | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index 3a2fbc24e..0f51c104e 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -10226,7 +10226,7 @@ for display purposes only. @cindex dash, special symbol @cindex ellipsis, special symbol In addition to regular entities defined above, Org exports in a special -way@footnote{This behaviour can be disabled with @code{-} export setting +way@footnote{This behavior can be disabled with @code{-} export setting (@pxref{Export settings}).} the following commonly used character combinations: @samp{\-} is treated as a shy hyphen, @samp{--} and @samp{---} are converted into dashes, and @samp{...} becomes a compact set of dots. diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 228ebd903..013c7b139 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -1358,7 +1358,7 @@ don't have to be distinct on a heading. Grouptags had to previously be defined with { }. This syntax is already used for exclusive tags and Grouptags need their own, -non-exclusive syntax. This behaviour is achieved with [ ]. Note: { } +non-exclusive syntax. This behavior is achieved with [ ]. Note: { } can still be used also for Grouptags but then only one of the given tags can be used on the headline at the same time. Example: @@ -1422,9 +1422,9 @@ Check the documentation for more details. Thanks to Jarmo Hurri for this feature. -*** New behaviour for ~org-toggle-latex-fragment~ +*** New behavior for ~org-toggle-latex-fragment~ -The new behaviour is the following: +The new behavior is the following: - With a double prefix argument or with a single prefix argument when point is before the first headline, toggle overlays in the whole @@ -1623,10 +1623,10 @@ leading spaces within table cells. Org uses the MathJax CDN by default. See the manual and the docstring of ~org-html-mathjax-options~ for details. -*** New behaviour in `org-export-options-alist' +*** New behavior in `org-export-options-alist' When defining a back-end, it is now possible to specify to give -`parse' behaviour on a keyword. It is equivalent to call +`parse' behavior on a keyword. It is equivalent to call `org-element-parse-secondary-string' on the value. However, parsed =KEYWORD= is automatically associated to an @@ -1745,7 +1745,7 @@ everywhere in the buffer, possibly corrupting URLs. *** Removed option =org-babel-sh-command= This undocumented option defaulted to the value of =shell-file-name= at -the time of loading =ob-shell=. The new behaviour is to use the value +the time of loading =ob-shell=. The new behavior is to use the value of =shell-file-name= directly when the shell langage is =shell=. To chose a different shell, either customize =shell-file-name= or bind this variable locally. diff --git a/lisp/org-element.el b/lisp/org-element.el index c39195aa9..d9c6522e2 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -4721,7 +4721,7 @@ indentation removed from its contents." ;; Cache is enabled by default, but can be disabled globally with ;; `org-element-use-cache'. `org-element-cache-sync-idle-time', ;; org-element-cache-sync-duration' and `org-element-cache-sync-break' -;; can be tweaked to control caching behaviour. +;; can be tweaked to control caching behavior. ;; ;; Internally, parsed elements are stored in an AVL tree, ;; `org-element--cache'. This tree is updated lazily: whenever diff --git a/lisp/org.el b/lisp/org.el index b1d369c70..34bf07738 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -10645,7 +10645,7 @@ a timestamp or a link." (save-excursion ;; Do not validate action when point is on the ;; spaces right after the footnote label, in - ;; order to be on par with behaviour on links. + ;; order to be on par with behavior on links. (skip-chars-forward " \t") (let ((begin (org-element-property :contents-begin context))) @@ -10798,7 +10798,7 @@ there is one, return it." (cons link end))))) ;; TODO: These functions are deprecated since `org-open-at-point' -;; hard-codes behaviour for "file+emacs" and "file+sys" types. +;; hard-codes behavior for "file+emacs" and "file+sys" types. (defun org-open-file-with-system (path) "Open file at PATH using the system way of opening it." (org-open-file path 'system))