Merge from emacs-23

5 files changed, 40 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 43a38c6a728..70e646e343d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,24 @@
+2010-11-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c (init_gconf): Check HAVE_G_TYPE_INIT.
+
+        * config.in (HAVE_G_TYPE_INIT): New symbol.
+
+2010-11-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * lread.c (Fload): Mention `load-in-progress' and
+        `load-file-name'.  (Bug#7346)
+
+        * keyboard.c (kbd_buffer_nr_stored): Define only ifdef subprocesses.
+        (kbd_buffer_store_event_hold, kbd_buffer_get_event)
+        (tty_read_avail_input): Call kbd_buffer_nr_stored only ifdef
+        subprocesses.  Use buffer_free only ifdef subprocesses.
+
+        * process.c (init_process) [subprocesses]: Init kbd_is_on_hold in
+        the subprocesses version, not in the non-subprocesses one.
+
+        * Makefile.in: Don't use ## comment, it breaks the MSDOS build.
+
 2010-11-17  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (set_cursor_from_row): Fix cursor positioning in empty
diff --git a/src/config.in b/src/config.in
index 8ccda972395..8d254cefff5 100644
--- a/src/config.in
+++ b/src/config.in
@@ -294,6 +294,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `gtk_widget_set_has_window' function. */
 #undef HAVE_GTK_WIDGET_SET_HAS_WINDOW
 
+/* Define to 1 if you have the `g_type_init' function. */
+#undef HAVE_G_TYPE_INIT
+
 /* Define to 1 if netdb.h declares h_errno. */
 #undef HAVE_H_ERRNO
 
diff --git a/src/keyboard.c b/src/keyboard.c
index d048404e856..0a6831750de 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3601,6 +3601,7 @@ event_to_kboard (struct input_event *event)
     return FRAME_KBOARD (XFRAME (frame));
 }
 
+#ifdef subprocesses
 /* Return the number of slots occupied in kbd_buffer.  */
 
 static int
@@ -3613,6 +3614,7 @@ kbd_buffer_nr_stored (void)
        : ((kbd_buffer + KBD_BUFFER_SIZE) - kbd_fetch_ptr
           + (kbd_store_ptr - kbd_buffer)));
 }
+#endif  /* subprocesses */
 
 Lisp_Object Vthrow_on_input;
 
@@ -3734,6 +3736,7 @@ kbd_buffer_store_event_hold (register struct input_event *event,
     {
       *kbd_store_ptr = *event;
       ++kbd_store_ptr;
+#ifdef subprocesses
       if (kbd_buffer_nr_stored () > KBD_BUFFER_SIZE/2 && ! kbd_on_hold_p ())
         {
           /* Don't read keyboard input until we have processed kbd_buffer.
@@ -3745,6 +3748,7 @@ kbd_buffer_store_event_hold (register struct input_event *event,
 #endif
           stop_polling ();
         }
+#endif  /* subprocesses */
     }
 
   /* If we're inside while-no-input, and this event qualifies
@@ -3905,6 +3909,7 @@ kbd_buffer_get_event (KBOARD **kbp,
   register int c;
   Lisp_Object obj;
 
+#ifdef subprocesses
   if (kbd_on_hold_p () && kbd_buffer_nr_stored () < KBD_BUFFER_SIZE/4)
     {
       /* Start reading input again, we have processed enough so we can
@@ -3916,6 +3921,7 @@ kbd_buffer_get_event (KBOARD **kbp,
 #endif /* SIGIO */
       start_polling ();
     }
+#endif  /* subprocesses */
 
   if (noninteractive
       /* In case we are running as a daemon, only do this before
@@ -7058,10 +7064,12 @@ tty_read_avail_input (struct terminal *terminal,
   int n_to_read, i;
   struct tty_display_info *tty = terminal->display_info.tty;
   int nread = 0;
+#ifdef subprocesses
   int buffer_free = KBD_BUFFER_SIZE - kbd_buffer_nr_stored () - 1;
 
   if (kbd_on_hold_p () || buffer_free <= 0)
     return 0;
+#endif  /* subprocesses */
 
   if (!terminal->name)          /* Don't read from a dead terminal. */
     return 0;
@@ -7143,9 +7151,11 @@ tty_read_avail_input (struct terminal *terminal,
 #endif
 #endif
 
+#ifdef subprocesses
   /* Don't read more than we can store.  */
   if (n_to_read > buffer_free)
     n_to_read = buffer_free;
+#endif  /* subprocesses */
 
   /* Now read; for one reason or another, this will not block.
      NREAD is set to the number of chars read.  */
diff --git a/src/lread.c b/src/lread.c
index f1c1bcd44c0..945808c6e5a 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -966,6 +966,10 @@ Loading a file records its definitions, and its `provide' and
 `require' calls, in an element of `load-history' whose
 car is the file name loaded.  See `load-history'.
 
+While the file is in the process of being loaded, the variable
+`load-in-progress' is non-nil and the variable `load-file-name'
+is bound to the file's name.
+
 Return t if the file exists and loads successfully.  */)
   (Lisp_Object file, Lisp_Object noerror, Lisp_Object nomessage, Lisp_Object nosuffix, Lisp_Object must_suffix)
 {
diff --git a/src/xsettings.c b/src/xsettings.c
index b3f3cb61541..83ca87ed0bd 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -627,7 +627,9 @@ init_gconf (void)
 #if defined (HAVE_GCONF) && defined (HAVE_XFT)
   char *s;
 
+#ifdef HAVE_G_TYPE_INIT
   g_type_init ();
+#endif
   gconf_client = gconf_client_get_default ();
   s = gconf_client_get_string (gconf_client, SYSTEM_MONO_FONT, NULL);
   if (s)