[Emacs-diffs] Changes to emacs/src/xfns.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.590.2.5 emacs/src/xfns.c:1.590.2.6
*** emacs/src/xfns.c:1.590.2.5  Wed Jul 28 07:05:52 2004
--- emacs/src/xfns.c    Fri Aug 27 07:00:34 2004
***************
*** 282,287 ****
--- 282,289 ----
    Lisp_Object tail, frame;
    struct frame *f;
  
+   if (wdesc == None) return 0;
+ 
    for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
      {
        frame = XCAR (tail);
***************
*** 331,336 ****
--- 333,340 ----
    struct frame *f, *found;
    struct x_output *x;
  
+   if (wdesc == None) return NULL;
+ 
    found = NULL;
    for (tail = Vframe_list; GC_CONSP (tail) && !found; tail = XCDR (tail))
      {
***************
*** 385,390 ****
--- 389,396 ----
    struct frame *f;
    struct x_output *x;
  
+   if (wdesc == None) return 0;
+ 
    for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
      {
        frame = XCAR (tail);
***************
*** 431,436 ****
--- 437,444 ----
    struct frame *f;
    struct x_output *x;
  
+   if (wdesc == None) return 0;
+ 
    for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
      {
        frame = XCAR (tail);
***************
*** 476,481 ****
--- 484,491 ----
    struct frame *f;
    struct x_output *x;
  
+   if (wdesc == None) return 0;
+ 
    for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
      {
        frame = XCAR (tail);
***************
*** 1631,1637 ****
          }
  #ifdef USE_GTK
          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
!                               SDATA (name));
  #else /* not USE_GTK */
        XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
  #endif /* not USE_GTK */
--- 1641,1647 ----
          }
  #ifdef USE_GTK
          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
!                               SDATA (ENCODE_UTF_8 (name)));
  #else /* not USE_GTK */
        XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
  #endif /* not USE_GTK */
***************
*** 1739,1745 ****
  
  #ifdef USE_GTK
          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
!                               SDATA (name));
  #else /* not USE_GTK */
        XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
  #endif /* not USE_GTK */
--- 1749,1755 ----
  
  #ifdef USE_GTK
          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
!                               SDATA (ENCODE_UTF_8 (name)));
  #else /* not USE_GTK */
        XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
  #endif /* not USE_GTK */