Mercurial > emacs
diff lisp/frame.el @ 83389:732c5740ca8f
Merged from miles@gnu.org--gnu-2005 (patch 610-614)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-610
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-611
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-612
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-613
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-614
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-429
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 23 Oct 2005 22:47:29 +0000 |
| parents | 0181341f0aca 737f713709af |
| children | 201f610eb492 |
line wrap: on
line diff
--- a/lisp/frame.el Sun Oct 23 22:17:49 2005 +0000 +++ b/lisp/frame.el Sun Oct 23 22:47:29 2005 +0000 @@ -1132,9 +1132,9 @@ "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) @@ -1342,7 +1342,7 @@ :init-value (not (or noninteractive no-blinking-cursor (eq system-type 'ms-dos) - (not (memq initial-window-system '(x w32))))) + (not (memq initial-window-system '(x w32 mac))))) :initialize 'custom-initialize-safe-default :group 'cursor :global t