From: Rob Browning <rlb@defaultvalue.org>
Date: Sun, 7 Apr 2013 20:03:05 +0000 (-0500)
Subject: Prefer /usr/share/info/emacs/
X-Git-Tag: archive/raspbian/1%26.1+1-3+rpi1~1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=95882d9f0c3501a498b24b21c93b0755337fa938;p=emacs.git

Prefer /usr/share/info/emacs/

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

The value of Info-default-directory-list has been augmented via
lisp/info.el to include /usr/share/info/emacs before /usr/share/info.

Gbp-Pq: Name 0001-Prefer-usr-share-info-emacs.patch
---

diff --git a/lisp/info.el b/lisp/info.el
index 40b2f90ebd6..0cd9c480a67 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -218,7 +218,8 @@ A header-line does not scroll with the rest of the buffer."
 	      (nconc standard-info-dirs (list config-dir))
 	    (cons config-dir standard-info-dirs))))
     (if (not (eq system-type 'windows-nt))
-	dirs
+        ;; Debian: add flavor info directory in front
+        (cons "/usr/share/info/emacs" dirs)
       ;; Include the info directory near where Emacs executable was installed.
       (let* ((instdir (file-name-directory invocation-directory))
 	     (dir1 (expand-file-name "../info/" instdir))