(mark-fortran-subprogram): Activate mark

[gnu-emacs] / lisp / paths.el

diff --git a/lisp/paths.el b/lisp/paths.el
index 76c56765d812e46812751260a007ae219a08abe8..9e804e1fa110977d16a22aa3be64d73361d86e21 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -1,6 +1,6 @@
 ;;; paths.el --- define pathnames for use by various Emacs commands.
 
-;; Copyright (C) 1986, 1988, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1988, 1994, 1999 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -43,12 +43,17 @@
                      "/usr/local/info/"))
         ;; Typically on a GNU system, installed info files are found
         ;; in /usr/info, but the default prefix is /usr/local.
+        ;; (Standalone info has a long list of alternative
+        ;; directories to search; perhaps we should try to be more
+        ;; consistent.)
         (usrdir "/usr/info")
         (sysdir (and (file-directory-p usrdir)
                      (not (string= configure-info-directory usrdir))
                      (list usrdir)))
         (configdir (file-name-as-directory configure-info-directory)))
-    (setq start (nconc sysdir start (list configdir)))
+    ;; configdir comes last so that we can identify it as such, but we
+    ;; also we override sysdir, hence the two occurrences.
+    (setq start (nconc start (list configdir) sysdir (list configdir)))
     start)
   "Default list of directories to search for Info documentation files.
 They are searched in the order they are given in the list.