5 files changed, 219 insertions, 110 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2a8ac9b8131..bcb71daca5d 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,44 @@
+2012-10-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * make-docfile.c (IS_SLASH, DEF_ELISP_FILE): New macros.
+        (scan_lisp_file): Only pass a .el file if its basename matches a
+        known file in its entirety.  Use IS_SLASH and DEF_ELISP_FILE.
+
+2012-10-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * make-docfile.c (scan_lisp_file): Add bounds checking.
+
+2012-10-20  Eli Zaretskii  <eliz@gnu.org>
+
+        Prevent silent omission of doc strings from uncompiled Lisp files.
+        * make-docfile.c (scan_lisp_file): Barf if called with a .el file
+        other than one of a small list of supported un-compiled files.
+
+        * makefile.w32-in (lisp1, lisp2): Name .elc files wherever they
+        exist.  (Bug#12395)
+
+2012-10-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * ntlib.c: Include <mbstring.h>, to avoid compiler warning about
+        _mbspbrk.
+
+2012-10-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (obj): Add cygw32.o.
+
+2012-10-08  Daniel Colascione  <dancol@dancol.org>
+
+        * emacsclient.c: Include windows.h when HAVE_NTGUI.
+        (alt_display): New variable.  We send the display held by this
+        variable when the primary display is either unsupported or not
+        present.
+        (longopts): Allow display everywhere.
+        (w32_set_user_model_id): Move lower in file, inside HAVE_NTGUI
+        section.
+        (decode_options): Use alt_display.  Explain why.
+        (main): Retry connection with alt_display if connection with main
+        display fails.
+
 2012-10-01  Fabrice Popineau  <fabrice.popineau@gmail.com>
 
         * make-docfile.c (write_globals): Special-case
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 07300dbf249..8d60d7961da 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -44,6 +44,10 @@ char *w32_getenv (char *);
 
 #else /* !WINDOWSNT */
 
+# ifdef HAVE_NTGUI
+# include <windows.h>
+# endif /* HAVE_NTGUI */
+
 # include "syswait.h"
 
 # ifdef HAVE_INET_SOCKETS
@@ -140,6 +144,9 @@ int current_frame = 1;
 /* The display on which Emacs should work.  --display.  */
 const char *display = NULL;
 
+/* The alternate display we should try if Emacs does not support display.  */
+const char *alt_display = NULL;
+
 /* The parent window ID, if we are opening a frame via XEmbed.  */
 char *parent_id = NULL;
 
@@ -182,9 +189,7 @@ struct option longopts[] =
   { "socket-name",      required_argument, NULL, 's' },
 #endif
   { "server-file",      required_argument, NULL, 'f' },
-#ifndef WINDOWSNT
   { "display",  required_argument, NULL, 'd' },
-#endif
   { "parent-id", required_argument, NULL, 'p' },
   { 0, 0, 0, 0 }
 };
@@ -385,32 +390,6 @@ w32_getenv (char *envvar)
   return NULL;
 }
 
-void
-w32_set_user_model_id (void)
-{
-  HMODULE shell;
-  HRESULT (WINAPI * set_user_model) (wchar_t * id);
-
-  /* On Windows 7 and later, we need to set the user model ID
-     to associate emacsclient launched files with Emacs frames
-     in the UI.  */
-  shell = LoadLibrary ("shell32.dll");
-  if (shell)
-    {
-      set_user_model
-        = (void *) GetProcAddress (shell,
-                                   "SetCurrentProcessExplicitAppUserModelID");
-      /* If the function is defined, then we are running on Windows 7
-         or newer, and the UI uses this to group related windows
-         together.  Since emacs, runemacs, emacsclient are related, we
-         want them grouped even though the executables are different,
-         so we need to set a consistent ID between them.  */
-      if (set_user_model)
-        set_user_model (L"GNU.Emacs");
-
-      FreeLibrary (shell);
-    }
-}
 
 int
 w32_window_app (void)
