2 files changed, 16 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5e31ba344fd..3d3b64588e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-21  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term.c (Fsuspend_tty): Run suspend-tty-functions before cleaning
+        up the tty state.
+
 2007-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * termhooks.h (term_gpm): Delete.  Use gpm_tty's NULLness instead.
diff --git a/src/term.c b/src/term.c
index 160e387e98d..be3430574f7 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2244,6 +2244,17 @@ A suspended tty may be resumed by calling `resume-tty' on it.  */)
   
   if (f)
     {
+      /* First run `suspend-tty-functions' and then clean up the tty
+         state because `suspend-tty-functions' might need to change
+         the tty state.  */
+      if (!NILP (Vrun_hooks))
+        {
+          Lisp_Object args[2];
+          args[0] = intern ("suspend-tty-functions");
+          XSETTERMINAL (args[1], t);
+          Frun_hook_with_args (2, args);
+        }
+
       reset_sys_modes (t->display_info.tty);
 
       delete_keyboard_wait_descriptor (fileno (f));
@@ -2258,14 +2269,6 @@ A suspended tty may be resumed by calling `resume-tty' on it.  */)
       if (FRAMEP (t->display_info.tty->top_frame))
         FRAME_SET_VISIBLE (XFRAME (t->display_info.tty->top_frame), 0);
       
-      /* Run `suspend-tty-functions'.  */
-      if (!NILP (Vrun_hooks))
-        {
-          Lisp_Object args[2];
-          args[0] = intern ("suspend-tty-functions");
-          XSETTERMINAL (args[1], t);
-          Frun_hook_with_args (2, args);
-        }
     }
 
   /* Clear display hooks to prevent further output.  */