From ea8d3061370eb3c02cc659eb0b013a358de853b2 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 24 Dec 2001 04:52:54 +0000 Subject: [PATCH] (x-handle-geometry): Put height and width on default-frame-alist, left and top on initial-frame-alist. --- lisp/ChangeLog | 4 ++++ lisp/term/w32-win.el | 27 ++++++++++++++++++--------- lisp/term/x-win.el | 27 ++++++++++++++++++--------- 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9fbd1abc8d..1043fa7b79 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2001-12-23 Richard M. Stallman + * term/x-win.el (x-handle-geometry): Put height and width + on default-frame-alist, left and top on initial-frame-alist. + * term/w32-win.el (x-handle-geometry): Likewise. + * sort.el (sort-reorder-buffer): Copy all to a temp buffer first. * play/yow.el (yow): Use an arg to distinguish interactive calls, diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 9cc3d2c0b8..64fa5ae47b 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -300,15 +300,24 @@ the last file dropped is selected." (defun x-handle-geometry (switch) "Handle the \"-geometry\" SWITCH." - (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)))) + (let* ((geo (x-parse-geometry (car x-invocation-args))) + (left (assq 'left geo)) + (top (assq 'top geo)) + (height (assq 'height geo)) + (width (assq 'width geo))) + (if (or height width) + (setq default-frame-alist + (append default-frame-alist + '((user-size . t)) + (if height (list height)) + (if width (list width))))) + (if (or left top) + (setq initial-frame-alist + (append initial-frame-alist + '((user-position . t)) + (if left (list left)) + (if top (list top))))) + (setq x-invocation-args (cdr x-invocation-args)))) (defun x-handle-name-rn-switch (switch) "Handle a \"-name\" or \"-rn\" SWITCH." diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index a3e0d94afb..f161f5cb20 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -127,15 +127,24 @@ ;; Handle the geometry option (defun x-handle-geometry (switch) - (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)))) + (let* ((geo (x-parse-geometry (car x-invocation-args))) + (left (assq 'left geo)) + (top (assq 'top geo)) + (height (assq 'height geo)) + (width (assq 'width geo))) + (if (or height width) + (setq default-frame-alist + (append default-frame-alist + '((user-size . t)) + (if height (list height)) + (if width (list width))))) + (if (or left top) + (setq initial-frame-alist + (append initial-frame-alist + '((user-position . t)) + (if left (list left)) + (if top (list top))))) + (setq x-invocation-args (cdr x-invocation-args)))) ;; Handle the -name option. Set the variable x-resource-name ;; to the option's operand; set the name of -- 2.20.1