Mercurial > emacs
changeset 30502:0dca3aa6405a
*** empty log message ***
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 27 Jul 2000 13:28:26 +0000 |
| parents | 2c2ed2dae36f |
| children | fef49230e1aa |
| files | etc/NEWS lisp/ChangeLog lispref/variables.texi src/ChangeLog |
| diffstat | 4 files changed, 23 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Thu Jul 27 13:13:23 2000 +0000 +++ b/etc/NEWS Thu Jul 27 13:28:26 2000 +0000 @@ -1322,6 +1322,9 @@ * 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 @@ :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
--- a/lisp/ChangeLog Thu Jul 27 13:13:23 2000 +0000 +++ b/lisp/ChangeLog Thu Jul 27 13:28:26 2000 +0000 @@ -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
--- a/lispref/variables.texi Thu Jul 27 13:13:23 2000 +0000 +++ b/lispref/variables.texi Thu Jul 27 13:28:26 2000 +0000 @@ -659,7 +659,7 @@ @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
--- a/src/ChangeLog Thu Jul 27 13:13:23 2000 +0000 +++ b/src/ChangeLog Thu Jul 27 13:28:26 2000 +0000 @@ -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.