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

[Kim F . Storm]

Index: emacs/src/minibuf.c
diff -c emacs/src/minibuf.c:1.278 emacs/src/minibuf.c:1.279
*** emacs/src/minibuf.c:1.278   Sun Dec 12 18:15:22 2004
--- emacs/src/minibuf.c Tue Feb 22 20:39:23 2005
***************
*** 1181,1193 ****
  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.
  For a unique match which is exact, t is returned.
  
! If ALIST is a hash-table, all the string keys are the possible matches.
  If ALIST is an obarray, the names of all symbols in the obarray
  are the possible matches.
  
--- 1181,1196 ----
  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.  The possible matches may be
! strings or symbols.  Symbols are converted to strings before testing,
! see `symbol-name'.
  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.
  For a unique match which is exact, t is returned.
  
! If ALIST is a hash-table, all the string and symbol keys are the
! possible matches.
  If ALIST is an obarray, the names of all symbols in the obarray
  are the possible matches.
  
***************
*** 1257,1263 ****
          if (!EQ (bucket, zero))
            {
              elt = bucket;
!             eltstring = Fsymbol_name (elt);
              if (XSYMBOL (bucket)->next)
                XSETSYMBOL (bucket, XSYMBOL (bucket)->next);
              else
--- 1260,1266 ----
          if (!EQ (bucket, zero))
            {
              elt = bucket;
!             eltstring = elt;
              if (XSYMBOL (bucket)->next)
                XSETSYMBOL (bucket, XSYMBOL (bucket)->next);
              else
***************
*** 1284,1289 ****
--- 1287,1295 ----
  
        /* Is this element a possible completion? */
  
+       if (SYMBOLP (eltstring))
+       eltstring = Fsymbol_name (eltstring);
+ 
        if (STRINGP (eltstring)
          && SCHARS (string) <= SCHARS (eltstring)
          && (tem = Fcompare_strings (eltstring, zero,
***************
*** 1440,1449 ****
  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.
  If ALIST is an obarray, the names of all symbols in the obarray
  are the possible matches.
  
--- 1446,1458 ----
  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 possible matches may be
! strings or symbols.  Symbols are converted to strings before testing,
! see `symbol-name'.
  The value is a list of all the strings from ALIST that match.
  
! If ALIST is a hash-table, all the string and symbol keys are the
! possible matches.
  If ALIST is an obarray, the names of all symbols in the obarray
  are the possible matches.
  
***************
*** 1512,1518 ****
          if (!EQ (bucket, zero))
            {
              elt = bucket;
!             eltstring = Fsymbol_name (elt);
              if (XSYMBOL (bucket)->next)
                XSETSYMBOL (bucket, XSYMBOL (bucket)->next);
              else
--- 1521,1527 ----
          if (!EQ (bucket, zero))
            {
              elt = bucket;
!             eltstring = elt;
              if (XSYMBOL (bucket)->next)
                XSETSYMBOL (bucket, XSYMBOL (bucket)->next);
              else
***************
*** 1539,1544 ****
--- 1548,1556 ----
  
        /* Is this element a possible completion? */
  
+       if (SYMBOLP (eltstring))
+       eltstring = Fsymbol_name (eltstring);
+ 
        if (STRINGP (eltstring)
          && SCHARS (string) <= SCHARS (eltstring)
          /* If HIDE_SPACES, reject alternatives that start with space