From 5b5d923611f0d3b344d1da93f112a99e58e47d60 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sat, 1 Jun 2019 01:40:11 +0200 Subject: [PATCH] Prefer display-line-numbers over linum in docs and one defcustom * doc/misc/efaq.texi: Replace linum with display-line-numbers-mode. * lisp/progmodes/prog-mode.el (prog-mode-hook): Replace linum-mode with display-line-numbers-mode in :options. --- doc/misc/efaq.texi | 2 +- lisp/progmodes/prog-mode.el | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 8fd3bf3a45..2548673b5b 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -1687,7 +1687,7 @@ Displaying the current line or column this variable. @cindex Set number capability in @code{vi} emulators -The @samp{linum} package (distributed with Emacs since version 23.1) +@samp{display-line-numbers-mode} (added to Emacs in version 26.1) displays line numbers in the left margin, like the ``set number'' capability of @code{vi}. The packages @samp{setnu} and @samp{wb-line-number} (not distributed with Emacs) also implement this diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el index cb39e62265..8d3513bad3 100644 --- a/lisp/progmodes/prog-mode.el +++ b/lisp/progmodes/prog-mode.el @@ -39,7 +39,8 @@ prog-mode (defcustom prog-mode-hook nil "Normal hook run when entering programming modes." :type 'hook - :options '(flyspell-prog-mode abbrev-mode flymake-mode linum-mode + :options '(flyspell-prog-mode abbrev-mode flymake-mode + display-line-numbers-mode prettify-symbols-mode) :group 'prog-mode) -- 2.20.1