[Emacs-diffs] trunk r115462: * nsterm.m (x_free_frame_resources):

[Dmitry Antipov]

------------------------------------------------------------
revno: 115462
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-11 19:06:04 +0400
message:
  * nsterm.m (x_free_frame_resources):
  * term.c (tty_free_frame_resources):
  * xterm.c (x_free_frame_resources): Do not check for non-NULL
  face cache because it's implied by free_frame_faces anyway.
  * w32term.c (x_free_frame_resources): Likewise.  Do not call
  free_frame_faces twice.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747
  src/term.c                     term.c-20091113204419-o5vbwnq5f7feedwu-220
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-11 14:42:55 +0000
+++ b/src/ChangeLog     2013-12-11 15:06:04 +0000
@@ -1,3 +1,12 @@
+2013-12-11  Dmitry Antipov  <address@hidden>
+
+       * nsterm.m (x_free_frame_resources):
+       * term.c (tty_free_frame_resources):
+       * xterm.c (x_free_frame_resources): Do not check for non-NULL
+       face cache because it's implied by free_frame_faces anyway.
+       * w32term.c (x_free_frame_resources): Likewise.  Do not call
+       free_frame_faces twice.
+
 2013-12-11  Rüdiger Sonderfeld  <address@hidden>
 
        * editfns.c (Fformat_time_string): Mention %F in the doc.

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-12-08 12:59:14 +0000
+++ b/src/nsterm.m      2013-12-11 15:06:04 +0000
@@ -1155,9 +1155,7 @@
   block_input ();
 
   free_frame_menubar (f);
-
-  if (FRAME_FACE_CACHE (f))
-    free_frame_faces (f);
+  free_frame_faces (f);
 
   if (f == dpyinfo->x_focus_frame)
     dpyinfo->x_focus_frame = 0;

=== modified file 'src/term.c'
--- a/src/term.c        2013-12-11 00:32:00 +0000
+++ b/src/term.c        2013-12-11 15:06:04 +0000
@@ -3833,10 +3833,7 @@
 tty_free_frame_resources (struct frame *f)
 {
   eassert (FRAME_TERMCAP_P (f));
-
-  if (FRAME_FACE_CACHE (f))
-    free_frame_faces (f);
-
+  free_frame_faces (f);
   xfree (f->output_data.tty);
 }
 
@@ -3848,9 +3845,7 @@
 tty_free_frame_resources (struct frame *f)
 {
   eassert (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f));
-
-  if (FRAME_FACE_CACHE (f))
-    free_frame_faces (f);
+  free_frame_faces (f);
 }
 #endif /* MSDOS */
 

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2013-12-07 17:48:52 +0000
+++ b/src/w32term.c     2013-12-11 15:06:04 +0000
@@ -6080,17 +6080,13 @@
   /* We must free faces before destroying windows because some
      font-driver (e.g. xft) access a window while finishing a
      face.  */
-  if (FRAME_FACE_CACHE (f))
-    free_frame_faces (f);
+  free_frame_faces (f);
 
   if (FRAME_W32_WINDOW (f))
     my_destroy_window (f, FRAME_W32_WINDOW (f));
 
   free_frame_menubar (f);
 
-  if (FRAME_FACE_CACHE (f))
-    free_frame_faces (f);
-
   xfree (f->output_data.w32);
   f->output_data.w32 = NULL;
 

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-12-11 10:03:46 +0000
+++ b/src/xterm.c       2013-12-11 15:06:04 +0000
@@ -9129,8 +9129,7 @@
       /* We must free faces before destroying windows because some
         font-driver (e.g. xft) access a window while finishing a
         face.  */
-      if (FRAME_FACE_CACHE (f))
-       free_frame_faces (f);
+      free_frame_faces (f);
 
       if (f->output_data.x->icon_desc)
        XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->icon_desc);