Mercurial > hg > xemacs-beta
comparison lisp/gtk-init.el @ 4380:461fdb92f3b6
Correct the perhaps_init_unseen_key_defaults GTK code; don't override X11 fonts.
2008-01-02 Aidan Kehoe <kehoea@parhasard.net>
* emacs.c (main_1):
Call the new vars_of_console_gtk function.
* console-gtk.c (vars_of_console_gtk): New.
* console-gtk.c (gtk_perhaps_init_unseen_key_defaults):
Correct the initialisation of the hash table, on the model of the
MSW and TTY builds.
2008-01-02 Aidan Kehoe <kehoea@parhasard.net>
* gtk-init.el (init-post-gtk-win):
Trust the X11 code to give us decent default fonts.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 02 Jan 2008 22:11:03 +0100 |
| parents | 39ccc7dd8077 |
| children | e34711681f30 |
comparison
equal
deleted
inserted
replaced
| 4379:92188a8f47a3 | 4380:461fdb92f3b6 |
|---|---|
| 131 (init-post-gtk-win) | 131 (init-post-gtk-win) |
| 132 (setq gtk-win-initted t))) | 132 (setq gtk-win-initted t))) |
| 133 | 133 |
| 134 (defun init-post-gtk-win () | 134 (defun init-post-gtk-win () |
| 135 (unless gtk-post-win-initted | 135 (unless gtk-post-win-initted |
| 136 (when (featurep 'mule) | |
| 137 (define-specifier-tag 'mule-fonts | |
| 138 (lambda (device) (eq 'gtk (device-type device)))) | |
| 139 (set-face-font | |
| 140 'default | |
| 141 '("-*-fixed-medium-r-*--16-*-iso8859-1" | |
| 142 "-*-fixed-medium-r-*--*-iso8859-1" | |
| 143 "-*-fixed-medium-r-*--*-iso8859-2" | |
| 144 "-*-fixed-medium-r-*--*-iso8859-3" | |
| 145 "-*-fixed-medium-r-*--*-iso8859-4" | |
| 146 "-*-fixed-medium-r-*--*-iso8859-7" | |
| 147 "-*-fixed-medium-r-*--*-iso8859-8" | |
| 148 "-*-fixed-medium-r-*--*-iso8859-5" | |
| 149 "-*-fixed-medium-r-*--*-iso8859-9" | |
| 150 | |
| 151 ;; Following 3 fonts proposed by Teruhiko.Kurosaka@Japan.eng.sun | |
| 152 "-sun-gothic-medium-r-normal--14-120-75-75-c-60-jisx0201.1976-0" | |
| 153 "-sun-gothic-medium-r-normal--14-120-75-75-c-120-jisx0208.1983-0" | |
| 154 "-wadalab-gothic-medium-r-normal--14-120-75-75-c-120-jisx0212.1990-0" | |
| 155 ;; Other Japanese fonts | |
| 156 "-*-fixed-medium-r-*--*-jisx0201.1976-*" | |
| 157 "-*-fixed-medium-r-*--*-jisx0208.1983-*" | |
| 158 "-*-fixed-medium-r-*--*-jisx0212*-*" | |
| 159 | |
| 160 ;; Chinese fonts | |
| 161 "-*-*-medium-r-*--*-gb2312.1980-*" | |
| 162 | |
| 163 ;; Use One font specification for CNS chinese | |
| 164 ;; Too many variations in font naming | |
| 165 "-*-fixed-medium-r-*--*-cns11643*-*" | |
| 166 ;; "-*-fixed-medium-r-*--*-cns11643*2" | |
| 167 ;; "-*-fixed-medium-r-*--*-cns11643*3" | |
| 168 ;; "-*-fixed-medium-r-*--*-cns11643*4" | |
| 169 ;; "-*-fixed-medium-r-*--*-cns11643.5-0" | |
| 170 ;; "-*-fixed-medium-r-*--*-cns11643.6-0" | |
| 171 ;; "-*-fixed-medium-r-*--*-cns11643.7-0" | |
| 172 | |
| 173 "-*-fixed-medium-r-*--*-big5*-*" | |
| 174 "-*-fixed-medium-r-*--*-sisheng_cwnn-0" | |
| 175 | |
| 176 ;; Other fonts | |
| 177 | |
| 178 ;; "-*-fixed-medium-r-*--*-viscii1.1-1" | |
| 179 | |
| 180 ;; "-*-fixed-medium-r-*--*-mulearabic-0" | |
| 181 ;; "-*-fixed-medium-r-*--*-mulearabic-1" | |
| 182 ;; "-*-fixed-medium-r-*--*-mulearabic-2" | |
| 183 | |
| 184 ;; "-*-fixed-medium-r-*--*-muleipa-1" | |
| 185 ;; "-*-fixed-medium-r-*--*-ethio-*" | |
| 186 | |
| 187 "-*-mincho-medium-r-*--*-ksc5601.1987-*" ; Korean | |
| 188 "-*-fixed-medium-r-*--*-tis620.2529-1" ; Thai | |
| 189 ) | |
| 190 'global '(mule-fonts) 'append)) | |
| 191 | |
| 192 (setq gtk-post-win-initted t))) | 136 (setq gtk-post-win-initted t))) |
| 193 | 137 |
| 194 (push '("-geometry" . gtk-init-handle-geometry) command-switch-alist) | 138 (push '("-geometry" . gtk-init-handle-geometry) command-switch-alist) |
| 195 | 139 |
| 196 ;;; Stuff to get compose keys working on GTK | 140 ;;; Stuff to get compose keys working on GTK |