aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier2018-03-23 11:01:31 -0400
committerStefan Monnier2018-03-23 11:01:31 -0400
commit6695c1be51bd8a1e208ae02505b2a6fa64c85e68 (patch)
tree5b98a40ea7c74b7e9c24d1187c9ed6f332e5b2f2 /lisp
parent8e5ab342aac11ccc54fdcdc9593e989b562f7ae7 (diff)
parentb8ebf5fb64dbf261315bfdb281a8b0a119e7cc2b (diff)
downloademacs-6695c1be51bd8a1e208ae02505b2a6fa64c85e68.tar.gz
emacs-6695c1be51bd8a1e208ae02505b2a6fa64c85e68.zip
Merge from origin/emacs-26
b8ebf5fb64 * src/lisp.h (struct Lisp_Buffer_Local_Value): Update comm... 8c92a37cb4 * doc/emacs/trouble.texi: Fix location of `emacs-version' ... 10b1f2fdd5 Explain more about (defvar foo) form (Bug#18059) 68c2f336b1 * doc/lispref/buffers.texi (Buffer List): Fix grammar. 7e720c6851 * doc/lispref/anti.texi (Antinews): Fix grammar. a6a821d29b * lisp/org/ob-lisp.el (org-babel-lisp-eval-fn): Tweak type.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/org/ob-lisp.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index c156ca34a7c..d4a7c37133d 100644
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -54,7 +54,7 @@ Valid values include `slime-eval' and `sly-eval'."
54 :group 'org-babel 54 :group 'org-babel
55 :version "26.1" 55 :version "26.1"
56 :package-version '(Org . "9.0") 56 :package-version '(Org . "9.0")
57 :type 'function) 57 :type 'symbol)
58 58
59(defcustom org-babel-lisp-dir-fmt 59(defcustom org-babel-lisp-dir-fmt
60 "(let ((*default-pathname-defaults* #P%S\n)) %%s\n)" 60 "(let ((*default-pathname-defaults* #P%S\n)) %%s\n)"