From 9305b41ceb4edf2c6c5ccacd90f497b29a0cc7c6 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Sun, 12 Jan 2014 09:54:21 +0100
Subject: [PATCH 1/2] Backport typo fixes from Emacs revno 115988

---
 lisp/org-list.el | 2 +-
 lisp/ox.el       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org-list.el b/lisp/org-list.el
index 69ad4da60..d24dad283 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -1223,7 +1223,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/ox.el b/lisp/ox.el
index fcf6aab20..0102523b5 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -5093,7 +5093,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

From 035087777d0b4d91373466ed1a56f357c63f5465 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Sun, 12 Jan 2014 09:56:41 +0100
Subject: [PATCH 2/2] org.el (org-store-link): When a link has been stored,
 always returns it

* org.el (org-store-link): When a link has been stored, always
returns it.

(Storing links from the agenda are broken otherwise.)
---
 lisp/org.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index a11baddbf..7c1b291f3 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9608,8 +9608,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."