Merge from origin/emacs-25

[gnu-emacs] / lisp / info.el

diff --git a/lisp/info.el b/lisp/info.el
index ae46fba25b965dba4c0a35014dde2f1849be694b..bb259bd59eb345b814678abf059268db8ca63327 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -81,28 +81,24 @@ The Lisp code is executed when the node is selected.")
     (t :height 1.2 :inherit info-title-2))
   "Face for info titles at level 1."
   :group 'info)
-(define-obsolete-face-alias 'Info-title-1-face 'info-title-1 "22.1")
 
 (defface info-title-2
   '((((type tty pc) (class color)) :foreground "lightblue" :weight bold)
     (t :height 1.2 :inherit info-title-3))
   "Face for info titles at level 2."
   :group 'info)
-(define-obsolete-face-alias 'Info-title-2-face 'info-title-2 "22.1")
 
 (defface info-title-3
   '((((type tty pc) (class color)) :weight bold)
     (t :height 1.2 :inherit info-title-4))
   "Face for info titles at level 3."
   :group 'info)
-(define-obsolete-face-alias 'Info-title-3-face 'info-title-3 "22.1")
 
 (defface info-title-4
   '((((type tty pc) (class color)) :weight bold)
     (t :weight bold :inherit variable-pitch))
   "Face for info titles at level 4."
   :group 'info)
-(define-obsolete-face-alias 'Info-title-4-face 'info-title-4 "22.1")
 
 (defface info-menu-header
   '((((type tty pc))
@@ -119,7 +115,6 @@ The Lisp code is executed when the node is selected.")
     (t :underline t))
   "Face for every third `*' in an Info menu."
   :group 'info)
-(define-obsolete-face-alias 'info-menu-5 'info-menu-star "22.1")
 
 (defface info-xref
   '((t :inherit link))
@@ -189,15 +184,11 @@ A header-line does not scroll with the rest of the buffer."
               configure-info-directory)))
         (prefixes
          ;; Directory trees in which to look for info subdirectories
-         (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/")))
+         (prune-directory-list '("/usr/local/" "/usr/" "/opt/")))
         (suffixes
          ;; Subdirectories in each directory tree that may contain info
-         ;; directories.  Most of these are rather outdated.
-         ;; It ought to be fine to stop checking the "emacs" ones now,
-         ;; since this is Emacs and we have not installed info files
-         ;; into such directories for a looong time...
-         '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/"
-           "emacs/" "lib/" "lib/emacs/"))
+         ;; directories.
+         '("share/" ""))
         (standard-info-dirs
          (apply #'nconc
                 (mapcar (lambda (pfx)