File: 0001-Prefer-usr-share-info-emacs-MAJORVERSION.patch

package info (click to toggle)
emacs25 25.1%2B1-4%2Bdeb9u1
  • links: PTS
  • area: main
  • in suites: stretch
  • size: 131,428 kB
  • ctags: 97,538
  • sloc: lisp: 1,107,716; ansic: 305,108; objc: 16,577; makefile: 5,931; sh: 2,547; perl: 1,567; yacc: 1,566; cpp: 1,287; xml: 1,110; php: 1,035; pascal: 1,011; python: 831; cs: 770; ada: 725; awk: 640; ruby: 396; erlang: 153; java: 27
file content (28 lines) | stat: -rw-r--r-- 1,145 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
From 06b0e66547c063bc2c178bdd656834c603f77b0f Mon Sep 17 00:00:00 2001
From: Rob Browning <rlb@defaultvalue.org>
Date: Sun, 7 Apr 2013 15:03:05 -0500
Subject: Prefer /usr/share/info/emacs-MAJORVERSION

Emacs prefers /usr/share/info/emacs-MAJORVERSION to /usr/share/info.

The value of Info-default-directory-list has been augmented via
lisp/info.el to include /usr/share/info/emacs-MAJORVERSION before
/usr/share/info.
---
 lisp/info.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/info.el b/lisp/info.el
index 6426cfcf9ed..d8a7f72e5dc 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -218,7 +218,8 @@ Info-default-directory-list
 	      (nconc standard-info-dirs (list config-dir))
 	    (cons config-dir standard-info-dirs))))
     (if (not (eq system-type 'windows-nt))
-	dirs
+        ;; Debian: add per-flavor info directory in front.
+        (cons (format "/usr/share/info/emacs-%d" emacs-major-version) dirs)
       ;; Include the info directory near where Emacs executable was installed.
       (let* ((instdir (file-name-directory invocation-directory))
 	     (dir1 (expand-file-name "../info/" instdir))