comparison lisp/term/x-win.el @ 91046:35069180a991

Fix up multi-tty merge Revision: [e-mail]/emacs--unicode--0--patch-261 Creator: Stefan Monnier <[e-mail]>

91045:39ec756a9481

  (create-fontset-from-fontset-spec standard-fontset-spec t)

  ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...).
  (create-fontset-from-x-resource)

  ;; Try to create a fontset from a font specification which comes
  ;; from initial-frame-alist, default-frame-alist, or X resource.
  ;; A font specification in command line argument (i.e. -fn XXXX)
  ;; should be already in default-frame-alist as a `font'
  ;; parameter.  However, any font specifications in site-start
  ;; library, user's init file (.emacs), and default.el are not
  ;; yet handled here.

  (let ((font (or (cdr (assq 'font initial-frame-alist))
		  (cdr (assq 'font default-frame-alist))
		  (x-get-resource "font" "Font")))
	xlfd-fields resolved-name)
    (if (and font
	     (not (query-fontset font))
	     (setq resolved-name (x-resolve-font-name font))
	     (setq xlfd-fields (x-decompose-font-name font)))
	(if (string= "fontset" (aref xlfd-fields xlfd-regexp-registry-subnum))
	    (new-fontset font (x-complement-fontset-spec xlfd-fields nil))
	  ;; Create a fontset from FONT.  The fontset name is
	  ;; generated from FONT.
	  (create-fontset-from-ascii-font font resolved-name "startup"))))

  ;; Set scroll bar mode to right if set by X resources. Default is left.
  (if (equal (x-get-resource "verticalScrollBars" "ScrollBars") "right")
      (customize-set-variable 'scroll-bar-mode 'right))

  ;; Apply a geometry resource to the initial frame.  Put it at the end

91046:35069180a991

  (create-fontset-from-fontset-spec standard-fontset-spec t)

  ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...).
  (create-fontset-from-x-resource)

  ;; Set scroll bar mode to right if set by X resources. Default is left.
  (if (equal (x-get-resource "verticalScrollBars" "ScrollBars") "right")
      (customize-set-variable 'scroll-bar-mode 'right))

  ;; Apply a geometry resource to the initial frame.  Put it at the end