diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-10-21 08:27:14 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-10-21 08:27:14 +0000 |
| commit | bb9404d64bbd1774a87b6effc11c4b667c2e18d6 (patch) | |
| tree | b2cafd2f9f9b4ea83b138de855539469e16dcd43 /lisp | |
| parent | 06b4a81bb402dac279a389ce8adae48db16b6db8 (diff) | |
| download | emacs-bb9404d64bbd1774a87b6effc11c4b667c2e18d6.tar.gz | |
(display-screens): Use x-display-screens also on Mac.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/frame.el | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fbd8b74ec3c..18f785b2c15 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/frame.el b/lisp/frame.el index bd4d7ad5288..46e6e742d7c 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -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) |