Mercurial > emacs
changeset 4306:2e51ffb537a8
(x-handle-iconic): New function.
(command-switch-alist): Use that.
(x-switch-definitions): Delete elt for `-iconic'.
(x-selection-timeout): Use 20000 as default.
(x-select-text): Never set the CLIPBOARD selection.
(x-cut-buffer-or-selection-value): Try PRIMARY before cut buffer.
(x-cut-buffer-max): Set based on x-server-max-request-size.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 27 Jul 1993 08:38:00 +0000 |
| parents | a39dcf68a29c |
| children | fb633691b4a9 |
| files | lisp/term/x-win.el |
| diffstat | 1 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/x-win.el Tue Jul 27 08:34:34 1993 +0000 +++ b/lisp/term/x-win.el Tue Jul 27 08:38:00 1993 +0000 @@ -100,7 +100,7 @@ ("-ms" . x-handle-switch) ("-itype" . x-handle-switch) ("-i" . x-handle-switch) - ("-iconic" . x-handle-switch) + ("-iconic" . x-handle-iconic) ("-xrm" . x-handle-xrm-switch) ("-cr" . x-handle-switch) ("-vb" . x-handle-switch) @@ -125,7 +125,6 @@ ("-cr" cursor-color) ("-itype" icon-type t) ("-i" icon-type t) - ("-iconic" visibility icon) ("-vb" vertical-scroll-bars t) ("-hb" horizontal-scroll-bars t) ("-bd" border-color) @@ -145,6 +144,11 @@ default-frame-alist) x-invocation-args (cdr x-invocation-args)))))) +;; Make -iconic apply only to the initial frame! +(defun x-handle-iconic (switch) + (setq initial-frame-alist + (cons '(visibility . icon) initial-frame-alist))) + ;; Handler for switches of the form "-switch n" (defun x-handle-numeric-switch (switch) (let ((aelt (assoc switch x-switch-definitions))) @@ -492,8 +496,8 @@ (defvar x-last-selected-text nil) ;;; It is said that overlarge strings are slow to put into the cut buffer. -(defvar x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100) - 20000) +;;; Note this value is overridden below. +(defvar x-cut-buffer-max 20000 "Max number of characters to put in the cut buffer.") ;;; Make TEXT, a string, the primary X selection. @@ -518,9 +522,9 @@ ;; Consult the selection, then the cut buffer. Treat empty strings ;; as if they were unset. - (or text (setq text (x-get-selection 'PRIMARY))) + (setq text (x-get-selection 'PRIMARY)) (if (string= text "") (setq text nil)) - (setq text (x-get-cut-buffer 0)) + (or text (setq text (x-get-cut-buffer 0))) (if (string= text "") (setq text nil)) (cond @@ -555,6 +559,9 @@ (setq frame-creation-function 'x-create-frame-with-faces) +(setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100) + x-cut-buffer-max)) + ;; Apply a geometry resource to the initial frame. Put it at the end ;; of the alist, so that anything specified on the command line takes ;; precedence.