Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
7ed4e9a7
Commit
7ed4e9a7
authored
Jan 23, 2000
by
Jason Rumney
Browse files
(w32_create_initial_fontsets): Disabled as it conflicts with new face support.
parent
51dcffad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
85 additions
and
80 deletions
+85
-80
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/term/w32-win.el
lisp/term/w32-win.el
+80
-80
No files found.
lisp/ChangeLog
View file @
7ed4e9a7
2000-01-22 Jason Rumney <jasonr@gnu.org>
* term/w32-win.el (w32_create_initial_fontsets): Disabled as it
conflicts with new face support.
2000-01-22 Richard M. Stallman <rms@caffeine.ai.mit.edu>
* replace.el (query-replace): Rename last arg to DELIMITED.
...
...
lisp/term/w32-win.el
View file @
7ed4e9a7
...
...
@@ -165,7 +165,7 @@ Switch to a buffer editing the last file dropped."
(y (cdr coords)))
(if (and (> x 0) (> y 0))
(set-frame-selected-window nil window))
(mapcar 'find-file (car (cdr (cdr event)))))
(mapcar 'find-file (car (cdr (cdr event)))))
(raise-frame)))
(defun w32-drag-n-drop-other-frame (event)
...
...
@@ -641,85 +641,85 @@ languages which are distributed with Windows as \"Multilanguage Support\".
See the documentation of `create-fontset-from-fontset-spec for the format.")
(if (fboundp 'new-fontset)
(progn
(defun w32-create-initial-fontsets ()
"Create fontset-startup, fontset-standard and any fontsets
specified in X resources."
;; Create the standard fontset.
(create-fontset-from-fontset-spec w32-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 style variants of the
;; fontset too. Font names in the variants are
;; generated automatially unless X resources
;; XXX.attribyteFont explicitly specify them.
(let ((styles (mapcar 'car x-style-funcs-alist))
(faces '(bold italic bold-italic))
face face-font fontset fontset-spec)
(while faces
(setq face (car faces))
(setq face-font (x-get-resource (concat (symbol-name face)
".attributeFont")
"Face.AttributeFont"))
(if face-font
(setq styles (cons (cons face face-font)
(delq face styles))))
(setq faces (cdr faces)))
(aset xlfd-fields xlfd-regexp-foundry-subnum nil)
(aset xlfd-fields xlfd-regexp-family-subnum nil)
(aset xlfd-fields xlfd-regexp-registry-subnum "fontset")
(aset xlfd-fields xlfd-regexp-encoding-subnum "startup")
;; The fontset name should have concrete values in
;; weight and slant field.
(let ((weight (aref xlfd-fields xlfd-regexp-weight-subnum))
(slant (aref xlfd-fields xlfd-regexp-slant-subnum))
xlfd-temp)
(if (or (not weight) (string-match "[*?]*" weight))
(progn
(setq xlfd-temp
(x-decompose-font-name resolved-name))
(aset xlfd-fields xlfd-regexp-weight-subnum
(aref xlfd-temp xlfd-regexp-weight-subnum))))
(if (or (not slant) (string-match "[*?]*" slant))
(progn
(or xlfd-temp
(setq xlfd-temp
(x-decompose-font-name resolved-name)))
(aset xlfd-fields xlfd-regexp-slant-subnum
(aref xlfd-temp xlfd-regexp-slant-subnum)))))
(setq fontset (x-compose-font-name xlfd-fields))
(create-fontset-from-fontset-spec
(concat fontset ", ascii:" font) styles)
)))))
;; This cannot be run yet, as creating fontsets requires a
;; Window to be initialised so the fonts can be listed.
;; Add it to a hook so it gets run later.
(add-hook 'before-init-hook 'w32-create-initial-fontsets)
))
;
(if (fboundp 'new-fontset)
;
(progn
;
(defun w32-create-initial-fontsets ()
;
"Create fontset-startup, fontset-standard and any fontsets
;
specified in X resources."
;
;; Create the standard fontset.
;
(create-fontset-from-fontset-spec w32-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 style variants of the
;
;; fontset too. Font names in the variants are
;
;; generated automatially unless X resources
;
;; XXX.attribyteFont explicitly specify them.
;
(let ((styles (mapcar 'car x-style-funcs-alist))
;
(faces '(bold italic bold-italic))
;
face face-font fontset fontset-spec)
;
(while faces
;
(setq face (car faces))
;
(setq face-font (x-get-resource (concat (symbol-name face)
;
".attributeFont")
;
"Face.AttributeFont"))
;
(if face-font
;
(setq styles (cons (cons face face-font)
;
(delq face styles))))
;
(setq faces (cdr faces)))
;
(aset xlfd-fields xlfd-regexp-foundry-subnum nil)
;
(aset xlfd-fields xlfd-regexp-family-subnum nil)
;
(aset xlfd-fields xlfd-regexp-registry-subnum "fontset")
;
(aset xlfd-fields xlfd-regexp-encoding-subnum "startup")
;
;; The fontset name should have concrete values in
;
;; weight and slant field.
;
(let ((weight (aref xlfd-fields xlfd-regexp-weight-subnum))
;
(slant (aref xlfd-fields xlfd-regexp-slant-subnum))
;
xlfd-temp)
;
(if (or (not weight) (string-match "[*?]*" weight))
;
(progn
;
(setq xlfd-temp
;
(x-decompose-font-name resolved-name))
;
(aset xlfd-fields xlfd-regexp-weight-subnum
;
(aref xlfd-temp xlfd-regexp-weight-subnum))))
;
(if (or (not slant) (string-match "[*?]*" slant))
;
(progn
;
(or xlfd-temp
;
(setq xlfd-temp
;
(x-decompose-font-name resolved-name)))
;
(aset xlfd-fields xlfd-regexp-slant-subnum
;
(aref xlfd-temp xlfd-regexp-slant-subnum)))))
;
(setq fontset (x-compose-font-name xlfd-fields))
;
(create-fontset-from-fontset-spec
;
(concat fontset ", ascii:" font) styles)
;
)))))
;
;; This cannot be run yet, as creating fontsets requires a
;
;; Window to be initialised so the fonts can be listed.
;
;; Add it to a hook so it gets run later.
;
(add-hook 'before-init-hook 'w32-create-initial-fontsets)
;
))
;; 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment