<short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

gcl (2.6.14-4) unstable; urgency=medium

  * Version_2_6_15pre3

Gbp-Pq: Name Version_2_6_15pre3

diff --git a/git.tag b/git.tag
index 65e7c4bde9ae4284b6cc99efa813f2a53c3cbd97..2d0fa90a67e52aa2b3d6a85cc520b562f816eb7e 100644 (file)
--- a/git.tag
+++ b/git.tag
@@ -1 +1 @@
-"Version_2_6_15pre2"
+"Version_2_6_15pre3"

diff --git a/o/gcl_readline.d b/o/gcl_readline.d
index 97d450ad30e355bff6e1dbf0bdc7a1856fdae4ac..6f80f487dc627dacb795f6f7bc350d9d3e0a51f4 100644 (file)
--- a/o/gcl_readline.d
+++ b/o/gcl_readline.d
@@ -117,14 +117,14 @@ rl_completion_words(const char *text, int state) {
     wtext=*wtext==':' ? wtext+1 : wtext;
     len=strlen(wtext);
     tp=package;
-    i=0;
     base=internal ? tp->p.p_internal : tp->p.p_external;
     size=internal ? tp->p.p_internal_size : tp->p.p_external_size;
+    i=0;
     l=base[i];
 
   }
 
-  while (tp && tp != Cnil) {
+  while (tp != OBJNULL && tp != Cnil) {
 
     while (1) {
       while (type_of(l)==t_cons) {
@@ -147,17 +147,17 @@ rl_completion_words(const char *text, int state) {
          return c;
        }
       }
-      if (++i==size)
+      if (++i>=size)
        break;
       l=base[i];
     }      
 
     tp=use->c.c_car;
     use=use->c.c_cdr;
-    base=internal ? tp->p.p_internal : tp->p.p_external;
-    size=internal ? tp->p.p_internal_size : tp->p.p_external_size;
+    base=tp==Cnil ? NULL : (internal ? tp->p.p_internal : tp->p.p_external);
+    size=tp==Cnil ? 0    : (internal ? tp->p.p_internal_size : tp->p.p_external_size);
     i=0;
-    l=base[i];
+    l=base==NULL ? Cnil : base[i];
 
   }