From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 30 May 2000 20:41:05 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~3620
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=79148ea7e87fc7db6992c79961e307a491a28727;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2c83bb2046..4583b6ba454 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2000-05-30  Gerd Moellmann  <gerd@gnu.org>
 
+	* progmodes/perl-mode.el (perl-indent-line): When looking for a
+	label, ensure that the first colon isn't followed by another.
+
+	* paths.el (Info-default-directory-list): Doc fix.
+
 	* net/net-utils.el (finger-X.500-host-regexps): New user-option.
 	(finger): If HOST matches a regexp from finger-X.500-host-regexps,
 	send a query containing USER only, not USER@HOST.
diff --git a/man/ChangeLog b/man/ChangeLog
index 3c052888b23..45850586f46 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-30  Gerd Moellmann  <gerd@gnu.org>
+
+	* info.texi: Clarify description of Info-directory-list,
+	add description of Info-additional-directory-list.
+
 2000-05-25  Gerd Moellmann  <gerd@gnu.org>
 
 	* eudc.texi: Fix @direntry, add @dircategory.
diff --git a/man/info.texi b/man/info.texi
index 30997676f1a..9d02e72ec35 100644
--- a/man/info.texi
+++ b/man/info.texi
@@ -938,11 +938,19 @@ selected.
 
 @item Info-directory-list
 The list of directories to search for Info files.  Each element is a
-string (directory name) or @code{nil} (try default directory).
+string (directory name) or @code{nil} (try default directory).  If not
+initialized Info uses the environment variable @env{INFOPATH} to
+initialize it, or @code{Info-default-directory-list} if there is no
+@env{INFOPATH} variable in the environment.
+
+@item Info-additional-directory-list
+A list of additional directories to search for Info documentation files.
+These directories are not searched for merging the @file{dir} file.
 
 @item Info-directory
 The standard directory for Info documentation files.  Only used when the
 function @code{Info-directory} is called.
+
 @end table
 
 @node Create an Info File,  , Advanced Info, Top