diff options
| author | Nicolas Petton | 2017-07-07 21:21:55 +0200 |
|---|---|---|
| committer | Nicolas Petton | 2017-07-11 10:07:16 +0200 |
| commit | 0bece6c6815cc59e181817a2765a4ea752f34f56 (patch) | |
| tree | 856363b2defed20c97a25c29a7739bce9a6bd9cb /src/w32notify.c | |
| parent | 689c5c20d1174e95be50e674d05632545eb4b9c5 (diff) | |
| download | emacs-0bece6c6815cc59e181817a2765a4ea752f34f56.tar.gz emacs-0bece6c6815cc59e181817a2765a4ea752f34f56.zip | |
Add an optional testfn parameter to assoc
* src/fns.c (assoc): New optional testfn parameter used for comparison
when provided.
* test/src/fns-tests.el (test-assoc-testfn): Add tests for the new
'testfn' parameter.
* src/buffer.c:
* src/coding.c:
* src/dbusbind.c:
* src/font.c:
* src/fontset.c:
* src/gfilenotify.c:
* src/image.c:
* src/keymap.c:
* src/process.c:
* src/w32fns.c:
* src/w32font.c:
* src/w32notify.c:
* src/w32term.c:
* src/xdisp.c:
* src/xfont.c: Add a third argument to Fassoc calls.
* etc/NEWS:
* doc/lispref/lists.texi: Document the new 'testfn' parameter.
Diffstat (limited to 'src/w32notify.c')
| -rw-r--r-- | src/w32notify.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32notify.c b/src/w32notify.c index 25205816bae..e8bdef8bdd3 100644 --- a/src/w32notify.c +++ b/src/w32notify.c | |||
| @@ -642,7 +642,7 @@ WATCH-DESCRIPTOR should be an object returned by `w32notify-add-watch'. */) | |||
| 642 | /* Remove the watch object from watch list. Do this before freeing | 642 | /* Remove the watch object from watch list. Do this before freeing |
| 643 | the object, do that even if we fail to free it, watch_list is | 643 | the object, do that even if we fail to free it, watch_list is |
| 644 | kept free of junk. */ | 644 | kept free of junk. */ |
| 645 | watch_object = Fassoc (watch_descriptor, watch_list); | 645 | watch_object = Fassoc (watch_descriptor, watch_list, Qnil); |
| 646 | if (!NILP (watch_object)) | 646 | if (!NILP (watch_object)) |
| 647 | { | 647 | { |
| 648 | watch_list = Fdelete (watch_object, watch_list); | 648 | watch_list = Fdelete (watch_object, watch_list); |
| @@ -679,7 +679,7 @@ the watcher thread exits abnormally for any other reason. Removing the | |||
| 679 | watch by calling `w32notify-rm-watch' also makes it invalid. */) | 679 | watch by calling `w32notify-rm-watch' also makes it invalid. */) |
| 680 | (Lisp_Object watch_descriptor) | 680 | (Lisp_Object watch_descriptor) |
| 681 | { | 681 | { |
| 682 | Lisp_Object watch_object = Fassoc (watch_descriptor, watch_list); | 682 | Lisp_Object watch_object = Fassoc (watch_descriptor, watch_list, Qnil); |
| 683 | 683 | ||
| 684 | if (!NILP (watch_object)) | 684 | if (!NILP (watch_object)) |
| 685 | { | 685 | { |