summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-04-28 02:17:44 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-04-28 02:17:44 +0200
commiteab65c9cf89eac1c09316230ffaf21e5a8d2af39 (patch)
tree8804d4c25cb3a85650e5f72e298cdc02fdcd78e0
parent031f3623524482e52192f21a2dec445bd038a66d (diff)
downloadorg-mode-eab65c9cf89eac1c09316230ffaf21e5a8d2af39.tar.gz
Fix colview-related failing tests
* lisp/org-compat.el (org-line-number-display-width): New function. * lisp/org-colview.el (org-columns--display-here-title): Use new function.
-rw-r--r--lisp/org-colview.el2
-rw-r--r--lisp/org-compat.el7
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 65d6c54..cf63148 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -448,7 +448,7 @@ for the duration of the command.")
"Overlay the newline before the current line with the table title."
(interactive)
(let ((title "")
- (linum-offset (line-number-display-width 'columns))
+ (linum-offset (org-line-number-display-width 'columns))
(i 0))
(dolist (column org-columns-current-fmt-compiled)
(pcase column
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index f6dd128..c43160a 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -62,6 +62,13 @@
(defvar org-table1-hline-regexp)
+;;; Emacs < 26.1 compatibility
+
+(if (fboundp 'line-number-display-width)
+ (defalias 'org-line-number-display-width 'line-number-display-width)
+ (defun org-line-number-display-width (&rest _) 0))
+
+
;;; Emacs < 25.1 compatibility
(when (< emacs-major-version 25)