Mercurial > emacs

diff src/xterm.c @ 108459:1d1025faed5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Wed, 05 May 2010 10:17:53 +0000
parents e6266e624471
children d9345841fefd
line wrap: on
line diff
--- a/src/xterm.c	Wed Apr 28 12:11:11 2010 +0000
+++ b/src/xterm.c	Wed May 05 10:17:53 2010 +0000
@@ -7936,8 +7936,8 @@
       if (terminal_list->next_terminal == NULL)
         {
           fprintf (stderr, "%s\n", error_msg);
-          shut_down_emacs (0, 0, Qnil);
-          exit (70);
+          Fkill_emacs (make_number (70));
+          /* NOTREACHED */
         }
       xg_display_close (dpyinfo->display);
 #endif
@@ -7963,8 +7963,8 @@
   if (terminal_list == 0)
     {
       fprintf (stderr, "%s\n", error_msg);
-      shut_down_emacs (0, 0, Qnil);
-      exit (70);
+      Fkill_emacs (make_number (70));
+      /* NOTREACHED */
     }
 
   /* Ordinary stack unwind doesn't deal with these.  */