Browse Source

Backport commit b0f20651e from Emacs

; Spelling fixes
b0f20651e3cbb8a66f11ffae4c18634019c20cd4
Paul Eggert
Tue Dec 10 20:05:49 2019 -0800
Paul Eggert 5 years ago
parent
commit
f9a55cba31
4 changed files with 7 additions and 7 deletions
  1. 2 2
      doc/org-manual.org
  2. 1 1
      etc/ORG-NEWS
  3. 2 2
      lisp/org-attach.el
  4. 2 2
      lisp/org.el

+ 2 - 2
doc/org-manual.org

@@ -7977,7 +7977,7 @@ mentioning.
 
 
   Inheritance works the same way for both =ID= and =DIR= property.  If
   Inheritance works the same way for both =ID= and =DIR= property.  If
   both properties are defined on the same headline then =DIR= takes
   both properties are defined on the same headline then =DIR= takes
-  precedance.  This is also true if inheritance is enabled.  If =DIR=
+  precedence.  This is also true if inheritance is enabled.  If =DIR=
   is inherited from a parent node in the outline, that property still
   is inherited from a parent node in the outline, that property still
   takes precedence over an =ID= property defined on the node itself.
   takes precedence over an =ID= property defined on the node itself.
 
 
@@ -20090,7 +20090,7 @@ Before updating a dynamic block, Org removes content between the
 previous content of the dynamic block becomes erased from the buffer
 previous content of the dynamic block becomes erased from the buffer
 and appended to the plist under ~:content~.
 and appended to the plist under ~:content~.
 
 
-The syntax for naming a writer function with a dynamic block labelled
+The syntax for naming a writer function with a dynamic block labeled
 =myblock= is: ~org-dblock-write:myblock~.
 =myblock= is: ~org-dblock-write:myblock~.
 
 
 The following is an example of a dynamic block and a block writer function
 The following is an example of a dynamic block and a block writer function

+ 1 - 1
etc/ORG-NEWS

@@ -311,7 +311,7 @@ matches the same structures than 'latex but it calls
 org-src-font-lock-fontify-block instead, thus bringing about full
 org-src-font-lock-fontify-block instead, thus bringing about full
 LaTeX font locking.
 LaTeX font locking.
 
 
-*** ~org-clone-subtree-with-time-shift~ learnt to shift backward in time
+*** ~org-clone-subtree-with-time-shift~ learned to shift backward in time
 
 
 =<C-c C-x c>= (~org-clone-subtree-with-time-shift~) now takes a
 =<C-c C-x c>= (~org-clone-subtree-with-time-shift~) now takes a
 negative value as a valid repeater to shift time stamps in backward
 negative value as a valid repeater to shift time stamps in backward

+ 2 - 2
lisp/org-attach.el

@@ -187,7 +187,7 @@ attachment folders based on ID."
   "Hook that is invoked by `org-attach-open'.
   "Hook that is invoked by `org-attach-open'.
 
 
 Created mostly to be compatible with org-attach-git after removing
 Created mostly to be compatible with org-attach-git after removing
-git-funtionality from this file.")
+git-functionality from this file.")
 
 
 (defcustom org-attach-commands
 (defcustom org-attach-commands
   '(((?a ?\C-a) org-attach-attach
   '(((?a ?\C-a) org-attach-attach
@@ -231,7 +231,7 @@ directory in dired and delete from there.\n")
 Each entry in this list is a list of three elements:
 Each entry in this list is a list of three elements:
 - A list of keys (characters) to select the command (the fist
 - A list of keys (characters) to select the command (the fist
   character in the list is shown in the attachment dispatcher's
   character in the list is shown in the attachment dispatcher's
-  splash buffer and minubuffer prompt).
+  splash buffer and minibuffer prompt).
 - A command that is called interactively when one of these keys
 - A command that is called interactively when one of these keys
   is pressed.
   is pressed.
 - A docstring for this command in the attachment dispatcher's
 - A docstring for this command in the attachment dispatcher's

+ 2 - 2
lisp/org.el

@@ -9855,9 +9855,9 @@ Elements of length one have a tab appended.  Elements of length
 two are kept as is.  Longer elements are truncated to length two.
 two are kept as is.  Longer elements are truncated to length two.
 
 
 If an element cannot be made unique, an error is raised."
 If an element cannot be made unique, an error is raised."
-  (let ((orderd-keys (cl-sort (copy-sequence keys) #'< :key #'length))
+  (let ((ordered-keys (cl-sort (copy-sequence keys) #'< :key #'length))
 	menu-keys)
 	menu-keys)
-    (dolist (key orderd-keys)
+    (dolist (key ordered-keys)
       (let ((potential-key
       (let ((potential-key
 	     (cl-case (length key)
 	     (cl-case (length key)
 	       (1 (concat key "\t"))
 	       (1 (concat key "\t"))