(x-handle-geometry): Specify user-position and

user-size properties when appropriate.

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index e300d797746ac6730a29616b1795e4967798ac2b..ec9060c448d147c84b0c77c442f4295ddeb716ad 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -169,10 +169,15 @@
 
 ;; Handle the geometry option
 (defun x-handle-geometry (switch)
-  (setq initial-frame-alist
-       (append initial-frame-alist
-               (x-parse-geometry (car x-invocation-args)))
-       x-invocation-args (cdr x-invocation-args)))
+  (let ((geo (x-parse-geometry (car x-invocation-args))))
+    (setq initial-frame-alist
+         (append initial-frame-alist
+                 (if (or (assq 'left geo) (assq 'top geo))
+                     '((user-position . t)))
+                 (if (or (assq 'height geo) (assq 'width geo))
+                     '((user-size . t)))
+                 geo)
+         x-invocation-args (cdr x-invocation-args))))
 
 ;; Handle the -name and -rn options.  Set the variable x-resource-name
 ;; to the option's operand; if the switch was `-name', set the name of