Mercurial > emacs
comparison lisp/frame.el @ 83542:2d56e13fd23d
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-413
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-414
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-415
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-416
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-417
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-418
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-419
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-420
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-421
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-422
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-423
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-424
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-425
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-426
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-427
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-428
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-429
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-430
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-431
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-432
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-433
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-434
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-435
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-436
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-437
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-438
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-439
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-440
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-441
lisp/url/url-methods.el: Fix format error when http_proxy is empty string
* emacs@sv.gnu.org/emacs--devo--0--patch-442
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-443
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-444
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-445
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-446
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-447
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-448
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-449
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-450
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-451
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-452
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-453
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-454
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-455
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-456
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-457
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-458
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-459
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-460
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-461
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-462
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-463
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-464
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-465
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-466
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-467
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-468
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-469
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-470
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-471
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-472
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-473
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-128
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-129
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-130
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-131
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-132
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-133
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-134
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-135
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-136
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-137
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-138
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-139
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-140
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-141
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-142
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-143
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-144
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-145
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-146
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-147
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-148
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-149
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-582
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 14 Oct 2006 17:36:28 +0000 |
parents | 694bbb62a75d 834af994714d |
children | 17e0dd217877 |
comparison
equal
deleted
inserted
replaced
83541:694bbb62a75d | 83542:2d56e13fd23d |
---|---|
769 (setq tail (cdr tail))))) | 769 (setq tail (cdr tail))))) |
770 (setq frame-initial-geometry-arguments | 770 (setq frame-initial-geometry-arguments |
771 (nreverse frame-initial-geometry-arguments)) | 771 (nreverse frame-initial-geometry-arguments)) |
772 (cdr param-list)) | 772 (cdr param-list)) |
773 | 773 |
774 (defcustom focus-follows-mouse t | 774 (defcustom focus-follows-mouse (not (eq window-system 'mac)) |
775 "*Non-nil if window system changes focus when you move the mouse. | 775 "*Non-nil if window system changes focus when you move the mouse. |
776 You should set this variable to tell Emacs how your window manager | 776 You should set this variable to tell Emacs how your window manager |
777 handles focus, since there is no way in general for Emacs to find out | 777 handles focus, since there is no way in general for Emacs to find out |
778 automatically. | 778 automatically. |
779 | 779 |
1190 ((memq frame-type '(x w32 mac)) | 1190 ((memq frame-type '(x w32 mac)) |
1191 (x-display-pixel-width display)) | 1191 (x-display-pixel-width display)) |
1192 (t | 1192 (t |
1193 (frame-width (if (framep display) display (selected-frame))))))) | 1193 (frame-width (if (framep display) display (selected-frame))))))) |
1194 | 1194 |
1195 (defcustom display-mm-dimensions-alist nil | |
1196 "Alist for specifying screen dimensions in millimeters. | |
1197 The dimensions will be used for `display-mm-height' and | |
1198 `display-mm-width' if defined for the respective display. | |
1199 | |
1200 Each element of the alist has the form (display . (width . height)), | |
1201 e.g. (\":0.0\" . (287 . 215)). | |
1202 | |
1203 If `display' equals t, it specifies dimensions for all graphical | |
1204 displays not explicitely specified." | |
1205 :version "22.1" | |
1206 :type '(alist :key-type (choice (string :tag "Display name") | |
1207 (const :tag "Default" t)) | |
1208 :value-type (cons :tag "Dimensions" | |
1209 (integer :tag "Width") | |
1210 (integer :tag "Height"))) | |
1211 :group 'frames) | |
1212 | |
1195 (defun display-mm-height (&optional display) | 1213 (defun display-mm-height (&optional display) |
1196 "Return the height of DISPLAY's screen in millimeters. | 1214 "Return the height of DISPLAY's screen in millimeters. |
1215 System values can be overriden by `display-mm-dimensions-alist'. | |
1197 If the information is unavailable, value is nil." | 1216 If the information is unavailable, value is nil." |
1198 (and (memq (framep-on-display display) '(x w32 mac)) | 1217 (and (memq (framep-on-display display) '(x w32 mac)) |
1199 (x-display-mm-height display))) | 1218 (or (cddr (assoc (or display (frame-parameter nil 'display)) |
1219 display-mm-dimensions-alist)) | |
1220 (cddr (assoc t display-mm-dimensions-alist)) | |
1221 (x-display-mm-height display)))) | |
1200 | 1222 |
1201 (defun display-mm-width (&optional display) | 1223 (defun display-mm-width (&optional display) |
1202 "Return the width of DISPLAY's screen in millimeters. | 1224 "Return the width of DISPLAY's screen in millimeters. |
1225 System values can be overriden by `display-mm-dimensions-alist'. | |
1203 If the information is unavailable, value is nil." | 1226 If the information is unavailable, value is nil." |
1204 (and (memq (framep-on-display display) '(x w32 mac)) | 1227 (and (memq (framep-on-display display) '(x w32 mac)) |
1205 (x-display-mm-width display))) | 1228 (or (cadr (assoc (or display (frame-parameter nil 'display)) |
1229 display-mm-dimensions-alist)) | |
1230 (cadr (assoc t display-mm-dimensions-alist)) | |
1231 (x-display-mm-width display)))) | |
1206 | 1232 |
1207 (defun display-backing-store (&optional display) | 1233 (defun display-backing-store (&optional display) |
1208 "Return the backing store capability of DISPLAY's screen. | 1234 "Return the backing store capability of DISPLAY's screen. |
1209 The value may be `always', `when-mapped', `not-useful', or nil if | 1235 The value may be `always', `when-mapped', `not-useful', or nil if |
1210 the question is inapplicable to a certain kind of display." | 1236 the question is inapplicable to a certain kind of display." |