@@ -605,16 +584,29 @@ decode_options (int argc, char **argv)
      Without the -c option, we used to set `display' to $DISPLAY by
      default, but this changed the default behavior and is sometimes
      inconvenient.  So we force users to use "--display $DISPLAY" if
-     they want Emacs to connect to their current display.  */
+     they want Emacs to connect to their current display.
+
+     Some window systems have a notion of default display not
+     reflected in the DISPLAY variable.  If the user didn't give us an
+     explicit display, try this platform-specific after trying the
+     display in DISPLAY (if any).  */
   if (!current_frame && !tty && !display)
     {
-      display = egetenv ("DISPLAY");
-#ifdef NS_IMPL_COCOA
-      /* Under Cocoa, we don't really use displays the same way as in X,
-         so provide a dummy. */
-      if (!display || strlen (display) == 0)
-        display = "ns";
+      /* Set these here so we use a default_display only when the user
+         didn't give us an explicit display.  */
+#if defined (NS_IMPL_COCOA)
+      alt_display = "ns";
+#elif defined (HAVE_NTGUI)
+      alt_display = "w32";
 #endif
+
+      display = egetenv ("DISPLAY");
+    }
+
+  if (!display)
+    {
+      display = alt_display;
+      alt_display = NULL;
     }
 
   /* A null-string display is invalid.  */
@@ -1415,10 +1407,37 @@ set_socket (int no_exit_if_error)
   exit (EXIT_FAILURE);
 }
 
-#ifdef WINDOWSNT
+#ifdef HAVE_NTGUI
 FARPROC set_fg;  /* Pointer to AllowSetForegroundWindow.  */
 FARPROC get_wc;  /* Pointer to RealGetWindowClassA.  */
 
+void
+w32_set_user_model_id (void)
+{
+  HMODULE shell;
+  HRESULT (WINAPI * set_user_model) (wchar_t * id);
+
+  /* On Windows 7 and later, we need to set the user model ID
+     to associate emacsclient launched files with Emacs frames
+     in the UI.  */
+  shell = LoadLibrary ("shell32.dll");
+  if (shell)
+    {
+      set_user_model
+        = (void *) GetProcAddress (shell,
+                                   "SetCurrentProcessExplicitAppUserModelID");
+      /* If the function is defined, then we are running on Windows 7
+         or newer, and the UI uses this to group related windows
+         together.  Since emacs, runemacs, emacsclient are related, we
+         want them grouped even though the executables are different,
+         so we need to set a consistent ID between them.  */
+      if (set_user_model)
+        set_user_model (L"GNU.Emacs");
+
+      FreeLibrary (shell);
+    }
+}
+
 BOOL CALLBACK
 w32_find_emacs_process (HWND hWnd, LPARAM lParam)
 {
@@ -1467,7 +1486,7 @@ w32_give_focus (void)
       && (get_wc = GetProcAddress (user32, "RealGetWindowClassA")))
     EnumWindows (w32_find_emacs_process, (LPARAM) 0);
 }
-#endif
+#endif /* HAVE_NTGUI */
 
 /* Start the emacs daemon and try to connect to it.  */
 
@@ -1537,11 +1556,13 @@ main (int argc, char **argv)
   main_argv = argv;
   progname = argv[0];
 
-#ifdef WINDOWSNT
-  /* On Windows 7 and later, we need to explicitly associate emacsclient
-     with emacs so the UI behaves sensibly.  */
+#ifdef HAVE_NTGUI
+  /* On Windows 7 and later, we need to explicitly associate
+     emacsclient with emacs so the UI behaves sensibly.  This
+     association does no harm if we're not actually connecting to an
+     Emacs using a window display.  */
   w32_set_user_model_id ();
-#endif
+#endif /* HAVE_NTGUI */
 
   /* Process options.  */
   decode_options (argc, argv);
@@ -1577,9 +1598,10 @@ main (int argc, char **argv)
       fail ();
     }
 
-#ifdef WINDOWSNT
+#ifdef HAVE_NTGUI
+  if (display && !strcmp (display, "w32"))
   w32_give_focus ();
-#endif
+#endif /* HAVE_NTGUI */
 
   /* Send over our environment and current directory. */
   if (!current_frame)
@@ -1748,46 +1770,56 @@ main (int argc, char **argv)
           if (end_p != NULL)
             *end_p++ = '\0';
 
-          if (strprefix ("-emacs-pid ", p))
-            {
-              /* -emacs-pid PID: The process id of the Emacs process. */
-              emacs_pid = strtol (p + strlen ("-emacs-pid"), NULL, 10);
-            }
-          else if (strprefix ("-window-system-unsupported ", p))
-            {
-              /* -window-system-unsupported: Emacs was compiled without X
-                 support.  Try again on the terminal. */
-              nowait = 0;
-              tty = 1;
-              goto retry;
-            }
-          else if (strprefix ("-print ", p))
-            {
-              /* -print STRING: Print STRING on the terminal. */
-              str = unquote_argument (p + strlen ("-print "));
-              if (needlf)
-                printf ("\n");
-              printf ("%s", str);
-              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
-            }
-          else if (strprefix ("-print-nonl ", p))
-            {
-              /* -print-nonl STRING: Print STRING on the terminal.
-                 Used to continue a preceding -print command.  */
-              str = unquote_argument (p + strlen ("-print-nonl "));
-              printf ("%s", str);
-              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
-            }
-          else if (strprefix ("-error ", p))
-            {
-              /* -error DESCRIPTION: Signal an error on the terminal. */
-              str = unquote_argument (p + strlen ("-error "));
-              if (needlf)
-                printf ("\n");
-              fprintf (stderr, "*ERROR*: %s", str);
-              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
-              exit_status = EXIT_FAILURE;
-            }
+          if (strprefix ("-emacs-pid ", p))
+            {
+              /* -emacs-pid PID: The process id of the Emacs process. */
+              emacs_pid = strtol (p + strlen ("-emacs-pid"), NULL, 10);
+            }
+          else if (strprefix ("-window-system-unsupported ", p))
+            {
+              /* -window-system-unsupported: Emacs was compiled without support
+                 for whatever window system we tried.  Try the alternate
+                 display, or, failing that, try the terminal.  */
+              if (alt_display)
+                {
+                  display = alt_display;
+                  alt_display = NULL;
+                }
+              else
+                {
+                  nowait = 0;
+                  tty = 1;
+                }
+
+              goto retry;
+            }
+          else if (strprefix ("-print ", p))
+            {
+              /* -print STRING: Print STRING on the terminal. */
+              str = unquote_argument (p + strlen ("-print "));
+              if (needlf)
+                printf ("\n");
+              printf ("%s", str);
+              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
+            }
+          else if (strprefix ("-print-nonl ", p))
+            {
+              /* -print-nonl STRING: Print STRING on the terminal.
+                 Used to continue a preceding -print command.  */
+              str = unquote_argument (p + strlen ("-print-nonl "));
+              printf ("%s", str);
+              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
+            }
+          else if (strprefix ("-error ", p))
+            {
+              /* -error DESCRIPTION: Signal an error on the terminal. */
+              str = unquote_argument (p + strlen ("-error "));
+              if (needlf)
+                printf ("\n");
+              fprintf (stderr, "*ERROR*: %s", str);
+              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
+              exit_status = EXIT_FAILURE;
+            }
 #ifdef SIGSTOP
           else if (strprefix ("-suspend ", p))
             {
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 411b7057861..b6cd1530a4c 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -58,9 +58,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef chdir
 #define READ_TEXT "rt"
 #define READ_BINARY "rb"
+#define IS_SLASH(c)  ((c) == '/' || (c) == '\\' || (c) == ':')
 #else  /* not DOS_NT */
 #define READ_TEXT "r"
 #define READ_BINARY "r"
+#define IS_SLASH(c)  ((c) == '/')
 #endif /* not DOS_NT */
 
 static int scan_file (char *filename);
@@ -1025,9 +1027,9 @@ scan_c_file (char *filename, const char *mode)
  arglist, but the doc string must still have a backslash and newline
  immediately after the double quote.
  The only source files that must follow this convention are preloaded
- uncompiled ones like loaddefs.el and bindings.el; aside
- from that, it is always the .elc file that we look at, and they are no
- problem because byte-compiler output follows this convention.
+ uncompiled ones like loaddefs.el; aside from that, it is always the .elc
+ file that we should look at, and they are no problem because byte-compiler
+ output follows this convention.
  The NAME and DOCSTRING are output.
  NAME is preceded by `F' for a function or `V' for a variable.
  An entry is output only if DOCSTRING has \ newline just after the opening ".
