*** empty log message ***

[gnus] / lisp / gnus-ems.el

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 34ef6c4..f0a40e6 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -29,18 +29,6 @@
 
 (defvar gnus-mouse-2 [mouse-2])
 
-(defalias 'gnus-make-overlay 'make-overlay)
-(defalias 'gnus-overlay-put 'overlay-put)
-(defalias 'gnus-move-overlay 'move-overlay)
-(defalias 'gnus-overlay-end 'overlay-end)
-(defalias 'gnus-extent-detached-p 'ignore)
-(defalias 'gnus-group-remove-excess-properties 'ignore)
-(defalias 'gnus-topic-remove-excess-properties 'ignore)
-(defalias 'gnus-extent-start-open 'ignore)
-(defalias 'gnus-set-text-properties 'set-text-properties)
-(defalias 'gnus-appt-select-lowest-window 'appt-select-lowest-window)
-(defalias 'gnus-mail-strip-quoted-names 'mail-strip-quoted-names)
-
 (eval-and-compile 
   (autoload 'gnus-xmas-define "gnus-xmas")
   (autoload 'gnus-xmas-redefine "gnus-xmas")
@@ -51,21 +39,6 @@
 
 ;;; Mule functions.
 
-(defun gnus-mule-truncate-string (str width)
-  (let ((w (string-width str))
-       (col 0) (idx 0) (p-idx 0) chr)
-    (if (<= w width)
-       str
-      (while (< col width)
-       (setq chr (aref str idx)
-             col (+ col (char-width chr))
-             p-idx idx
-             idx (+ idx (char-bytes chr))
-             ))
-      (substring str 0 (if (= col width)
-                          idx
-                        p-idx)))))
-
 (defun gnus-mule-cite-add-face (number prefix face)
   ;; At line NUMBER, ignore PREFIX and add FACE to the rest of the line.
   (if face
@@ -88,7 +61,7 @@
            (valstr (if (numberp val)
                        (int-to-string val) val)))
        (if (> (length valstr) (, max-width))
-          (gnus-truncate-string valstr (, max-width))
+          (truncate-string valstr (, max-width))
         valstr))))
 
 (eval-and-compile
@@ -98,6 +71,12 @@
     (defvar gnus-mouse-face-prop 'mouse-face
       "Property used for highlighting mouse regions.")
 
+    (defvar gnus-article-x-face-command
+      "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | xv -quit -"
+      "String or function to be executed to display an X-Face header.
+If it is a string, the command will be executed in a sub-shell
+asynchronously.         The compressed face will be piped to this command.")
+
     ;; Added by Per Abrahamsen <amanda@iesd.auc.dk>.
     (defvar gnus-display-type 
       (condition-case nil
@@ -126,7 +105,7 @@ pounce directly on the real variables themselves.")
                  ((and (cdr (assq 'background-color params))
                        (< (apply '+ (x-color-values
                                      (cdr (assq 'background-color params))))
-                          (/ (apply '+ (x-color-values "white")) 3)))
+                          (* (apply '+ (x-color-values "white")) .6)))
                   'dark)
                  (t 'light)))
        (error 'light))
@@ -181,7 +160,7 @@ pounce directly on the real variables themselves."))
 (eval-and-compile
   (let ((case-fold-search t))
     (cond
-     ((string-match "windows-nt\\|os/2" (format "%s" system-type))
+     ((string-match "windows-nt\\|os/2\\|emx" (format "%s" system-type))
       (setq nnheader-file-name-translation-alist
            (append nnheader-file-name-translation-alist
                    '((?: . ?_)
@@ -204,11 +183,10 @@ pounce directly on the real variables themselves."))
 
    ((boundp 'MULE)
     ;; Mule definitions
-    (defalias 'gnus-truncate-string
-      (if (fboundp 'truncate-string)
-         'truncate-string 'gnus-mule-truncate-string))
+    (defalias 'gnus-truncate-string 'truncate-string)
 
-    (fset 'gnus-summary-make-display-table (lambda () nil))
+    (defvar gnus-summary-display-table nil
+      "Display table used in summary mode buffers.")
     (fset 'gnus-cite-add-face 'gnus-mule-cite-add-face)
     (fset 'gnus-max-width-function 'gnus-mule-max-width-function)
     
@@ -228,7 +206,7 @@ pounce directly on the real variables themselves."))
          (format "%4d: %-20s" 
                  gnus-tmp-lines 
                  (if (> (length gnus-tmp-name) 20) 
-                     (gnus-truncate-string gnus-tmp-name 20) 
+                     (truncate-string gnus-tmp-name 20) 
                    gnus-tmp-name))
          gnus-tmp-closing-bracket)
         (point))