Synch to No Gnus 200510111141.

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

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 7fc874c..8a65702 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1,4 +1,5 @@
 ;;; gnus-util.el --- utility functions for Semi-gnus
+
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
@@ -39,9 +40,12 @@
   (require 'cl)
   ;; Fixme: this should be a gnus variable, not nnmail-.
   (defvar nnmail-pathname-coding-system)
+  (defvar nnmail-active-file-coding-system)
 
   ;; Inappropriate references to other parts of Gnus.
   (defvar gnus-emphasize-whitespace-regexp)
+  (defvar gnus-original-article-buffer)
+  (defvar gnus-user-agent)
   )
 
 (require 'time-date)
@@ -312,8 +316,8 @@ is slower."
 (defun gnus-completing-read-with-default (default prompt &rest args)
   ;; Like `completing-read', except that DEFAULT is the default argument.
   (let* ((prompt (if default
-                    (concat prompt " (default " default ") ")
-                  (concat prompt " ")))
+                    (concat prompt " (default " default "): ")
+                  (concat prompt ": ")))
         (answer (apply 'completing-read prompt args)))
     (if (or (null answer) (zerop (length answer)))
        default
@@ -1051,14 +1055,6 @@ This function saves the current buffer."
         (set-buffer gnus-group-buffer)
         (eq major-mode 'gnus-group-mode))))
 
-(defun gnus-remove-duplicates (list)
-  (let (new)
-    (while list
-      (or (member (car list) new)
-         (setq new (cons (car list) new)))
-      (setq list (cdr list)))
-    (nreverse new)))
-
 (defun gnus-remove-if (predicate list)
   "Return a copy of LIST with all items satisfying PREDICATE removed."
   (let (out)
@@ -1602,26 +1598,6 @@ empty directories from OLD-PATH."
   (defalias 'gnus-set-process-query-on-exit-flag
     'process-kill-without-query))
 
-(defun gnus-beginning-of-window ()
-  "Move point to the beginning of the window."
-  (move-to-window-line
-   (if (featurep 'xemacs)
-       0
-     (min scroll-margin
-         (max 1 (- (window-height)
-                   (if mode-line-format 1 0)
-                   (if header-line-format 1 0)))))))
-
-(defun gnus-end-of-window ()
-  "Move point to the end of the window."
-  (move-to-window-line
-   (if (featurep 'xemacs)
-       -1
-     (max (- -1 scroll-margin)
-         (- -1 (max 1 (- (window-height)
-                         (if mode-line-format 1 0)
-                         (if header-line-format 1 0))))))))
-
 (provide 'gnus-util)
 
 ;;; gnus-util.el ends here