Synch with Oort Gnus.

[elisp/gnus.git-] / lisp / gnus-xmas.el

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 9e24273..cee9ee9 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -82,16 +82,6 @@ Possibly the `etc' directory has not been installed.")))
   (cdr (assq gnus-xmas-logo-color-style gnus-xmas-logo-color-alist))
   "Colors used for the Gnus logo.")
 
-(defcustom gnus-article-x-face-command
-  (if (or (featurep 'xface)
-         (featurep 'xpm))
-      'gnus-xmas-article-display-xface
-    "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | ee -")
-  "*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."
-  :type '(choice string function))
-
 ;;; Internal variables.
 
 ;; Don't warn about these undefined variables.
@@ -466,11 +456,11 @@ call it with the value of the `gnus-data' text property."
   (defalias 'gnus-group-startup-message 'gnus-xmas-group-startup-message)
   (defalias 'gnus-tree-minimize 'gnus-xmas-tree-minimize)
   (defalias 'gnus-appt-select-lowest-window
-       'gnus-xmas-appt-select-lowest-window)
+    'gnus-xmas-appt-select-lowest-window)
   (defalias 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names)
   (defalias 'gnus-character-to-event 'character-to-event)
   (defalias 'gnus-mode-line-buffer-identification
-       'gnus-xmas-mode-line-buffer-identification)
+    'gnus-xmas-mode-line-buffer-identification)
   (defalias 'gnus-key-press-event-p 'key-press-event-p)
   (defalias 'gnus-region-active-p 'region-active-p)
   (defalias 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p)
@@ -541,29 +531,7 @@ the resulting string may be narrower than END-COLUMN.
          (setq str (substring str from-idx idx))
          (if padding
              (concat head-padding str tail-padding)
-           str))))
-
-    (defun gnus-tilde-pad-form (el pad-width)
-      "Return a form that pads EL to PAD-WIDTH."
-      (let ((pad (abs pad-width)))
-       (if (symbolp el)
-           (if (< pad-width 0)
-               `(let ((val (format "%s" ,el)))
-                  (concat val (make-string
-                               (max 0 (- ,pad (string-width val))) ?\ )))
-             `(let ((val (format "%s" ,el)))
-                (concat (make-string
-                         (max 0 (- ,pad (string-width val))) ?\ )
-                        val)))
-         (if (< pad-width 0)
-             `(let ((val (eval ,el)))
-                (concat val (make-string
-                             (max 0 (- ,pad (string-width val))) ?\ )))
-           `(let ((val (eval ,el)))
-              (concat (make-string
-                       (max 0 (- ,pad (string-width val))) ?\ )
-                      val))))))
-    ))
+           str))))))
 
 ;;; XEmacs logo and toolbar.
 
@@ -958,7 +926,7 @@ XEmacs compatibility workaround."
 
 (defun gnus-xmas-mailing-list-menu-add ()
   (gnus-xmas-menu-add mailing-list
-                     gnus-mailing-list-menu))
+    gnus-mailing-list-menu))
 
 (provide 'gnus-xmas)