diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-07-26 16:55:59 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-07-26 16:55:59 -0400 |
| commit | 0f09808e522cd3de6bd9ea1350beed1feddfbda9 (patch) | |
| tree | 6831e3a40ff70ab0091cd691bbcdc37d14153d6e /src/minibuf.c | |
| parent | 0dc5a85a1c3772a6e78f077719d82f437f626b1e (diff) | |
| download | emacs-0f09808e522cd3de6bd9ea1350beed1feddfbda9.tar.gz | |
Adjust remaining uses of `NILP (HASH_HASH)`.
* src/json.c (lisp_to_json_toplevel_1):
* src/pdumper.c (dump_hash_table_stable_p, hash_table_contents):
* src/print.c (print, print_vectorlike):
* src/minibuf.c (Ftry_completion, Fall_completions, Ftest_completion):
Use `EQ (HASH_KEY, Qunbound)` instead of `NILP (HASH_HASH)`.
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 8920f37827d..14a0dbe762c 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1245,7 +1245,7 @@ is used to further constrain the set of candidates. */) else /* if (type == hash_table) */ { while (idx < HASH_TABLE_SIZE (XHASH_TABLE (collection)) - && NILP (HASH_HASH (XHASH_TABLE (collection), idx))) + && EQ (HASH_KEY (XHASH_TABLE (collection), idx), Qunbound)) idx++; if (idx >= HASH_TABLE_SIZE (XHASH_TABLE (collection))) break; @@ -1497,7 +1497,7 @@ with a space are ignored unless STRING itself starts with a space. */) else /* if (type == 3) */ { while (idx < HASH_TABLE_SIZE (XHASH_TABLE (collection)) - && NILP (HASH_HASH (XHASH_TABLE (collection), idx))) + && EQ (HASH_KEY (XHASH_TABLE (collection), idx), Qunbound)) idx++; if (idx >= HASH_TABLE_SIZE (XHASH_TABLE (collection))) break; @@ -1724,8 +1724,8 @@ the values STRING, PREDICATE and `lambda'. */) else for (i = 0; i < HASH_TABLE_SIZE (h); ++i) { - if (NILP (HASH_HASH (h, i))) continue; tem = HASH_KEY (h, i); + if (EQ (tem, Qunbound)) continue; Lisp_Object strkey = (SYMBOLP (tem) ? Fsymbol_name (tem) : tem); if (!STRINGP (strkey)) continue; if (EQ (Fcompare_strings (string, Qnil, Qnil, |