From eab65c9cf89eac1c09316230ffaf21e5a8d2af39 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Apr 2018 02:17:44 +0200 Subject: [PATCH] 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. --- lisp/org-colview.el | 2 +- lisp/org-compat.el | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index 65d6c540a..cf631482c 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 f6dd12801..c43160ae1 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -61,6 +61,13 @@ (defvar org-table-tab-recognizes-table.el) (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