summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-12-25 18:07:15 -0800
committerKyle Meyer <kyle@kyleam.com>2015-07-26 23:28:25 -0400
commit72416b82ac9bf0ed9ad60d693c8ffeb8e5c65df1 (patch)
tree7bd2403f403a62e7ae9c24bba4b29f1bd0a90832
parent81272053cd8e694fcf26435f1f0c50eb193d7b26 (diff)
downloadorg-mode-72416b82ac9bf0ed9ad60d693c8ffeb8e5c65df1.tar.gz
Backport commit 7aa506e from Emacs master branch
Spelling fixes 7aa506eed8881788485a9774165454404bac2623 Paul Eggert Thu Dec 25 18:08:47 2014 -0800
-rw-r--r--lisp/org-ctags.el8
-rw-r--r--lisp/ox-html.el2
-rw-r--r--lisp/ox-latex.el2
-rw-r--r--lisp/ox-publish.el2
-rw-r--r--lisp/ox.el6
5 files changed, 10 insertions, 10 deletions
diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el
index 41775bd..faf543b 100644
--- a/lisp/org-ctags.el
+++ b/lisp/org-ctags.el
@@ -63,19 +63,19 @@
;; with the same name as the link; then, if unsuccessful, ask the user if
;; he/she wants to rebuild the 'TAGS' database and try again; then ask if
;; the user wishes to append 'tag' as a new toplevel heading at the end of
-;; the buffer; and finally, defer to org's default behaviour which is to
+;; the buffer; and finally, defer to org's default behavior which is to
;; search the entire text of the current buffer for 'tag'.
;;
-;; This behaviour can be modified by changing the value of
+;; This behavior can be modified by changing the value of
;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my
-;; .emacs, which describes the same behaviour as the above paragraph with
+;; .emacs, which describes the same behavior as the above paragraph with
;; one difference:
;;
;; (setq org-ctags-open-link-functions
;; '(org-ctags-find-tag
;; org-ctags-ask-rebuild-tags-file-then-find-tag
;; org-ctags-ask-append-topic
-;; org-ctags-fail-silently)) ; <-- prevents org default behaviour
+;; org-ctags-fail-silently)) ; <-- prevents org default behavior
;;
;;
;; Usage
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index b6a3a7e..014a6e7 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -581,7 +581,7 @@ The function must accept two parameters:
The function should return the string to be exported.
For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
The default value simply returns the value of CONTENTS."
:group 'org-export-html
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 2c71f7d..f6f3b22 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -589,7 +589,7 @@ The function must accept six parameters:
The function should return the string to be exported.
For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
\(defun org-latex-format-inlinetask \(todo type priority name tags contents\)
\"Format an inline task element for LaTeX export.\"
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index 180764e..771aa00 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -228,7 +228,7 @@ If you create a site-map file, adjust the sorting like this:
`:sitemap-sort-files'
The site map is normally sorted alphabetically. You can
- change this behaviour setting this to `anti-chronologically',
+ change this behavior setting this to `anti-chronologically',
`chronologically', or nil.
`:sitemap-ignore-case'
diff --git a/lisp/ox.el b/lisp/ox.el
index 72cf400..56d0a9f 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -493,7 +493,7 @@ t Allow export of math snippets."
"The last level which is still exported as a headline.
Inferior levels will usually produce itemize or enumerate lists
-when exported, but back-end behaviour may differ.
+when exported, but back-end behavior may differ.
This option can also be set with the OPTIONS keyword,
e.g. \"H:2\"."
@@ -1736,13 +1736,13 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored."
(t
;; Options in `org-export-options-alist'.
(dolist (property (funcall find-properties key))
- (let ((behaviour (nth 4 (assq property options))))
+ (let ((behavior (nth 4 (assq property options))))
(setq plist
(plist-put
plist property
;; Handle value depending on specified
;; BEHAVIOR.
- (case behaviour
+ (case behavior
(space
(if (not (plist-get plist property))
(org-trim val)