From 2b897a5bbf0c3147d2c9dfef7ae406e6fc1c8627 Mon Sep 17 00:00:00 2001
From: Nelson Elhage <nelhage@phanatique.(none)>
Date: Mon, 17 Mar 2008 18:25:31 -0400
Subject: [PATCH] Make merge_completers handle the case where the completers
 may return null

---
 modules/minibuffer-completion.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/minibuffer-completion.js b/modules/minibuffer-completion.js
index c3908c5..b9ebe98 100644
--- a/modules/minibuffer-completion.js
+++ b/modules/minibuffer-completion.js
@@ -251,9 +251,11 @@ function merge_completers(completers) {
         var count = 0;
         var results = completers.map(function(c) {
                 var r = c(input, pos, conservative);
-                count += r.count;
+                if(r != null) {
+                        count += r.count;
+                }
                 return r;
-            });
+        });
 
         function forward(name) {
             return function() {
@@ -261,6 +263,7 @@ function merge_completers(completers) {
                 var i = args.shift();
                 for(var j=0; j < results.length; j++) {
                     var r = results[j];
+                    if(r == null) continue;
                     if(i < r.count) {
                         args.unshift(i);
                         return r[name].apply(this, args);
-- 
2.11.4.GIT