merge trunk

7 files changed, 74 insertions, 79 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4cbf5dd50f1..d0410f4c080 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,23 @@
+2010-07-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacsclient.c (set_local_socket): Use strchr, strrchr instead of
+        index, rindex.
+        * movemail.c (mail_spool_name, popmail): Likewise.
+        * pop.c (pop_list): Likewise.
+
+2010-07-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (obj): Add menu.o, bidi.o, w32uniscrobe.o,
+        and unexw32.o.  (Bug#6603)
+
+2010-07-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in ($(DESTDIR)${archlibdir}): Convert spaces to TABs.
+
+2010-07-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * make-docfile.c (write_c_args): Restructure scanning loop.
+
 2010-07-09  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * make-docfile.c (write_c_args): Deal with type names in DEFUN
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 264f14b1d49..b5c557d8c7b 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -245,7 +245,7 @@ $(DESTDIR)${archlibdir}: all
           chown ${gameuser} $(DESTDIR)${gamedir}; \
           chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
         fi
-        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
+        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
              != `(cd ${srcdir} && /bin/pwd)` ]; then \
           for file in ${SCRIPTS}; do \
             $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index cb8a4ebcaf8..79143ff7a34 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1234,8 +1234,10 @@ set_local_socket (void)
     char *server_name = "server";
     char *tmpdir;
 
