mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

(display-screens): Use x-display-screens also on Mac.

Browse source
This commit is contained in:
YAMAMOTO Mitsuharu 2005-10-21 08:27:14 +00:00
parent 06b4a81bb4
commit bb9404d64b
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/ChangeLog
View file

@ -1,3 +1,15 @@
2005-10-21 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* cus-face.el (custom-declare-face): Make face from X resources
also on Mac.
* disp-table.el (standard-display-g1, standard-display-graphic):
Refuse to use string glyphs also on Mac.
(standard-display-european): Don't set terminal coding system also
on Mac.
* frame.el (display-screens): Use x-display-screens also on Mac.
2005-10-21 Romain Francoise <romain@orebokech.com>
* net/rcirc.el: Now part of GNU Emacs. Update FSF's address.

4
lisp/frame.el
View file

@ -1053,9 +1053,9 @@ frame's display)."
"Return the number of screens associated with DISPLAY."
(let ((frame-type (framep-on-display display)))
(cond
((memq frame-type '(x w32))
((memq frame-type '(x w32 mac))
(x-display-screens display))
(t ;; FIXME: is this correct for the Mac?
(t
1))))
(defun display-pixel-height (&optional display)