[Emacs-diffs] Changes to emacs/lisp/term/xterm.el

[Dan Nicolaescu]

Index: emacs/lisp/term/xterm.el
diff -c emacs/lisp/term/xterm.el:1.11 emacs/lisp/term/xterm.el:1.12
*** emacs/lisp/term/xterm.el:1.11       Wed Apr  6 21:38:34 2005
--- emacs/lisp/term/xterm.el    Sat Apr  9 15:25:50 2005
***************
*** 123,129 ****
  
  (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))))
  
  (defun xterm-register-default-colors ()
    "Register the default set of colors for xterm or compatible emulator.
--- 123,129 ----
  
  (defun xterm-rgb-convert-to-16bit (prim)
    "Convert an 8-bit primary color value PRIM to a corresponding 16-bit value."
!   (logior prim (lsh prim 8)))
  
  (defun xterm-register-default-colors ()
    "Register the default set of colors for xterm or compatible emulator.
***************
*** 160,168 ****
            (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)))))
            (setq b (1+ b))
            (if (> b 5)
                (setq g (1+ g)
--- 160,169 ----
            (tty-color-define (format "color-%d" (- 256 ncolors))
                              (- 256 ncolors)
                              (mapcar 'xterm-rgb-convert-to-16bit
!                                     (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)
***************
*** 200,206 ****
        ;; Now the 8 gray colors
        (while (> ncolors 0)
          (setq color (xterm-rgb-convert-to-16bit
!                      (round
                        (if (= ncolors 8)
                            46.36363636
                          (+ (* (- 8 ncolors) 23.18181818) 69.54545454)))))
--- 201,207 ----
        ;; Now the 8 gray colors
        (while (> ncolors 0)
          (setq color (xterm-rgb-convert-to-16bit
!                      (floor
                        (if (= ncolors 8)
                            46.36363636
                          (+ (* (- 8 ncolors) 23.18181818) 69.54545454)))))