Browse Source

Merge branch 'maint'

Bastien Guerry 4 years ago
parent
commit
72b8a86d9c
3 changed files with 4 additions and 4 deletions
  1. 1 1
      lisp/org-list.el
  2. 2 2
      lisp/org.el
  3. 1 1
      lisp/ox.el

+ 1 - 1
lisp/org-list.el

@@ -1213,7 +1213,7 @@ some heuristics to guess the result."
        ;; When `org-blank-before-new-entry' says so, it is 1.
        ((eq insert-blank-p t) 1)
        ;; `plain-list-item' is 'auto.  Count blank lines separating
-       ;; neighbours items in list.
+       ;; neighbors' items in list.
        (t (let ((next-p (org-list-get-next-item item struct prevs)))
 	    (cond
 	     ;; Is there a next item?

+ 2 - 2
lisp/org.el

@@ -9692,8 +9692,8 @@ active region."
 	 (message "Stored: %s" (or desc link))
 	 (when custom-id
 	   (setq link (concat "file:" (abbreviate-file-name
-				       (buffer-file-name)) "::#" custom-id))
-	   (push (list link desc) org-stored-links)))))))
+				       (buffer-file-name)) "::#" custom-id)))
+	 (push (list link desc) org-stored-links))))))
 
 (defun org-store-link-props (&rest plist)
   "Store link properties, extract names and addresses."

+ 1 - 1
lisp/ox.el

@@ -5200,7 +5200,7 @@ Return the new string."
 ;;;; Topology
 ;;
 ;; Here are various functions to retrieve information about the
-;; neighbourhood of a given element or object.  Neighbours of interest
+;; neighborhood of a given element or object.  Neighbors of interest
 ;; are direct parent (`org-export-get-parent'), parent headline
 ;; (`org-export-get-parent-headline'), first element containing an
 ;; object, (`org-export-get-parent-element'), parent table