[Emacs-diffs] Changes to emacs/src/minibuf.c

[Stefan Monnier]

Index: emacs/src/minibuf.c
diff -c emacs/src/minibuf.c:1.258 emacs/src/minibuf.c:1.259
*** emacs/src/minibuf.c:1.258   Sat May 24 18:02:14 2003
--- emacs/src/minibuf.c Sun Jul  6 19:26:09 2003
***************
*** 485,490 ****
--- 485,491 ----
        val = read_minibuf_noninteractive (map, initial, prompt, backup_n,
                                         expflag, histvar, histpos, defalt,
                                         allow_props, inherit_input_method);
+       UNGCPRO;
        return unbind_to (count, val);
      }
  
***************
*** 738,744 ****
  
    /* The appropriate frame will get selected
       in set-window-configuration.  */
!   RETURN_UNGCPRO (unbind_to (count, val));
  }
  
  /* Return a buffer to be used as the minibuffer at depth `depth'.
--- 739,746 ----
  
    /* The appropriate frame will get selected
       in set-window-configuration.  */
!   UNGCPRO;
!   return unbind_to (count, val);
  }
  
  /* Return a buffer to be used as the minibuffer at depth `depth'.
***************
*** 1125,1131 ****
  
  DEFUN ("try-completion", Ftry_completion, Stry_completion, 2, 3, 0,
         doc: /* Return common substring of all completions of STRING in ALIST.
! Each car of each element of ALIST is tested to see if it begins with STRING.
  All that match are compared together; the longest initial sequence
  common to all matches is returned as a string.
  If there is no match at all, nil is returned.
--- 1127,1134 ----
  
  DEFUN ("try-completion", Ftry_completion, Stry_completion, 2, 3, 0,
         doc: /* Return common substring of all completions of STRING in ALIST.
! Each car of each element of ALIST (or each element if it is not a cons cell)
! is tested to see if it begins with STRING.
  All that match are compared together; the longest initial sequence
  common to all matches is returned as a string.
  If there is no match at all, nil is returned.
***************
*** 1367,1373 ****
  
  DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 4, 0,
         doc: /* Search for partial matches to STRING in ALIST.
! Each car of each element of ALIST is tested to see if it begins with STRING.
  The value is a list of all the strings from ALIST that match.
  
  If ALIST is a hash-table, all the string keys are the possible matches.
--- 1370,1377 ----
  
  DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 4, 0,
         doc: /* Search for partial matches to STRING in ALIST.
! Each car of each element of ALIST (or each element if it is not a cons cell)
! is tested to see if it begins with STRING.
  The value is a list of all the strings from ALIST that match.
  
  If ALIST is a hash-table, all the string keys are the possible matches.