[elpa] externals/org d93df21835: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit d93df218352063f738e5388cde494f17c56502b9
Merge: 751de02127 47d1299e48
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'bugfix'
---
 lisp/ob-clojure.el  | 4 ++--
 lisp/org-persist.el | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index b424cf48ff..b045b4e6e5 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -248,8 +248,8 @@ or set the `:backend' header argument"))))
                                "value")))
                result0)))
       (ob-clojure-string-or-list
-       ;; Filter out s-expressions that return `nil' (string "nil"
-       ;; from nrepl eval) or comment forms (actual `nil' from nrepl)
+       ;; Filter out s-expressions that return nil (string "nil"
+       ;; from nrepl eval) or comment forms (actual nil from nrepl)
        (reverse (delete "" (mapcar (lambda (r)
                                     (replace-regexp-in-string "nil" "" (or r 
"")))
                                   result0)))))))
diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index 0c19d91254..545cf3957a 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -134,7 +134,7 @@
 ;; from the persistent storage at the end of Emacs session.  The
 ;; expiry condition can be set when saving/registering data
 ;; containers.  The expirty condition can be `never' - data will never
-;; expire; `nil' - data will expire at the end of current Emacs session;
+;; expire; nil - data will expire at the end of current Emacs session;
 ;; a number - data will expire after the number days from last access;
 ;; a function - data will expire if the function, called with a single
 ;; argument - collection, returns non-nil.