bug#37120: [PATCH] Prefer display-line-numbers over linum in docs and custom

[Stefan Kangas <stefan@marxist.se>]

[-- Attachment #1: Type: text/plain, Size: 545 bytes --]

NEWS.26 says:

'linum-mode' and all similar packages are henceforth becoming obsolete.
Users and developers are encouraged to switch to this new feature
[i.e. display-line-numbers-mode] instead.

This patch updates the FAQ to recommend display-line-numbers-mode over
linum-mode.  It also changes one defcustom in progmodes in the same
way.

WDYT?  And, if it looks good, should it go to the master branch or emacs-26?

Thanks,
Stefan Kangas

PS. I'm not sure if linum.el should also be moved into lisp/obsolete/
or if that's premature for 27.1.

[-- Attachment #2: 0001-Prefer-display-line-numbers-over-linum-in-docs-and-o.patch --]
[-- Type: text/x-patch, Size: 1729 bytes --]

From 5b5d923611f0d3b344d1da93f112a99e58e47d60 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
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