summaryrefslogtreecommitdiff
path: root/data/bash/bash40-036
blob: ed08e393691713a38ca4aca62b904d98d7c218cd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
			     BASH PATCH REPORT
			     =================

Bash-Release: 4.0
Patch-ID: bash40-036

Bug-Reported-by:	Jerome Reybert <jreybert@gmail.com>
Bug-Reference-ID:	<f5da50720908070109p1faa3847x5a9dff68d24a7197@mail.gmail.com>
Bug-Reference-URL:	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538013

Bug-Description:

Under some circumstances, menu-complete is unable to complete filenames.

Patch:

*** ../bash-4.0-patched/lib/readline/complete.c	2009-01-22 15:15:14.000000000 -0500
--- lib/readline/complete.c	2009-08-26 17:15:59.000000000 -0400
***************
*** 2209,2213 ****
    /* The first time through, we generate the list of matches and set things
       up to insert them. */
!   if (rl_last_func != rl_menu_complete)
      {
        /* Clean up from previous call, if any. */
--- 2252,2256 ----
    /* The first time through, we generate the list of matches and set things
       up to insert them. */
!   if (rl_last_func != rl_old_menu_complete)
      {
        /* Clean up from previous call, if any. */
***************
*** 2221,2224 ****
--- 2264,2269 ----
        rl_completion_invoking_key = invoking_key;
  
+       RL_SETSTATE(RL_STATE_COMPLETING);
+ 
        /* Only the completion entry function can change these. */
        set_completion_defaults ('%');
***************
*** 2260,2266 ****
--- 2305,2314 ----
  	  orig_text = (char *)0;
      	  completion_changed_buffer = 0;
+  	  RL_UNSETSTATE(RL_STATE_COMPLETING);
            return (0);
  	}
  
+       RL_UNSETSTATE(RL_STATE_COMPLETING);
+ 
        for (match_list_size = 0; matches[match_list_size]; match_list_size++)
          ;
***************
*** 2338,2341 ****
--- 2386,2391 ----
        full_completion = 0;
  
+       RL_SETSTATE(RL_STATE_COMPLETING);
+ 
        /* Only the completion entry function can change these. */
        set_completion_defaults ('%');
***************
*** 2379,2385 ****
--- 2429,2438 ----
  	  orig_text = (char *)0;
      	  completion_changed_buffer = 0;
+  	  RL_UNSETSTATE(RL_STATE_COMPLETING);
            return (0);
  	}
  
+       RL_UNSETSTATE(RL_STATE_COMPLETING);
+ 
        for (match_list_size = 0; matches[match_list_size]; match_list_size++)
          ;
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 35
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 36
  
  #endif /* _PATCHLEVEL_H_ */