summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-12 09:03:17 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-01-12 09:03:17 (GMT)
commit72b8a86d9c25f75c34ff18360c634f908e69e631 (patch)
tree4dd13ef3c490396948760d2c6e6438c2e483c04f
parenta4b1fa7ca1bf63075c29a89f1379a4726313db68 (diff)
parent035087777d0b4d91373466ed1a56f357c63f5465 (diff)
downloadorg-mode-72b8a86d9c25f75c34ff18360c634f908e69e631.zip
org-mode-72b8a86d9c25f75c34ff18360c634f908e69e631.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-list.el2
-rw-r--r--lisp/org.el4
-rw-r--r--lisp/ox.el2
3 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el
index c0cf77e..4b9744f 100644
--- a/lisp/org-list.el
+++ b/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?
diff --git a/lisp/org.el b/lisp/org.el
index 3ab895c..0ed723c 100644
--- a/lisp/org.el
+++ b/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."
diff --git a/lisp/ox.el b/lisp/ox.el
index 591dfe5..d7382ca 100644
--- a/lisp/ox.el
+++ b/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