mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-07-16 21:16:28 +00:00
Merge branch 'bugfix'
This commit is contained in:
commit
d93df21835
|
@ -248,8 +248,8 @@ or set the `:backend' header argument"))))
|
||||||
"value")))
|
"value")))
|
||||||
result0)))
|
result0)))
|
||||||
(ob-clojure-string-or-list
|
(ob-clojure-string-or-list
|
||||||
;; Filter out s-expressions that return `nil' (string "nil"
|
;; Filter out s-expressions that return nil (string "nil"
|
||||||
;; from nrepl eval) or comment forms (actual `nil' from nrepl)
|
;; from nrepl eval) or comment forms (actual nil from nrepl)
|
||||||
(reverse (delete "" (mapcar (lambda (r)
|
(reverse (delete "" (mapcar (lambda (r)
|
||||||
(replace-regexp-in-string "nil" "" (or r "")))
|
(replace-regexp-in-string "nil" "" (or r "")))
|
||||||
result0)))))))
|
result0)))))))
|
||||||
|
|
|
@ -134,7 +134,7 @@
|
||||||
;; from the persistent storage at the end of Emacs session. The
|
;; from the persistent storage at the end of Emacs session. The
|
||||||
;; expiry condition can be set when saving/registering data
|
;; expiry condition can be set when saving/registering data
|
||||||
;; containers. The expirty condition can be `never' - data will never
|
;; 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 number - data will expire after the number days from last access;
|
||||||
;; a function - data will expire if the function, called with a single
|
;; a function - data will expire if the function, called with a single
|
||||||
;; argument - collection, returns non-nil.
|
;; argument - collection, returns non-nil.
|
||||||
|
|
Loading…
Reference in a new issue