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

[Jan Djärv]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.598 emacs/src/xfns.c:1.599
*** emacs/src/xfns.c:1.598      Sun Oct  5 13:23:05 2003
--- emacs/src/xfns.c    Sun Nov  9 11:26:48 2003
***************
*** 2670,2676 ****
    {
      int len;
      char *tem, shell_position[32];
!     Arg al[2];
      int ac = 0;
      int extra_borders = 0;
      int menubar_size
--- 2670,2676 ----
    {
      int len;
      char *tem, shell_position[32];
!     Arg al[10];
      int ac = 0;
      int extra_borders = 0;
      int menubar_size
***************
*** 2722,2730 ****
                 (xneg ? '-' : '+'), left,
                 (yneg ? '-' : '+'), top);
        else
!       sprintf (shell_position, "=%dx%d",
!                FRAME_PIXEL_WIDTH (f) + extra_borders,
!                FRAME_PIXEL_HEIGHT (f) + menubar_size + extra_borders);
      }
  
      len = strlen (shell_position) + 1;
--- 2722,2740 ----
                 (xneg ? '-' : '+'), left,
                 (yneg ? '-' : '+'), top);
        else
!         {
!           sprintf (shell_position, "=%dx%d",
!                    FRAME_PIXEL_WIDTH (f) + extra_borders,
!                    FRAME_PIXEL_HEIGHT (f) + menubar_size + extra_borders);
! 
!           /* Setting x and y when the position is not specified in
!              the geometry string will set program position in the WM hints.
!              If Emacs had just one program position, we could set it in
!              fallback resources, but since each make-frame call can specify
!              different program positions, this is easier.  */
!           XtSetArg (al[ac], XtNx, left); ac++;
!           XtSetArg (al[ac], XtNy, top); ac++;
!         }
      }
  
      len = strlen (shell_position) + 1;