*** empty log message ***

4 files changed, 23 insertions, 5 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 9460e17831d..2fc9422d4a6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1322,6 +1322,9 @@ functionality with aliases for the mldrag functions.
 * Lisp changes made after edition 2.6 of the Emacs Lisp Manual,
 (Display-related features are described in a page of their own below.)
 
+** The meaning of the `:weakness WEAK' argument of make-hash-table
+has been changed.
+
 ** Function `aset' stores any multibyte character in any string
 without signaling "Attempt to change char length of a string".  It may
 convert a unibyte string to multibyte if necessary.
@@ -1836,10 +1839,11 @@ hash table.  It is resized when the ratio of (number of entries) /
 
 :weakness WEAK
 
-WEAK must be either nil, one of the symbols `key, `value', or t.
-Entries are removed from weak tables during garbage collection if
-their key and/or value are not referenced elsewhere outside of the
-hash table.  Default are non-weak hash tables.
+WEAK must be either nil, one of the symbols `key, `value',
+`key-or-value', `key-and-value', or t, meaning the same as
+`key-and-value'.  Entries are removed from weak tables during garbage
+collection if their key and/or value are not referenced elsewhere
+outside of the hash table.  Default are non-weak hash tables.
 
 - Function: makehash &optional TEST
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5064d62982..99aec87f600 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-27  Gerd Moellmann  <gerd@gnu.org>
+
+        * play/meese.el: Add Commentary section.
+
 2000-07-27  Kenichi Handa  <handa@etl.go.jp>
 
         * international/mule.el (register-char-codings): New function.
@@ -55,6 +59,7 @@
         interpretation of the return value of compare-strings.
 
 2000-07-26  Gerd Moellmann  <gerd@gnu.org>
+>>>>>>> 1.883
 
         * isearch.el (isearch-resume): New function.
         (isearch-done): Add something to command-history to resume
diff --git a/lispref/variables.texi b/lispref/variables.texi
index 222206561ee..37528cc69af 100644
--- a/lispref/variables.texi
+++ b/lispref/variables.texi
@@ -659,7 +659,7 @@ variable.  Here's a safe way to avoid that:
   @var{docstring})
 (unless my-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key my-mode-map "\C-c\C-a" 'my-command)
+    (define-key map "\C-c\C-a" 'my-command)
     @dots{}
     (setq my-mode-map map)))
 @end example
diff --git a/src/ChangeLog b/src/ChangeLog
index c0ae4d774cf..ecfe6bee27a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2000-07-27  Gerd Moellmann  <gerd@gnu.org>
+
+        * fns.c (Qkey_or_value, Qkey_and_value): New variables.
+        (syms_of_fns): Initialize new variables.
+        (sweep_weak_table): Handle weakness `key-or-value' and
+        `key-and-value'.
+        (Fmake_hash_table): Recognize `key-and-value' and `key-or-value'
+        weakness, with t meaning the same as `key-and-value'.
+
 2000-07-27  Kenichi Handa  <handa@etl.go.jp>
 
         * coding.h (struct coding_system): Member safe_charset deleted.