diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/frame.el | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5bbfe1a6ff7..3839375c6dc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-05-09 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * frame.el (display-monitor-attributes-list): Add NS case. | ||
| 4 | (ns-display-monitor-attributes-list): Declare. | ||
| 5 | |||
| 1 | 2013-05-09 Ulrich Mueller <ulm@gentoo.org> | 6 | 2013-05-09 Ulrich Mueller <ulm@gentoo.org> |
| 2 | 7 | ||
| 3 | * descr-text.el (describe-char): Fix %d/%x typo. (Bug#14360) | 8 | * descr-text.el (describe-char): Fix %d/%x typo. (Bug#14360) |
diff --git a/lisp/frame.el b/lisp/frame.el index 94a4842fc4e..e1a55bdffc4 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -1495,6 +1495,8 @@ The value is one of the symbols `static-gray', `gray-scale', | |||
| 1495 | 1495 | ||
| 1496 | (declare-function x-display-monitor-attributes-list "xfns.c" | 1496 | (declare-function x-display-monitor-attributes-list "xfns.c" |
| 1497 | (&optional terminal)) | 1497 | (&optional terminal)) |
| 1498 | (declare-function ns-display-monitor-attributes-list "nsfns.c" | ||
| 1499 | (&optional terminal)) | ||
| 1498 | 1500 | ||
| 1499 | (defun display-monitor-attributes-list (&optional display) | 1501 | (defun display-monitor-attributes-list (&optional display) |
| 1500 | "Return a list of physical monitor attributes on DISPLAY. | 1502 | "Return a list of physical monitor attributes on DISPLAY. |
| @@ -1528,6 +1530,8 @@ monitors." | |||
| 1528 | (cond | 1530 | (cond |
| 1529 | ((eq frame-type 'x) | 1531 | ((eq frame-type 'x) |
| 1530 | (x-display-monitor-attributes-list display)) | 1532 | (x-display-monitor-attributes-list display)) |
| 1533 | ((eq frame-type 'ns) | ||
| 1534 | (ns-display-monitor-attributes-list display)) | ||
| 1531 | (t | 1535 | (t |
| 1532 | (let ((geometry (list 0 0 (display-pixel-width display) | 1536 | (let ((geometry (list 0 0 (display-pixel-width display) |
| 1533 | (display-pixel-height display)))) | 1537 | (display-pixel-height display)))) |