/[emacs]/emacs/src/minibuf.c
ViewVC logotype

Diff of /emacs/src/minibuf.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.227 by pj, Sun Oct 28 10:54:56 2001 UTC revision 1.228 by pj, Fri Nov 2 20:31:03 2001 UTC
# Line 199  without invoking the usual minibuffer co Line 199  without invoking the usual minibuffer co
199       (window)       (window)
200       Lisp_Object window;       Lisp_Object window;
201  {  {
202    CHECK_WINDOW (window, 1);    CHECK_WINDOW (window);
203    if (! MINI_WINDOW_P (XWINDOW (window)))    if (! MINI_WINDOW_P (XWINDOW (window)))
204      error ("Window is not a minibuffer window");      error ("Window is not a minibuffer window");
205    
# Line 848  If the variable `minibuffer-allow-text-p Line 848  If the variable `minibuffer-allow-text-p
848    
849    position = Qnil;    position = Qnil;
850    
851    CHECK_STRING (prompt, 0);    CHECK_STRING (prompt);
852    if (!NILP (initial_contents))    if (!NILP (initial_contents))
853      {      {
854        if (CONSP (initial_contents))        if (CONSP (initial_contents))
# Line 856  If the variable `minibuffer-allow-text-p Line 856  If the variable `minibuffer-allow-text-p
856            position = Fcdr (initial_contents);            position = Fcdr (initial_contents);
857            initial_contents = Fcar (initial_contents);            initial_contents = Fcar (initial_contents);
858          }          }
859        CHECK_STRING (initial_contents, 1);        CHECK_STRING (initial_contents);
860        if (!NILP (position))        if (!NILP (position))
861          {          {
862            CHECK_NUMBER (position, 0);            CHECK_NUMBER (position);
863            /* Convert to distance from end of input.  */            /* Convert to distance from end of input.  */
864            if (XINT (position) < 1)            if (XINT (position) < 1)
865              /* A number too small means the beginning of the string.  */              /* A number too small means the beginning of the string.  */
# Line 906  is a string to insert in the minibuffer Line 906  is a string to insert in the minibuffer
906       (prompt, initial_contents)       (prompt, initial_contents)
907       Lisp_Object prompt, initial_contents;       Lisp_Object prompt, initial_contents;
908  {  {
909    CHECK_STRING (prompt, 0);    CHECK_STRING (prompt);
910    if (!NILP (initial_contents))    if (!NILP (initial_contents))
911      CHECK_STRING (initial_contents, 1);      CHECK_STRING (initial_contents);
912    return read_minibuf (Vminibuffer_local_map, initial_contents,    return read_minibuf (Vminibuffer_local_map, initial_contents,
913                         prompt, Qnil, 1, Qminibuffer_history,                         prompt, Qnil, 1, Qminibuffer_history,
914                         make_number (0), Qnil, 0, 0);                         make_number (0), Qnil, 0, 0);
# Line 958  the current input method and the setting Line 958  the current input method and the setting
958       (prompt, initial, inherit_input_method)       (prompt, initial, inherit_input_method)
959       Lisp_Object prompt, initial, inherit_input_method;       Lisp_Object prompt, initial, inherit_input_method;
960  {  {
961    CHECK_STRING (prompt, 0);    CHECK_STRING (prompt);
962    if (! NILP (initial))    if (! NILP (initial))
963      CHECK_STRING (initial, 1);      CHECK_STRING (initial);
964    
965    return read_minibuf (Vminibuffer_local_ns_map, initial, prompt, Qnil,    return read_minibuf (Vminibuffer_local_ns_map, initial, prompt, Qnil,
966                         0, Qminibuffer_history, make_number (0), Qnil, 0,                         0, Qminibuffer_history, make_number (0), Qnil, 0,
# Line 1111  is used to further constrain the set of Line 1111  is used to further constrain the set of
1111    Lisp_Object bucket, zero, end, tem;    Lisp_Object bucket, zero, end, tem;
1112    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
1113    
1114    CHECK_STRING (string, 0);    CHECK_STRING (string);
1115    if (!list && !VECTORP (alist))    if (!list && !VECTORP (alist))
1116      return call3 (alist, string, predicate, Qnil);      return call3 (alist, string, predicate, Qnil);
1117    
# Line 1359  are ignored unless STRING itself starts Line 1359  are ignored unless STRING itself starts
1359    Lisp_Object bucket, tem;    Lisp_Object bucket, tem;
1360    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
1361    
1362    CHECK_STRING (string, 0);    CHECK_STRING (string);
1363    if (!list && !VECTORP (alist))    if (!list && !VECTORP (alist))
1364      {      {
1365        return call3 (alist, string, predicate, Qt);        return call3 (alist, string, predicate, Qt);
# Line 1532  Completion ignores case if the ambient v Line 1532  Completion ignores case if the ambient v
1532            position = Fcdr (init);            position = Fcdr (init);
1533            init = Fcar (init);            init = Fcar (init);
1534          }          }
1535        CHECK_STRING (init, 0);        CHECK_STRING (init);
1536        if (!NILP (position))        if (!NILP (position))
1537          {          {
1538            CHECK_NUMBER (position, 0);            CHECK_NUMBER (position);
1539            /* Convert to distance from end of input.  */            /* Convert to distance from end of input.  */
1540            pos = XINT (position) - XSTRING (init)->size;            pos = XINT (position) - XSTRING (init)->size;
1541          }          }
# Line 1911  Return nil if there is no valid completi Line 1911  Return nil if there is no valid completi
1911    {    {
1912      int buffer_nchars, completion_nchars;      int buffer_nchars, completion_nchars;
1913    
1914      CHECK_STRING (completion, 0);      CHECK_STRING (completion);
1915      tem = Fminibuffer_contents ();      tem = Fminibuffer_contents ();
1916      GCPRO2 (completion, tem);      GCPRO2 (completion, tem);
1917      /* If reading a file name,      /* If reading a file name,
# Line 2085  It can find the completion buffer in `st Line 2085  It can find the completion buffer in `st
2085            if (CONSP (elt))            if (CONSP (elt))
2086              {              {
2087                tem = XCAR (elt);                tem = XCAR (elt);
2088                CHECK_STRING (tem, 0);                CHECK_STRING (tem);
2089                length = XSTRING (tem)->size;                length = XSTRING (tem)->size;
2090    
2091                tem = Fcar (XCDR (elt));                tem = Fcar (XCDR (elt));
2092                CHECK_STRING (tem, 0);                CHECK_STRING (tem);
2093                length += XSTRING (tem)->size;                length += XSTRING (tem)->size;
2094              }              }
2095            else            else
2096              {              {
2097                CHECK_STRING (elt, 0);                CHECK_STRING (elt);
2098                length = XSTRING (elt)->size;                length = XSTRING (elt)->size;
2099              }              }
2100    

Legend:
Removed from v.1.227  
changed lines
  Added in v.1.228

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26