emacs-31 14bf2a707c6: Fix thinko in 'set-frame-size-and-position' (Bug#81193)

branch: emacs-31
commit 14bf2a707c68f7b8eb35dd98446e00741d52370e
Author: Martin Rudalics <[email protected]>
Commit: Martin Rudalics <[email protected]>

    Fix thinko in 'set-frame-size-and-position' (Bug#81193)
    
    * lisp/frame.el (set-frame-size-and-position): Do not subtract
    scoll bar, fringes and internal border sizes twice (Bug#81193).
---
 lisp/frame.el | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lisp/frame.el b/lisp/frame.el
index 85b58cee070..36c14304ec7 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1782,11 +1782,7 @@ resize and move FRAME."
     (when negative
       (setq gravity 3)
       (setq left (- parent-or-display-width (- left)
-                    (+ text-width
-                       (frame-scroll-bar-width frame)
-                       (frame-fringe-width frame)
-                       (* 2 (frame-internal-border-width frame))
-                       outer-minus-text-width))))
+                    text-width outer-minus-text-width)))
 
     (setq negative nil)
     (cond
@@ -1813,9 +1809,7 @@ resize and move FRAME."
       ;; This should get us 7 or 9.
       (setq gravity (+ gravity 6))
       (setq top (- parent-or-display-height (- top)
-                   (+ text-height
-                      (* 2 (frame-internal-border-width frame)))
-                   outer-minus-text-height)))
+                   text-height outer-minus-text-height)))
 
     (set-frame-size-and-position-pixelwise
      frame text-width text-height left top gravity)))