Mercurial > emacs
changeset 385:493f247f7ca1
*** empty log message ***
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Tue, 13 Aug 1991 08:41:57 +0000 |
| parents | 9dab5ca1890f |
| children | 6acd2a203aa8 |
| files | lisp/term/x-win.el src/frame.h |
| diffstat | 2 files changed, 7 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/x-win.el Mon Aug 12 13:15:12 1991 +0000 +++ b/lisp/term/x-win.el Tue Aug 13 08:41:57 1991 +0000 @@ -124,23 +124,23 @@ (let ((aelt (assoc switch x-switch-definitions))) (if aelt (if (nth 2 aelt) - (setq screen-default-alist + (setq default-screen-alist (cons (cons (nth 1 aelt) (nth 2 aelt)) - screen-default-alist)) - (setq screen-default-alist + default-screen-alist)) + (setq default-screen-alist (cons (cons (nth 1 aelt) (car x-invocation-args)) - screen-default-alist) + default-screen-alist) x-invocation-args (cdr x-invocation-args)))))) ;; Handler for switches of the form "-switch n" (defun x-handle-numeric-switch (switch) (let ((aelt (assoc switch x-switch-definitions))) (if aelt - (setq screen-default-alist + (setq default-screen-alist (cons (cons (nth 1 aelt) (string-to-int (car x-invocation-args))) - screen-default-alist) + default-screen-alist) x-invocation-args (cdr x-invocation-args))))) @@ -178,44 +178,6 @@ (setq args (nreverse args))) -;; Handle Xresources. - -(defun x-read-resources () - "Reread the X defaults from the X server and install them in -`screen-default-alist', to be used in new screens." - (interactive) - (mapcar (function - (lambda (key-resname-default) - (let* ((key (nth 0 key-resname-default)) - (tail (assq key screen-default-alist)) - (value - (or (x-get-resource (nth 1 key-resname-default)) - (nth 2 key-resname-default)))) - (if tail (setcdr tail value) - (setq screen-default-alist - (cons (cons key value) - screen-default-alist)))))) - '((font "font" "9x15") - (background-color "background" "white") - (border-width "#BorderWidth" 2) - (internal-border-width "#InternalBorderWidth" 1) - - (foreground-color "foreground" "black") - (mouse-color "mouse" "black") - (cursor-color "cursor" "black") - (border-color "border" "black"))) - (setq x-screen-defaults screen-default-alist)) - - -;; This is the function which creates the first X window. It is called -;; from startup.el before the user's init file is processed. - -(defun x-pop-initial-window () - ;; see screen.el for this function - (pop-initial-screen (append initial-screen-alist - screen-default-alist)) - (delete-screen terminal-screen)) - ;; ;; Standard X cursor shapes, courtesy of Mr. Fox, who wanted ALL of them. @@ -628,9 +590,6 @@ (set-input-mode t nil t) (setq screen-creation-function 'x-create-screen) -(x-read-resources) -;(x-pop-initial-window) - (setq suspend-hook '(lambda () (error "Suspending an emacs running under X makes no sense"))) @@ -638,5 +597,3 @@ ;;; Turn off window-splitting optimization; X is usually fast enough ;;; that this is only annoying. (setq split-window-keep-point t) - -(define-key global-map "\C-z" 'iconify-emacs)