From 01474822134d01ac7aa14dad0fb8ca355c5cb9bd Mon Sep 17 00:00:00 2001 From: Jeremy Maitin-Shepard Date: Wed, 16 Apr 2008 21:34:45 -0400 Subject: [PATCH] minibuffer-completion.js: Avoid some minor errors --- modules/minibuffer-completion.js | 6 ++++-- modules/search-engine.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/minibuffer-completion.js b/modules/minibuffer-completion.js index 816c4a5..ed9ce56 100644 --- a/modules/minibuffer-completion.js +++ b/modules/minibuffer-completion.js @@ -267,8 +267,10 @@ function merge_completers(completers) { for(var j=0; j < results.length; j++) { var r = results[j]; if(i < r.count) { - args.unshift(i); - return r[name].apply(this, args); + if (name in r && r[name] != null) { + args.unshift(i); + return r[name].apply(this, args); + } } i -= r.count; } diff --git a/modules/search-engine.js b/modules/search-engine.js index a708578..bb24fb1 100644 --- a/modules/search-engine.js +++ b/modules/search-engine.js @@ -273,7 +273,7 @@ search_engine.prototype.__defineGetter__("completer", function () { data[2] = null; let c = { count: data[1].length, get_string: function (i) String(data[1][i]), - get_description: (data[2] != null) && (function (i) String(data[2][i])), + get_description: (data[2] != null ? (function (i) String(data[2][i])) : null), get_input_state: function (i) [String(data[1][i])] }; yield co_return(c); -- 2.11.4.GIT