Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-674
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-675
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-676
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-677
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-678
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-679
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-680
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-681
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-682
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-683
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-684
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-685
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-686
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-687
   Release ERC 5.2.

 * emacs@sv.gnu.org/emacs--devo--0--patch-688
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-689
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-690
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-691
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-692
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-693
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-694
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-695
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-696
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-697
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-698
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-699
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-700
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-701
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-209
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-210
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-211
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-212
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-213
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-214
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-215
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-601

1 files changed, 12 insertions, 8 deletions

diff --git a/src/macfns.c b/src/macfns.c
index c05906d6499..6ce4b66031e 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -3105,8 +3105,8 @@ If omitted or nil, that stands for the selected frame's display.  */)
      Lisp_Object display;
 {
   struct mac_display_info *dpyinfo = check_x_display_info (display);
+  float mm_per_pixel;
 
-  /* Only of the main display.  */
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
 #if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
   if (CGDisplayScreenSize != NULL)
@@ -3116,9 +3116,8 @@ If omitted or nil, that stands for the selected frame's display.  */)
 
       BLOCK_INPUT;
       size = CGDisplayScreenSize (kCGDirectMainDisplay);
+      mm_per_pixel = size.height / CGDisplayPixelsHigh (kCGDirectMainDisplay);
       UNBLOCK_INPUT;
-
-      return make_number ((int) (size.height + .5f));
     }
 #if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
   else
@@ -3127,9 +3126,11 @@ If omitted or nil, that stands for the selected frame's display.  */)
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 || MAC_OS_X_VERSION_MIN_REQUIRED == 1020
     {
       /* This is an approximation.  */
-      return make_number ((int) (dpyinfo->height * 25.4 / dpyinfo->resy));
+      mm_per_pixel = 25.4f / dpyinfo->resy;
     }
 #endif
+
+  return make_number ((int) (dpyinfo->height * mm_per_pixel + 0.5f));
 }
 
 DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0,
@@ -3141,8 +3142,8 @@ If omitted or nil, that stands for the selected frame's display.  */)
      Lisp_Object display;
 {
   struct mac_display_info *dpyinfo = check_x_display_info (display);
+  float mm_per_pixel;
 
-  /* Only of the main display.  */
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
 #if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
   if (CGDisplayScreenSize != NULL)
@@ -3152,9 +3153,8 @@ If omitted or nil, that stands for the selected frame's display.  */)
 
       BLOCK_INPUT;
       size = CGDisplayScreenSize (kCGDirectMainDisplay);
+      mm_per_pixel = size.width / CGDisplayPixelsWide (kCGDirectMainDisplay);
       UNBLOCK_INPUT;
-
-      return make_number ((int) (size.width + .5f));
     }
 #if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
   else
@@ -3163,9 +3163,11 @@ If omitted or nil, that stands for the selected frame's display.  */)
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 || MAC_OS_X_VERSION_MIN_REQUIRED == 1020
     {
       /* This is an approximation.  */
-      return make_number ((int) (dpyinfo->width * 25.4 / dpyinfo->resx));
+      mm_per_pixel = 25.4f / dpyinfo->resx;
     }
 #endif
+
+  return make_number ((int) (dpyinfo->width * mm_per_pixel + 0.5f));
 }
 
 DEFUN ("x-display-backing-store", Fx_display_backing_store,
@@ -4115,6 +4117,8 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
        doc: /* Show STRING in a "tooltip" window on frame FRAME.
 A tooltip window is a small window displaying a string.
 
+This is an internal function; Lisp code should call `tooltip-show'.
+
 FRAME nil or omitted means use the selected frame.
 
 PARMS is an optional list of frame parameters which can be used to