*** empty log message ***

2 files changed, 52 insertions, 13 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ca8d73dd13..9c9b04e4402 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,16 +1,45 @@
+2000-07-30  Gerd Moellmann  <gerd@gnu.org>
+
+        * eshell/esh-groups.el: Change custom :link file names
+        from `eshell.info' to `eshell'.
+
+2000-07-30  Francis Wright  <fjw@maths.qmw.ac.uk>
+
+        * dired.el (dired-build-subdir-alist): Expand subdirectory names
+        correctly in recursive ange-ftp listings.
+
+2000-07-30  Vinicius Jose Latorre  <vinicius@cpqd.com.br>
+
+        * ps-print.el: Fix bug 1: if ps-font-size-internal,
+        ps-header-font-size-internal and
+        ps-header-title-font-size-internal variables are not set,
+        ps-nb-pages and ps-line-lengths-internal crashes.  Fix bug 2: if
+        face text property is (foreground-color . COLOR) or
+        `(background-color . COLOR)', ps-print crashes.  Doc fix.
+        (ps-print-version): New version number (5.2.4).
+        (ps-plot-region): Code fix.
+        (ps-nb-pages, ps-line-lengths-internal): Bug fix 1.
+        (ps-face-attribute-list, ps-face-attributes, ps-face-background):
+        Bug fix 2.
+
+2000-07-30  Milan Zamazal  <pdm@freesoft.cz>
+
+        * glasses.el (glasses-make-readable): Fix uncapitalization of
+        identifiers like `myXMLDocument'.
+
 2000-07-28  Karl Fogel  <kfogel@red-bean.com>
 
-        * mail/mail-hist.el (mail-hist-previous-input,
-        mail-hist-next-input): do the obvious code factorization.
-        (mail-hist-retrieve-and-insert): new func, contains common
+        * mail/mail-hist.el (mail-hist-previous-input)
+        (mail-hist-next-input): Do the obvious code factorization.
+        (mail-hist-retrieve-and-insert): New func, contains common
         code of above two.
         If inserting a message body, leave point at top.
 
 2000-07-28  Sam Steingold  <sds@gnu.org>
 
         * net/ange-ftp.el (ange-ftp-verify-visited-file-modtime):
-        use `<=', not `<' to compare times!
-        (ange-ftp-ls): remve
+        Use `<=', not `<' to compare times!
+        (ange-ftp-ls): Remove.
 
 2000-07-27  Gerd Moellmann  <gerd@gnu.org>
 
diff --git a/lispref/hash.texi b/lispref/hash.texi
index e20b67b430a..3f4e4380be6 100644
--- a/lispref/hash.texi
+++ b/lispref/hash.texi
@@ -95,16 +95,26 @@ The weakness of a hash table specifies whether the presence of a key or
 value in the hash table preserves it from garbage collection.
 
 The value, @var{weak}, must be one of @code{nil}, @code{key},
-@code{value} or @code{t}.  If @var{weak} is @code{key} or @code{t}, then
-the hash table does not prevent its keys from being collected as garbage
-(if they are not referenced anywhere else); if a particular key does get
-collected, the corresponding association is removed from the hash table.
-
-Likewise, if @var{weak} is @code{value} or @code{t}, then the hash table
-does not prevent values from being collected as garbage (if they are not
-referenced anywhere else); if a particular value does get collected, the
+@code{value}, @code{key-or-value}, @code{key-and-value}, or @code{t}
+which is an alias for @code{key-and-value}.  If @var{weak} is @code{key}
+then the hash table does not prevent its keys from being collected as
+garbage (if they are not referenced anywhere else); if a particular key
+does get collected, the corresponding association is removed from the
+hash table.
+
+If @var{weak} is @code{value}, then the hash table does not prevent
+values from being collected as garbage (if they are not referenced
+anywhere else); if a particular value does get collected, the
 corresponding association is removed from the hash table.
 
+If @var{weak} is @code{key-or-value}, associations are removed from the
+hash table when either their key or their value part would be collected
+as garbage, not counting references to the key and value from weak hash
+tables.  Likewise, if @var{weak} is @code{key-and-value}, associations
+are removed from the hash table when both their key and value would be
+collected as garbage, again not considering references to the key and
+value from weak hash tables.
+
 The default for @var{weak} is @code{nil}, so that all keys and values
 referenced in the hash table are preserved from garbage collection.  If
 @var{weak} is @code{t}, neither keys nor values are protected (that is,