branch: externals/org
commit 63155dc518fe213bb7e00a63d8a5f6742517270a
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Remove some Emacs 26 compatibility code
* lisp/ob-exp.el (org-babel-exp-process-buffer):
* lisp/ox.el:
* testing/lisp/test-ob-shell.el: Remove compatibility for old Emacs
26. It is no longer supported.
---
lisp/ob-exp.el | 10 ++--------
lisp/ox.el | 1 -
testing/lisp/test-ob-shell.el | 4 +---
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index e30cf43af8..655fe382a1 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -306,10 +306,7 @@ this template."
;; Do not use tabs for block
;; indentation.
(when (fboundp 'indent-tabs-mode)
- (indent-tabs-mode -1)
- ;; FIXME: Emacs 26
- ;; compatibility.
- (setq-local indent-tabs-mode nil))
+ (indent-tabs-mode -1))
(insert replacement)
(skip-chars-backward " \r\t\n")
(indent-line-to ind)
@@ -321,10 +318,7 @@ this template."
;; Do not use tabs for block
;; indentation.
(when (fboundp 'indent-tabs-mode)
- (indent-tabs-mode -1)
- ;; FIXME: Emacs 26
- ;; compatibility.
- (setq-local indent-tabs-mode nil))
+ (indent-tabs-mode -1))
(insert replacement)
(indent-rigidly
1 (point) ind)
diff --git a/lisp/ox.el b/lisp/ox.el
index 8f7c9bbfa1..686ffee8de 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -4723,7 +4723,6 @@ Return value can be an object or an element:
(org-persist-register location-type path
:write-immediately t))))
-(require 'subr-x) ;; FIXME: For `thread-first' in Emacs 26.
(defun org-export-link-localise (link)
"Convert remote LINK to local link.
If LINK refers to a remote resource, modify it to point to a local
diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index afa7c4fcba..49b2323421 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -382,9 +382,7 @@ echo ${table[spaghetti]}
(expected (concat "ARGS: --verbose 23 71"
"\nhello tramp from " (file-local-name
default-directory))))
(if (should (equal result expected))
- ;; FIXME: Fails with non-local exit on Emacs 26.
- (when (version<= "27" emacs-version)
- (kill-matching-buffers (format "\\*tramp/mock\\s-%s\\*"
(system-name)) t t))))))))
+ (kill-matching-buffers (format "\\*tramp/mock\\s-%s\\*"
(system-name)) t t)))))))
(ert-deftest test-ob-shell/results-table ()
"Test :results table."
