Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-240
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-241
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-242
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-244
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-245
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-59
   Update from CVS

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

1 files changed, 6 insertions, 5 deletions

diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 5b26ea636ac..d9de658c158 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -125,7 +125,7 @@
 
 (defun xterm-rgb-convert-to-16bit (prim)
   "Convert an 8-bit primary color value PRIM to a corresponding 16-bit value."
-  (min 65535 (round (* (/ prim 255.0) 65535.0))))
+  (logior prim (lsh prim 8)))
 
 (defun xterm-register-default-colors ()
   "Register the default set of colors for xterm or compatible emulator.
@@ -162,9 +162,10 @@ versions of xterm."
             (tty-color-define (format "color-%d" (- 256 ncolors))
                               (- 256 ncolors)
                               (mapcar 'xterm-rgb-convert-to-16bit
-                                      (list (round (* r 42.5))
-                                            (round (* g 42.5))
-                                            (round (* b 42.5)))))
+                                      (list (if (zerop r) 0 (+ (* r 40) 55))
+                                            (if (zerop g) 0 (+ (* g 40) 55))
+                                            (if (zerop b) 0 (+ (* b 40) 55)))))
+
             (setq b (1+ b))
             (if (> b 5)
                 (setq g (1+ g)
@@ -202,7 +203,7 @@ versions of xterm."
         ;; Now the 8 gray colors
         (while (> ncolors 0)
           (setq color (xterm-rgb-convert-to-16bit
-                       (round
+                       (floor
                         (if (= ncolors 8)
                             46.36363636
                           (+ (* (- 8 ncolors) 23.18181818) 69.54545454)))))