[Emacs-diffs] Changes to emacs/src/frame.c

[Juanma Barranquero]

Index: emacs/src/frame.c
diff -c emacs/src/frame.c:1.317 emacs/src/frame.c:1.318
*** emacs/src/frame.c:1.317     Tue Jun 21 16:14:51 2005
--- emacs/src/frame.c   Thu Jun 23 16:08:43 2005
***************
*** 399,405 ****
  #ifdef MULTI_KBOARD
    if (!NILP (mini_window)
        && XFRAME (XWINDOW (mini_window)->frame)->kboard != kb)
!     error ("frame and minibuffer must be on the same display");
  #endif
  
    /* Make a frame containing just a root window.  */
--- 399,405 ----
  #ifdef MULTI_KBOARD
    if (!NILP (mini_window)
        && XFRAME (XWINDOW (mini_window)->frame)->kboard != kb)
!     error ("Frame and minibuffer must be on the same display");
  #endif
  
    /* Make a frame containing just a root window.  */
***************
*** 3374,3380 ****
  extern Display_Info *check_x_display_info P_ ((Lisp_Object));
  
  
! /* Get specified attribute from resource database RDB.  
     See Fx_get_resource below for other parameters.  */
  
  static Lisp_Object
--- 3374,3380 ----
  extern Display_Info *check_x_display_info P_ ((Lisp_Object));
  
  
! /* Get specified attribute from resource database RDB.
     See Fx_get_resource below for other parameters.  */
  
  static Lisp_Object
***************
*** 3511,3517 ****
  
  Lisp_Object
  x_get_arg (dpyinfo, alist, param, attribute, class, type)
!      Display_Info *dpyinfo; 
       Lisp_Object alist, param;
       char *attribute;
       char *class;
--- 3511,3517 ----
  
  Lisp_Object
  x_get_arg (dpyinfo, alist, param, attribute, class, type)
!      Display_Info *dpyinfo;
       Lisp_Object alist, param;
       char *attribute;
       char *class;