-    if (socket_name && !index (socket_name, '/') && !index (socket_name, '\\'))
-      { /* socket_name is a file name component.  */
+    if (socket_name && !strchr (socket_name, '/')
+        && !strchr (socket_name, '\\'))
+      {
+        /* socket_name is a file name component.  */
         server_name = socket_name;
         socket_name = NULL;
         default_sock = 1;       /* Try both UIDs.  */
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 3df7ec607d9..51c30f91d8f 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -440,8 +440,8 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
 {
   register char *p;
   int in_ident = 0;
-  int just_spaced = 0;
-  int need_space = 1;
+  char *ident_start;
+  int ident_length;
 
   fprintf (out, "(fn");
 
@@ -450,25 +450,9 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
 
   for (p = buf; *p; p++)
     {
-      char c;
-      int ident_start = 0;
+      char c = *p;
 
-      /* FIXME: this must be made a bit more robust*/
-      
-      /* Skip "register Lisp_Object", this can be removed when we get
-         rid of "register" for DEFUNs. */
-      if (strncmp ("register Lisp_Object", p, 20) == 0)
-        p += 20;
-
-      if (strncmp ("Lisp_Object", p, 11) == 0)
-        p += 11;
-
-      if (strncmp ("void", p, 4) == 0)
-        p += 4;
-
-      c  = *p;
-      
-      /* Notice when we start printing a new identifier.  */
+      /* Notice when a new identifier starts.  */
       if ((('A' <= c && c <= 'Z')
            || ('a' <= c && c <= 'z')
            || ('0' <= c && c <= '9')
@@ -478,55 +462,50 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
           if (!in_ident)
             {
               in_ident = 1;
-              ident_start = 1;
-
-              if (need_space)
-                putc (' ', out);
-
-              if (minargs == 0 && maxargs > 0)
-                fprintf (out, "&optional ");
-              just_spaced = 1;
-
-              minargs--;
-              maxargs--;
+              ident_start = p;
             }
           else
-            in_ident = 0;
+            {
+              in_ident = 0;
+              ident_length = p - ident_start;
+            }
         }
 
-      /* Print the C argument list as it would appear in lisp:
-         print underscores as hyphens, and print commas and newlines
-         as spaces.  Collapse adjacent spaces into one.  */
-      if (c == '_')
-        c = '-';
-      else if (c == ',' || c == '\n')
-        c = ' ';
-
-      /* In C code, `default' is a reserved word, so we spell it
-         `defalt'; unmangle that here.  */
-      if (ident_start
-          && strncmp (p, "defalt", 6) == 0
-          && ! (('A' <= p[6] && p[6] <= 'Z')
-                || ('a' <= p[6] && p[6] <= 'z')
-                || ('0' <= p[6] && p[6] <= '9')
-                || p[6] == '_'))
-        {
-          fprintf (out, "DEFAULT");
-          p += 5;
-          in_ident = 0;
-          just_spaced = 0;
-        }
-      else if (c != ' ' || !just_spaced)
+      /* Found the end of an argument, write out the last seen
+         identifier.  */
+      if (c == ',' || c == ')')
         {
-          if (c >= 'a' && c <= 'z')
-            /* Upcase the letter.  */
-            c += 'A' - 'a';
-          putc (c, out);
-        }
+          if (strncmp (ident_start, "void", ident_length) == 0)
+            continue;
+
+          putc (' ', out);
+
+          if (minargs == 0 && maxargs > 0)
+            fprintf (out, "&optional ");
 
-      just_spaced = c == ' ';
-      need_space = 0;
+          minargs--;
+          maxargs--;
+
+          /* In C code, `default' is a reserved word, so we spell it
+             `defalt'; unmangle that here.  */
+          if (strncmp (ident_start, "defalt", ident_length) == 0)
+            fprintf (out, "DEFAULT");
+          else
+            while (ident_length-- > 0)
+              {
+                c = *ident_start++;
+                if (c >= 'a' && c <= 'z')
+                  /* Upcase the letter.  */
+                  c += 'A' - 'a';
+                else if (c == '_')
+                  /* Print underscore as hyphen.  */
+                  c = '-';
+                putc (c, out);
+              }
+        }
     }
+
+  putc (')', out);
 }
 
 /* Read through a c file.  If a .o file is named,
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index cad3b838208..fbcab0183ce 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -143,11 +143,11 @@ $(BLD)/ctags.$(O): ctags.c
 #
 obj =   dosfns.o msdos.o \
         xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
-        fontset.o \
+        fontset.o menu.o \
         w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
         w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
-        font.o w32font.o \
-        dispnew.o frame.o scroll.o xdisp.o window.o \
+        font.o w32font.o w32uniscribe.o \
+        dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \
         charset.o coding.o category.o ccl.o character.o chartab.o \
         cm.o term.o terminal.o xfaces.o \
         emacs.o keyboard.o macros.o keymap.o sysdep.o \
@@ -157,7 +157,7 @@ obj =   dosfns.o msdos.o \
         alloc.o data.o doc.o editfns.o callint.o \
         eval.o floatfns.o fns.o print.o lread.o \
         syntax.o bytecode.o \
-        process.o callproc.o \
+        process.o callproc.o unexw32.o \
         region-cache.o sound.o atimer.o \
         doprnt.o strftime.o intervals.o textprop.o composite.o md5.o
 
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index dfa4a92d057..541edf545df 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -146,12 +146,6 @@ static char *mail_spool_name ();
 #ifndef HAVE_STRERROR
 char *strerror (int);
 #endif
-#ifdef HAVE_INDEX
-extern char *index (const char *, int);
-#endif
-#ifdef HAVE_RINDEX
-extern char *rindex (const char *, int);
-#endif
 
 static void fatal (char *s1, char *s2, char *s3);
 static void error (char *s1, char *s2, char *s3);
@@ -564,7 +558,7 @@ mail_spool_name (inname)
   char *indir, *fname;
   int status;
 
-  if (! (fname = rindex (inname, '/')))
+  if (! (fname = strrchr (inname, '/')))
     return NULL;
 
   fname++;
@@ -714,7 +708,7 @@ popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse
   char *user, *hostname;
 
   user = mailbox;
-  if ((hostname = index(mailbox, ':')))
+  if ((hostname = strchr (mailbox, ':')))
     *hostname++ = '\0';
 
   server = pop_open (hostname, user, password, POP_NO_GETPASS);
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 9eaefa4cb83..26a992fa0b0 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -465,7 +465,7 @@ pop_list (popserver server, int message, int **IDs, int **sizes)
           return (-1);
         }
       (*IDs)[0] = atoi (&fromserver[4]);
-      fromserver = index (&fromserver[4], ' ');
+      fromserver = strchr (&fromserver[4], ' ');
       if (! fromserver)
         {
           strcpy (pop_error,
@@ -496,7 +496,7 @@ pop_list (popserver server, int message, int **IDs, int **sizes)
               return (-1);
             }
           (*IDs)[i] = atoi (fromserver);
-          fromserver = index (fromserver, ' ');
+          fromserver = strchr (fromserver, ' ');
           if (! fromserver)
             {
               strcpy (pop_error,