Merge from emacs-24; up to 2012-04-30T11:57:47Z!sdl.web@gmail.com

3 files changed, 17 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 09fc8fbfda2..29fc2561c03 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * gnutls.c (emacs_gnutls_handshake):
+        Add QUIT to make the loop interruptible.
+
+2012-06-29  Glenn Morris  <rgm@gnu.org>
+
+        * charset.c (init_charset): Make lack of etc/charsets fatal.
+
 2012-06-29  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * editfns.c (region_limit): Fix type mismatch.
diff --git a/src/charset.c b/src/charset.c
index 8ce972ebf37..04de8a44b4c 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2296,11 +2296,15 @@ init_charset (void)
   tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory);
   if (access (SSDATA (tempdir), 0) < 0)
     {
-      dir_warning ("Error: charsets directory (%s) does not exist.\n\
+      /* This used to be non-fatal (dir_warning), but it should not
+         happen, and if it does sooner or later it will cause some
+         obscure problem (eg bug#6401), so better abort.  */
+      fprintf (stderr, "Error: charsets directory not found:\n\
+%s\n\
 Emacs will not function correctly without the character map files.\n\
 Please check your installation!\n",
-                   tempdir);
-      /* TODO should this be a fatal error?  (Bug#909)  */
+                   SDATA (tempdir));
+      exit (1);
     }
 
   Vcharset_map_path = Fcons (tempdir, Qnil);
diff --git a/src/gnutls.c b/src/gnutls.c
index c5e21cc8777..9c96379ff7e 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -322,6 +322,7 @@ emacs_gnutls_handshake (struct Lisp_Process *proc)
     {
       ret = fn_gnutls_handshake (state);
       emacs_gnutls_handle_error (state, ret);
+      QUIT;
     }
   while (ret < 0 && fn_gnutls_error_is_fatal (ret) == 0);