@@ -1098,15 +1100,48 @@ search_lisp_doc_at_eol (FILE *infile)
   return 1;
 }
 
+#define DEF_ELISP_FILE(fn)  { #fn, sizeof(#fn) - 1 }
+
 static int
 scan_lisp_file (const char *filename, const char *mode)
 {
   FILE *infile;
   register int c;
   char *saved_string = 0;
+  /* These are the only files that are loaded uncompiled, and must
+     follow the conventions of the doc strings expected by this
+     function.  These conventions are automatically followed by the
+     byte compiler when it produces the .elc files.  */
+  static struct {
+    const char *fn;
+    size_t fl;
+  } const uncompiled[] = {
+    DEF_ELISP_FILE (loaddefs.el),
+    DEF_ELISP_FILE (loadup.el),
+    DEF_ELISP_FILE (charprop.el)
+  };
+  int i, match;
+  size_t flen = strlen (filename);
 
   if (generate_globals)
     fatal ("scanning lisp file when -g specified", 0);
+  if (flen > 3 && !strcmp (filename + flen - 3, ".el"))
+    {
+      for (i = 0, match = 0; i < sizeof (uncompiled) / sizeof (uncompiled[0]);
+           i++)
+        {
+          if (uncompiled[i].fl <= flen
+              && !strcmp (filename + flen - uncompiled[i].fl, uncompiled[i].fn)
+              && (flen == uncompiled[i].fl
+                  || IS_SLASH (filename[flen - uncompiled[i].fl - 1])))
+            {
+              match = 1;
+              break;
+            }
+        }
+      if (!match)
+        fatal ("uncompiled lisp file %s is not supported", filename);
+    }
 
   infile = fopen (filename, mode);
   if (infile == NULL)
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 23ef71de10c..640e8a7c468 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -124,7 +124,7 @@ $(BLD)/profile.exe:	$(PROFILEOBJS)
 obj =   dosfns.o msdos.o \
         xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
         fontset.o menu.o \
-        w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
+        w32.o w32console.o w32fns.o w32heap.o w32inevt.o cygw32.o \
         w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
         font.o w32font.o w32uniscribe.o \
         dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \
@@ -209,38 +209,38 @@ lisp1= \
         $(lispsource)emacs-lisp/map-ynp.elc \
         $(lispsource)menu-bar.elc \
         $(lispsource)international/mule.elc \
-        $(lispsource)international/mule-conf.el \
+        $(lispsource)international/mule-conf.elc \
         $(lispsource)international/mule-cmds.elc \
         $(lispsource)international/characters.elc \
         $(lispsource)international/charprop.el \
         $(lispsource)case-table.elc
 
 lisp2 = \
-        $(lispsource)language/chinese.el \
-        $(lispsource)language/cyrillic.el \
-        $(lispsource)language/indian.el \
-        $(lispsource)language/sinhala.el \
-        $(lispsource)language/english.el \
+        $(lispsource)language/chinese.elc \
+        $(lispsource)language/cyrillic.elc \
+        $(lispsource)language/indian.elc \
+        $(lispsource)language/sinhala.elc \
+        $(lispsource)language/english.elc \
         $(lispsource)language/ethiopic.elc \
         $(lispsource)language/european.elc \
-        $(lispsource)language/czech.el \
-        $(lispsource)language/slovak.el \
-        $(lispsource)language/romanian.el \
-        $(lispsource)language/greek.el \
+        $(lispsource)language/czech.elc \
+        $(lispsource)language/slovak.elc \
+        $(lispsource)language/romanian.elc \
+        $(lispsource)language/greek.elc \
         $(lispsource)language/hebrew.elc \
-        $(lispsource)language/japanese.el \
-        $(lispsource)language/korean.el \
-        $(lispsource)language/lao.el \
-        $(lispsource)language/cham.el \
-        $(lispsource)language/tai-viet.el \
-        $(lispsource)language/thai.el \
+        $(lispsource)language/japanese.elc \
+        $(lispsource)language/korean.elc \
+        $(lispsource)language/lao.elc \
+        $(lispsource)language/cham.elc \
+        $(lispsource)language/tai-viet.elc \
+        $(lispsource)language/thai.elc \
         $(lispsource)language/tibetan.elc \
-        $(lispsource)language/vietnamese.el \
-        $(lispsource)language/misc-lang.el \
-        $(lispsource)language/utf-8-lang.el \
-        $(lispsource)language/georgian.el \
-        $(lispsource)language/khmer.el \
-        $(lispsource)language/burmese.el \
+        $(lispsource)language/vietnamese.elc \
+        $(lispsource)language/misc-lang.elc \
+        $(lispsource)language/utf-8-lang.elc \
+        $(lispsource)language/georgian.elc \
+        $(lispsource)language/khmer.elc \
+        $(lispsource)language/burmese.elc \
         $(lispsource)register.elc \
         $(lispsource)replace.elc \
         $(lispsource)simple.elc \
@@ -266,7 +266,7 @@ lisp2 = \
         $(WINDOW_SUPPORT) \
         $(lispsource)widget.elc \
         $(lispsource)window.elc \
-        $(lispsource)version.el
+        $(lispsource)version.elc
 
 # This is needed the first time we build the tree, since temacs.exe
 # does not exist yet, and the DOC rule needs it to rebuild DOC whenever
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index feaad1c1bb7..4e125eb6d73 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -30,6 +30,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <errno.h>
 #include <ctype.h>
 #include <sys/timeb.h>
+#include <mbstring.h>
 
 #include "ntlib.h"