X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-util.el;h=cba9137d8bee941b4b324b0867fa0b64f45184dc;hb=350392837795fde1f53e87f0f9402224a78c122b;hp=e844fa77b11042732530b39a3d0adf2aaa5d3e15;hpb=73c6f05af6afc303948a77bc5c94412a480e2164;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index e844fa7..cba9137 100644
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1,9 +1,8 @@
-;;; gnus-util.el --- utility functions for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-;;        Free Software Foundation, Inc.
+;;; gnus-util.el --- utility functions for Semi-gnus
+;; Copyright (C) 1996,97,98 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;; Keywords: news
+;; Keywords: mail, news, MIME
 
 ;; This file is part of GNU Emacs.
 
@@ -32,42 +31,20 @@
 ;;; Code:
 
 (require 'custom)
-(eval-when-compile
-  (require 'cl)
-  ;; Fixme: this should be a gnus variable, not nnmail-.
-  (defvar nnmail-pathname-coding-system))
+(eval-when-compile (require 'cl))
 (require 'nnheader)
-(require 'time-date)
-(require 'netrc)
+(require 'timezone)
+(require 'message)
+(eval-when-compile
+  (when (locate-library "rmail")
+    (require 'rmail)))
 
 (eval-and-compile
-  (autoload 'message-fetch-field "message")
-  (autoload 'gnus-get-buffer-window "gnus-win")
+  (autoload 'nnmail-date-to-time "nnmail")
   (autoload 'rmail-insert-rmail-file-header "rmail")
   (autoload 'rmail-count-new-messages "rmail")
   (autoload 'rmail-show-message "rmail"))
 
-(eval-and-compile
-  (cond
-   ((fboundp 'replace-in-string)
-    (defalias 'gnus-replace-in-string 'replace-in-string))
-   ((fboundp 'replace-regexp-in-string)
-    (defun gnus-replace-in-string  (string regexp newtext &optional literal)
-      (replace-regexp-in-string regexp newtext string nil literal)))
-   (t
-    (defun gnus-replace-in-string (string regexp newtext &optional literal)
-      (let ((start 0) tail)
-	(while (string-match regexp string start)
-	  (setq tail (- (length string) (match-end 0)))
-	  (setq string (replace-match newtext nil literal string))
-	  (setq start (- (length string) tail))))
-      string))))
-
-;;; bring in the netrc functions as aliases
-(defalias 'gnus-netrc-get 'netrc-get)
-(defalias 'gnus-netrc-machine 'netrc-machine)
-(defalias 'gnus-parse-netrc 'netrc-parse)
-
 (defun gnus-boundp (variable)
   "Return non-nil if VARIABLE is bound and non-nil."
   (and (boundp variable)
@@ -76,20 +53,20 @@
 (defmacro gnus-eval-in-buffer-window (buffer &rest forms)
   "Pop to BUFFER, evaluate FORMS, and then return to the original window."
   (let ((tempvar (make-symbol "GnusStartBufferWindow"))
-	(w (make-symbol "w"))
-	(buf (make-symbol "buf")))
+        (w (make-symbol "w"))
+        (buf (make-symbol "buf")))
     `(let* ((,tempvar (selected-window))
-	    (,buf ,buffer)
-	    (,w (gnus-get-buffer-window ,buf 'visible)))
+            (,buf ,buffer)
+            (,w (get-buffer-window ,buf 'visible)))
        (unwind-protect
-	   (progn
-	     (if ,w
-		 (progn
-		   (select-window ,w)
-		   (set-buffer (window-buffer ,w)))
-	       (pop-to-buffer ,buf))
-	     ,@forms)
-	 (select-window ,tempvar)))))
+           (progn
+             (if ,w
+                 (progn
+                   (select-window ,w)
+                   (set-buffer (window-buffer ,w)))
+               (pop-to-buffer ,buf))
+             ,@forms)
+         (select-window ,tempvar)))))
 
 (put 'gnus-eval-in-buffer-window 'lisp-indent-function 1)
 (put 'gnus-eval-in-buffer-window 'edebug-form-spec '(form body))
@@ -101,6 +78,12 @@
 	 (set symbol nil))
      symbol))
 
+;; Avoid byte-compile warning.
+;; In Mule, this function will be redefined to `truncate-string',
+;; which takes 3 or 4 args.
+(defun gnus-truncate-string (str width &rest ignore)
+  (substring str 0 width))
+
 ;; Added by Geoffrey T. Dairiki <dairiki@u.washington.edu>.  A safe way
 ;; to limit the length of a string.  This function is necessary since
 ;; `(substr "abc" 0 30)' pukes with "Args out of range".
@@ -127,19 +110,27 @@
 (defmacro gnus-kill-buffer (buffer)
   `(let ((buf ,buffer))
      (when (gnus-buffer-exists-p buf)
-       (when (boundp 'gnus-buffers)
-	 (setq gnus-buffers (delete (get-buffer buf) gnus-buffers)))
        (kill-buffer buf))))
 
-(defalias 'gnus-point-at-bol
-  (if (fboundp 'point-at-bol)
-      'point-at-bol
-    'line-beginning-position))
-
-(defalias 'gnus-point-at-eol
-  (if (fboundp 'point-at-eol)
-      'point-at-eol
-    'line-end-position))
+(if (fboundp 'point-at-bol)
+    (fset 'gnus-point-at-bol 'point-at-bol)
+  (defun gnus-point-at-bol ()
+    "Return point at the beginning of the line."
+    (let ((p (point)))
+      (beginning-of-line)
+      (prog1
+	  (point)
+	(goto-char p)))))
+
+(if (fboundp 'point-at-eol)
+    (fset 'gnus-point-at-eol 'point-at-eol)
+  (defun gnus-point-at-eol ()
+    "Return point at the end of the line."
+    (let ((p (point)))
+      (end-of-line)
+      (prog1
+	  (point)
+	(goto-char p)))))
 
 (defun gnus-delete-first (elt list)
   "Delete by side effect the first occurrence of ELT as a member of LIST."
@@ -180,7 +171,7 @@
 	 (string-match (concat "[ \t]*<" (regexp-quote address) ">") from)
 	 (and (setq name (substring from 0 (match-beginning 0)))
 	      ;; Strip any quotes from the name.
-	      (string-match "^\".*\"$" name)
+	      (string-match "\".*\"" name)
 	      (setq name (substring name 1 (1- (match-end 0))))))
     ;; If not, then "address (name)" is used.
     (or name
@@ -193,8 +184,8 @@
 	(and (string-match "(.*" from)
 	     (setq name (substring from (1+ (match-beginning 0))
 				   (match-end 0)))))
-    (list (if (string= name "") nil name) (or address from))))
-
+    ;; Fix by Hallvard B Furuseth <h.b.furuseth@usit.uio.no>.
+    (list (or name from) (or address from))))
 
 (defun gnus-fetch-field (field)
   "Return the value of the header FIELD of current article."
@@ -207,18 +198,7 @@
 
 (defun gnus-goto-colon ()
   (beginning-of-line)
-  (let ((eol (gnus-point-at-eol)))
-    (goto-char (or (text-property-any (point) eol 'gnus-position t)
-		   (search-forward ":" eol t)
-		   (point)))))
-
-(defun gnus-decode-newsgroups (newsgroups group &optional method)
-  (let ((method (or method (gnus-find-method-for-group group))))
-    (mapconcat (lambda (group)
-		 (gnus-group-name-decode group (gnus-group-name-charset
-						method group)))
-	       (message-tokenize-header newsgroups)
-	       ",")))
+  (search-forward ":" (gnus-point-at-eol) t))
 
 (defun gnus-remove-text-with-property (prop)
   "Delete all text in the current buffer with text property PROP."
@@ -229,17 +209,22 @@
 	(delete-char 1))
       (goto-char (next-single-property-change (point) prop nil (point-max))))))
 
-(require 'nnheader)
 (defun gnus-newsgroup-directory-form (newsgroup)
   "Make hierarchical directory name from NEWSGROUP name."
-  (let* ((newsgroup (gnus-newsgroup-savable-name newsgroup))
-	 (idx (string-match ":" newsgroup)))
-    (concat
-     (if idx (substring newsgroup 0 idx))
-     (if idx "/")
-     (nnheader-replace-chars-in-string
-      (if idx (substring newsgroup (1+ idx)) newsgroup)
-      ?. ?/))))
+  (let ((newsgroup (gnus-newsgroup-savable-name newsgroup))
+	(len (length newsgroup))
+	idx)
+    ;; If this is a foreign group, we don't want to translate the
+    ;; entire name.
+    (if (setq idx (string-match ":" newsgroup))
+	(aset newsgroup idx ?/)
+      (setq idx 0))
+    ;; Replace all occurrences of `.' with `/'.
+    (while (< idx len)
+      (when (= (aref newsgroup idx) ?.)
+	(aset newsgroup idx ?/))
+      (setq idx (1+ idx)))
+    newsgroup))
 
 (defun gnus-newsgroup-savable-name (group)
   ;; Replace any slashes in a group name (eg. an ange-ftp nndoc group)
@@ -252,6 +237,43 @@
 
 ;;; Time functions.
 
+(defun gnus-days-between (date1 date2)
+  ;; Return the number of days between date1 and date2.
+  (- (gnus-day-number date1) (gnus-day-number date2)))
+
+(defun gnus-day-number (date)
+  (let ((dat (mapcar (lambda (s) (and s (string-to-int s)) )
+		     (timezone-parse-date date))))
+    (timezone-absolute-from-gregorian
+     (nth 1 dat) (nth 2 dat) (car dat))))
+
+(defun gnus-time-to-day (time)
+  "Convert TIME to day number."
+  (let ((tim (decode-time time)))
+    (timezone-absolute-from-gregorian
+     (nth 4 tim) (nth 3 tim) (nth 5 tim))))
+
+(defun gnus-encode-date (date)
+  "Convert DATE to internal time."
+  (let* ((parse (timezone-parse-date date))
+	 (date (mapcar (lambda (d) (and d (string-to-int d))) parse))
+	 (time (mapcar 'string-to-int (timezone-parse-time (aref parse 3)))))
+    (encode-time (caddr time) (cadr time) (car time)
+		 (caddr date) (cadr date) (car date)
+		 (* 60 (timezone-zone-to-minute (nth 4 date))))))
+
+(defun gnus-time-minus (t1 t2)
+  "Subtract two internal times."
+  (let ((borrow (< (cadr t1) (cadr t2))))
+    (list (- (car t1) (car t2) (if borrow 1 0))
+	  (- (+ (if borrow 65536 0) (cadr t1)) (cadr t2)))))
+
+(defun gnus-time-less (t1 t2)
+  "Say whether time T1 is less than time T2."
+  (or (< (car t1) (car t2))
+      (and (= (car t1) (car t2))
+	   (< (nth 1 t1) (nth 1 t2)))))
+
 (defun gnus-file-newer-than (file date)
   (let ((fdate (nth 5 (file-attributes file))))
     (or (> (car fdate) (car date))
@@ -302,7 +324,7 @@
 	  (define-key keymap key (pop plist))
 	(pop plist)))))
 
-(defun gnus-completing-read-with-default (default prompt &rest args)
+(defun gnus-completing-read (default prompt &rest args)
   ;; Like `completing-read', except that DEFAULT is the default argument.
   (let* ((prompt (if default
 		     (concat prompt " (default " default ") ")
@@ -324,83 +346,22 @@
       (yes-or-no-p prompt)
     (message "")))
 
-;; By Frank Schmitt <ich@Frank-Schmitt.net>. Allows to have
-;; age-depending date representations. (e.g. just the time if it's
-;; from today, the day of the week if it's within the last 7 days and
-;; the full date if it's older)
-(defun gnus-seconds-today ()
-  "Returns the number of seconds passed today"
-  (let ((now (decode-time (current-time))))
-    (+ (car now) (* (car (cdr now)) 60) (* (car (nthcdr 2 now)) 3600))))
-
-(defun gnus-seconds-month ()
-  "Returns the number of seconds passed this month"
-  (let ((now (decode-time (current-time))))
-    (+ (car now) (* (car (cdr now)) 60) (* (car (nthcdr 2 now)) 3600)
-       (* (- (car (nthcdr 3 now)) 1) 3600 24))))
-
-(defun gnus-seconds-year ()
-  "Returns the number of seconds passed this year"
-  (let ((now (decode-time (current-time)))
-	(days (format-time-string "%j" (current-time))))
-    (+ (car now) (* (car (cdr now)) 60) (* (car (nthcdr 2 now)) 3600)
-       (* (- (string-to-number days) 1) 3600 24))))
-
-(defvar gnus-user-date-format-alist
-  '(((gnus-seconds-today) . "%k:%M")
-    (604800 . "%a %k:%M")                   ;;that's one week
-    ((gnus-seconds-month) . "%a %d")
-    ((gnus-seconds-year) . "%b %d")
-    (t . "%b %d '%y"))                      ;;this one is used when no
-					    ;;other does match
-  "Specifies date format depending on age of article.
-This is an alist of items (AGE . FORMAT).  AGE can be a number (of
-seconds) or a Lisp expression evaluating to a number.  When the age of
-the article is less than this number, then use `format-time-string'
-with the corresponding FORMAT for displaying the date of the article.
-If AGE is not a number or a Lisp expression evaluating to a
-non-number, then the corresponding FORMAT is used as a default value.
-
-Note that the list is processed from the beginning, so it should be
-sorted by ascending AGE.  Also note that items following the first
-non-number AGE will be ignored.
-
-You can use the functions `gnus-seconds-today', `gnus-seconds-month'
-and `gnus-seconds-year' in the AGE spec.  They return the number of
-seconds passed since the start of today, of this month, of this year,
-respectively.")
-
-(defun gnus-user-date (messy-date)
-  "Format the messy-date acording to gnus-user-date-format-alist.
-Returns \"  ?  \" if there's bad input or if an other error occurs.
-Input should look like this: \"Sun, 14 Oct 2001 13:34:39 +0200\"."
-  (condition-case ()
-      (let* ((messy-date (safe-date-to-time messy-date))
-	     (now (current-time))
-	     ;;If we don't find something suitable we'll use this one
-	     (my-format "%b %m '%y")
-	     (high (lsh (- (car now) (car messy-date)) 16)))
-	(if (and (> high -1) (= (logand high 65535) 0))
-	    ;;overflow and bad input
-	    (let* ((difference (+ high (- (car (cdr now))
-					  (car (cdr messy-date)))))
-		   (templist gnus-user-date-format-alist)
-		   (top (eval (caar templist))))
-	      (while (if (numberp top) (< top difference) (not top))
-		(progn
-		  (setq templist (cdr templist))
-		  (setq top (eval (caar templist)))))
-	      (if (stringp (cdr (car templist)))
-		  (setq my-format (cdr (car templist))))))
-	(format-time-string (eval my-format) messy-date))
-    (error "  ?   ")))
-;;end of Frank's code
-
 (defun gnus-dd-mmm (messy-date)
   "Return a string like DD-MMM from a big messy string."
-  (condition-case ()
-      (format-time-string "%d-%b" (safe-date-to-time messy-date))
-    (error "  -   ")))
+  (let ((datevec (ignore-errors (timezone-parse-date messy-date))))
+    (if (or (not datevec)
+	    (string-equal "0" (aref datevec 1)))
+	"??-???"
+      (format "%2s-%s"
+	      (condition-case ()
+		  ;; Make sure leading zeroes are stripped.
+		  (number-to-string (string-to-number (aref datevec 2)))
+		(error "??"))
+	      (capitalize
+	       (or (car
+		    (nth (1- (string-to-number (aref datevec 1)))
+			 timezone-months-assoc))
+		   "???"))))))
 
 (defmacro gnus-date-get-time (date)
   "Convert DATE string to Emacs time.
@@ -411,24 +372,30 @@ Cache the result as a text property stored in DATE."
 	 '(0 0)
        (or (get-text-property 0 'gnus-time d)
 	   ;; or compute the value...
-	   (let ((time (safe-date-to-time d)))
+	   (let ((time (nnmail-date-to-time d)))
 	     ;; and store it back in the string.
 	     (put-text-property 0 1 'gnus-time time d)
 	     time)))))
 
 (defsubst gnus-time-iso8601 (time)
-  "Return a string of TIME in YYYYMMDDTHHMMSS format."
+  "Return a string of TIME in YYMMDDTHHMMSS format."
   (format-time-string "%Y%m%dT%H%M%S" time))
 
 (defun gnus-date-iso8601 (date)
-  "Convert the DATE to YYYYMMDDTHHMMSS."
+  "Convert the DATE to YYMMDDTHHMMSS."
   (condition-case ()
       (gnus-time-iso8601 (gnus-date-get-time date))
     (error "")))
 
 (defun gnus-mode-string-quote (string)
   "Quote all \"%\"'s in STRING."
-  (gnus-replace-in-string string "%" "%%"))
+  (save-excursion
+    (gnus-set-work-buffer)
+    (insert string)
+    (goto-char (point-min))
+    (while (search-forward "%" nil t)
+      (insert "%"))
+    (buffer-string)))
 
 ;; Make a hash table (default and minimum size is 256).
 ;; Optional argument HASHSIZE specifies the table size.
@@ -484,25 +451,21 @@ jabbering all the time."
   "Return a list of Message-IDs in REFERENCES."
   (let ((beg 0)
 	ids)
-    (while (string-match "<[^<]+[^< \t]" references beg)
+    (while (string-match "<[^>]+>" references beg)
       (push (substring references (match-beginning 0) (setq beg (match-end 0)))
 	    ids))
     (nreverse ids)))
 
-(defsubst gnus-parent-id (references &optional n)
+(defun gnus-parent-id (references &optional n)
   "Return the last Message-ID in REFERENCES.
 If N, return the Nth ancestor instead."
-  (when (and references
-	     (not (zerop (length references))))
-    (if n
-	(let ((ids (inline (gnus-split-references references))))
-	  (while (nthcdr n ids)
-	    (setq ids (cdr ids)))
-	  (car ids))
-      (when (string-match "\\(<[^<]+>\\)[ \t]*\\'" references)
-	(match-string 1 references)))))
-
-(defun gnus-buffer-live-p (buffer)
+  (when references
+    (let ((ids (inline (gnus-split-references references))))
+      (while (nthcdr (or n 1) ids)
+	(setq ids (cdr ids)))
+      (car ids))))
+
+(defsubst gnus-buffer-live-p (buffer)
   "Say whether BUFFER is alive or not."
   (and buffer
        (get-buffer buffer)
@@ -511,9 +474,9 @@ If N, return the Nth ancestor instead."
 (defun gnus-horizontal-recenter ()
   "Recenter the current buffer horizontally."
   (if (< (current-column) (/ (window-width) 2))
-      (set-window-hscroll (gnus-get-buffer-window (current-buffer) t) 0)
+      (set-window-hscroll (get-buffer-window (current-buffer) t) 0)
     (let* ((orig (point))
-	   (end (window-end (gnus-get-buffer-window (current-buffer) t)))
+	   (end (window-end (get-buffer-window (current-buffer) t)))
 	   (max 0))
       (when end
 	;; Find the longest line currently displayed in the window.
@@ -527,21 +490,33 @@ If N, return the Nth ancestor instead."
 	;; Scroll horizontally to center (sort of) the point.
 	(if (> max (window-width))
 	    (set-window-hscroll
-	     (gnus-get-buffer-window (current-buffer) t)
+	     (get-buffer-window (current-buffer) t)
 	     (min (- (current-column) (/ (window-width) 3))
 		  (+ 2 (- max (window-width)))))
-	  (set-window-hscroll (gnus-get-buffer-window (current-buffer) t) 0))
+	  (set-window-hscroll (get-buffer-window (current-buffer) t) 0))
 	max))))
 
-(defun gnus-read-event-char (&optional prompt)
+(defun gnus-read-event-char ()
   "Get the next event."
-  (let ((event (read-event prompt)))
+  (let ((event (read-event)))
     ;; should be gnus-characterp, but this can't be called in XEmacs anyway
     (cons (and (numberp event) event) event)))
 
 (defun gnus-sortable-date (date)
-  "Make string suitable for sorting from DATE."
-  (gnus-time-iso8601 (date-to-time date)))
+  "Make sortable string by string-lessp from DATE.
+Timezone package is used."
+  (condition-case ()
+      (progn
+	(setq date (inline (timezone-fix-time
+			    date nil
+			    (aref (inline (timezone-parse-date date)) 4))))
+	(inline
+	  (timezone-make-sortable-date
+	   (aref date 0) (aref date 1) (aref date 2)
+	   (inline
+	     (timezone-make-time-string
+	      (aref date 3) (aref date 4) (aref date 5))))))
+    (error "")))
 
 (defun gnus-copy-file (file &optional to)
   "Copy FILE to TO."
@@ -555,6 +530,14 @@ If N, return the Nth ancestor instead."
 		     (file-name-nondirectory file))))
   (copy-file file to))
 
+(defun gnus-kill-all-overlays ()
+  "Delete all overlays in the current buffer."
+  (let* ((overlayss (overlay-lists))
+	 (buffer-read-only nil)
+	 (overlays (delq nil (nconc (car overlayss) (cdr overlayss)))))
+    (while overlays
+      (delete-overlay (pop overlays)))))
+
 (defvar gnus-work-buffer " *gnus work*")
 
 (defun gnus-set-work-buffer ()
@@ -565,7 +548,7 @@ If N, return the Nth ancestor instead."
 	(erase-buffer))
     (set-buffer (gnus-get-buffer-create gnus-work-buffer))
     (kill-all-local-variables)
-    (mm-enable-multibyte)))
+    (buffer-disable-undo (current-buffer))))
 
 (defmacro gnus-group-real-name (group)
   "Find the real name of a foreign newsgroup."
@@ -577,42 +560,21 @@ If N, return the Nth ancestor instead."
 (defun gnus-make-sort-function (funs)
   "Return a composite sort condition based on the functions in FUNC."
   (cond
-   ;; Just a simple function.
-   ((gnus-functionp funs) funs)
-   ;; No functions at all.
+   ((not (listp funs)) funs)
    ((null funs) funs)
-   ;; A list of functions.
-   ((or (cdr funs)
-	(listp (car funs)))
-    (gnus-byte-compile
-     `(lambda (t1 t2)
-	,(gnus-make-sort-function-1 (reverse funs)))))
-   ;; A list containing just one function.
+   ((cdr funs)
+    `(lambda (t1 t2)
+       ,(gnus-make-sort-function-1 (reverse funs))))
    (t
     (car funs))))
 
 (defun gnus-make-sort-function-1 (funs)
   "Return a composite sort condition based on the functions in FUNC."
-  (let ((function (car funs))
-	(first 't1)
-	(last 't2))
-    (when (consp function)
-      (cond
-       ;; Reversed spec.
-       ((eq (car function) 'not)
-	(setq function (cadr function)
-	      first 't2
-	      last 't1))
-       ((gnus-functionp function)
-	;; Do nothing.
-	)
-       (t
-	(error "Invalid sort spec: %s" function))))
-    (if (cdr funs)
-	`(or (,function ,first ,last)
-	     (and (not (,function ,last ,first))
-		  ,(gnus-make-sort-function-1 (cdr funs))))
-      `(,function ,first ,last))))
+  (if (cdr funs)
+      `(or (,(car funs) t1 t2)
+	   (and (not (,(car funs) t2 t1))
+		,(gnus-make-sort-function-1 (cdr funs))))
+    `(,(car funs) t1 t2)))
 
 (defun gnus-turn-off-edit-menu (type)
   "Turn off edit menu in `gnus-TYPE-mode-map'."
@@ -629,31 +591,39 @@ Bind `print-quoted' and `print-readably' to t while printing."
     (prin1 form (current-buffer))))
 
 (defun gnus-prin1-to-string (form)
-  "The same as `prin1'.
-Bind `print-quoted' and `print-readably' to t, and `print-length'
-and `print-level' to nil."
+  "The same as `prin1', but bind `print-quoted' and `print-readably' to t."
   (let ((print-quoted t)
-	(print-readably t)
-	(print-length nil)
-	(print-level nil))
+	(print-readably t))
     (prin1-to-string form)))
 
 (defun gnus-make-directory (directory)
   "Make DIRECTORY (and all its parents) if it doesn't exist."
-  (require 'nnmail)
-  (let ((file-name-coding-system nnmail-pathname-coding-system))
-    (when (and directory
-	       (not (file-exists-p directory)))
-      (make-directory directory t)))
+  (when (and directory
+	     (not (file-exists-p directory)))
+    (make-directory directory t))
   t)
 
 (defun gnus-write-buffer (file)
   "Write the current buffer's contents to FILE."
   ;; Make sure the directory exists.
   (gnus-make-directory (file-name-directory file))
-  (let ((file-name-coding-system nnmail-pathname-coding-system))
-    ;; Write the buffer.
-    (write-region (point-min) (point-max) file nil 'quietly)))
+  ;; Write the buffer.
+  (write-region (point-min) (point-max) file nil 'quietly))
+
+(defun gnus-write-buffer-as-binary (file)
+  "Write the current buffer's contents to FILE without code conversion."
+  ;; Make sure the directory exists.
+  (gnus-make-directory (file-name-directory file))
+  ;; Write the buffer.
+  (write-region-as-binary (point-min) (point-max) file nil 'quietly))
+
+(defun gnus-write-buffer-as-coding-system (coding-system file)
+  "Write the current buffer's contents to FILE with code conversion."
+  ;; Make sure the directory exists.
+  (gnus-make-directory (file-name-directory file))
+  ;; Write the buffer.
+  (write-region-as-coding-system
+   coding-system (point-min) (point-max) file nil 'quietly))
 
 (defun gnus-delete-file (file)
   "Delete FILE if it exists."
@@ -666,30 +636,17 @@ and `print-level' to nil."
     (setq string (replace-match "" t t string)))
   string)
 
-(defsubst gnus-put-text-property-excluding-newlines (beg end prop val)
+(defun gnus-put-text-property-excluding-newlines (beg end prop val)
   "The same as `put-text-property', but don't put this prop on any newlines in the region."
   (save-match-data
     (save-excursion
       (save-restriction
 	(goto-char beg)
-	(while (re-search-forward gnus-emphasize-whitespace-regexp end 'move)
+	(while (re-search-forward "[ \t]*\n" end 'move)
 	  (gnus-put-text-property beg (match-beginning 0) prop val)
 	  (setq beg (point)))
 	(gnus-put-text-property beg (point) prop val)))))
 
-(defsubst gnus-put-overlay-excluding-newlines (beg end prop val)
-  "The same as `put-text-property', but don't put this prop on any newlines in the region."
-  (save-match-data
-    (save-excursion
-      (save-restriction
-	(goto-char beg)
-	(while (re-search-forward gnus-emphasize-whitespace-regexp end 'move)
-	  (gnus-overlay-put
-	   (gnus-make-overlay beg (match-beginning 0))
-	   prop val)
-	  (setq beg (point)))
-	(gnus-overlay-put (gnus-make-overlay beg (point)) prop val)))))
-
 (defun gnus-put-text-property-excluding-characters-with-faces (beg end
 								   prop val)
   "The same as `put-text-property', but don't put props on characters with the `gnus-face' property."
@@ -698,11 +655,10 @@ and `print-level' to nil."
       (when (get-text-property b 'gnus-face)
 	(setq b (next-single-property-change b 'gnus-face nil end)))
       (when (/= b end)
-	(inline
-	  (gnus-put-text-property
-	   b (setq b (next-single-property-change b 'gnus-face nil end))
-	   prop val))))))
-
+	(gnus-put-text-property
+	 b (setq b (next-single-property-change b 'gnus-face nil end))
+	 prop val)))))
+  
 ;;; Protected and atomic operations.  dmoore@ucsd.edu 21.11.1996
 ;;; The primary idea here is to try to protect internal datastructures
 ;;; from becoming corrupted when the user hits C-g, or if a hook or
@@ -732,7 +688,7 @@ non-locally exits.  The variables listed in PROTECT are updated atomically.
 It is safe to use gnus-atomic-progn-assign with long computations.
 
 Note that if any of the symbols in PROTECT were unbound, they will be
-set to nil on a successful assignment.  In case of an error or other
+set to nil on a sucessful assignment.  In case of an error or other
 non-local exit, it will still be unbound."
   (let* ((temp-sym-map (mapcar (lambda (x) (list (make-symbol
 						  (concat (symbol-name x)
@@ -799,8 +755,7 @@ with potentially long computations."
 		(save-excursion
 		  (set-buffer file-buffer)
 		  (rmail-insert-rmail-file-header)
-		  (let ((require-final-newline nil)
-			(coding-system-for-write mm-text-coding-system))
+		  (let ((require-final-newline nil))
 		    (gnus-write-buffer filename)))
 		(kill-buffer file-buffer))
 	    (error "Output file does not exist")))
@@ -811,8 +766,7 @@ with potentially long computations."
       ;; Decide whether to append to a file or to an Emacs buffer.
       (let ((outbuf (get-file-buffer filename)))
 	(if (not outbuf)
-	    (let ((file-name-coding-system nnmail-pathname-coding-system))
-	      (mm-append-to-file (point-min) (point-max) filename))
+	    (append-to-file (point-min) (point-max) filename)
 	  ;; File has been visited, in buffer OUTBUF.
 	  (set-buffer outbuf)
 	  (let ((buffer-read-only nil)
@@ -826,10 +780,10 @@ with potentially long computations."
 	    (when msg
 	      (goto-char (point-min))
 	      (widen)
-	      (search-backward "\n\^_")
-	      (narrow-to-region (point) (point-max))
-	      (rmail-count-new-messages t)
-	      (when (rmail-summary-exists)
+ 	      (search-backward "\n\^_")
+ 	      (narrow-to-region (point) (point-max))
+ 	      (rmail-count-new-messages t)
+ 	      (when (rmail-summary-exists)
 		(rmail-select-summary
 		 (rmail-update-summary)))
 	      (rmail-count-new-messages t)
@@ -852,9 +806,8 @@ with potentially long computations."
 	    (let ((file-buffer (create-file-buffer filename)))
 	      (save-excursion
 		(set-buffer file-buffer)
-		(let ((require-final-newline nil)
-		      (coding-system-for-write mm-text-coding-system))
-		  (gnus-write-buffer filename)))
+		(let ((require-final-newline nil))
+		  (gnus-write-buffer-as-binary filename)))
 	      (kill-buffer file-buffer))
 	  (error "Output file does not exist")))
       (set-buffer tmpbuf)
@@ -881,8 +834,8 @@ with potentially long computations."
 		    (insert "\n"))
 		  (insert "\n"))
 		(goto-char (point-max))
-		(let ((file-name-coding-system nnmail-pathname-coding-system))
-		  (mm-append-to-file (point-min) (point-max) filename))))
+		(write-region-as-binary (point-min) (point-max)
+					filename 'append)))
 	  ;; File has been visited, in buffer OUTBUF.
 	  (set-buffer outbuf)
 	  (let ((buffer-read-only nil))
@@ -907,18 +860,108 @@ with potentially long computations."
 (defun gnus-map-function (funs arg)
   "Applies the result of the first function in FUNS to the second, and so on.
 ARG is passed to the first function."
-  (while funs
-    (setq arg (funcall (pop funs) arg)))
-  arg)
+  (let ((myfuns funs))
+    (while myfuns
+      (setq arg (funcall (pop myfuns) arg)))
+    arg))
 
 (defun gnus-run-hooks (&rest funcs)
-  "Does the same as `run-hooks', but saves the current buffer."
-  (save-current-buffer
-    (apply 'run-hooks funcs)))
+  "Does the same as `run-hooks', but saves excursion."
+  (let ((buf (current-buffer)))
+    (unwind-protect
+	(apply 'run-hooks funcs)
+      (set-buffer buf))))
+  
+;;;
+;;; .netrc and .authinforc parsing
+;;;
+
+(defvar gnus-netrc-syntax-table
+  (let ((table (copy-syntax-table text-mode-syntax-table)))
+    (modify-syntax-entry ?@ "w" table)
+    (modify-syntax-entry ?- "w" table)
+    (modify-syntax-entry ?_ "w" table)
+    (modify-syntax-entry ?! "w" table)
+    (modify-syntax-entry ?. "w" table)
+    (modify-syntax-entry ?, "w" table)
+    (modify-syntax-entry ?: "w" table)
+    (modify-syntax-entry ?\; "w" table)
+    (modify-syntax-entry ?% "w" table)
+    (modify-syntax-entry ?) "w" table)
+    (modify-syntax-entry ?( "w" table)
+    table)
+  "Syntax table when parsing .netrc files.")
+
+(defun gnus-parse-netrc (file)
+  "Parse FILE and return an list of all entries in the file."
+  (if (not (file-exists-p file))
+      ()
+    (save-excursion
+      (let ((tokens '("machine" "default" "login"
+		      "password" "account" "macdef" "force"))
+	    alist elem result pair)
+	(nnheader-set-temp-buffer " *netrc*")
+	(unwind-protect
+	    (progn
+	      (set-syntax-table gnus-netrc-syntax-table)
+	      (insert-file-contents file)
+	      (goto-char (point-min))
+	      ;; Go through the file, line by line.
+	      (while (not (eobp))
+		(narrow-to-region (point) (gnus-point-at-eol))
+		;; For each line, get the tokens and values.
+		(while (not (eobp))
+		  (skip-chars-forward "\t ")
+		  (unless (eobp)
+		    (setq elem (buffer-substring
+				(point) (progn (forward-sexp 1) (point))))
+		    (cond
+		     ((equal elem "macdef")
+		      ;; We skip past the macro definition.
+		      (widen)
+		      (while (and (zerop (forward-line 1))
+				  (looking-at "$")))
+		      (narrow-to-region (point) (point)))
+		     ((member elem tokens)
+		      ;; Tokens that don't have a following value are ignored,
+		      ;; except "default".
+		      (when (and pair (or (cdr pair)
+					  (equal (car pair) "default")))
+			(push pair alist))
+		      (setq pair (list elem)))
+		     (t
+		      ;; Values that haven't got a preceding token are ignored.
+		      (when pair
+			(setcdr pair elem)
+			(push pair alist)
+			(setq pair nil))))))
+		(if alist
+		    (push (nreverse alist) result))
+		(setq alist nil
+		      pair nil)
+		(widen)
+		(forward-line 1))
+	      (nreverse result))
+	  (kill-buffer " *netrc*"))))))
+
+(defun gnus-netrc-machine (list machine)
+  "Return the netrc values from LIST for MACHINE or for the default entry."
+  (let ((rest list))
+    (while (and list
+		(not (equal (cdr (assoc "machine" (car list))) machine)))
+      (pop list))
+    (car (or list
+	     (progn (while (and rest (not (assoc "default" (car rest))))
+		      (pop rest))
+		    rest)))))
+
+(defun gnus-netrc-get (alist type)
+  "Return the value of token TYPE from ALIST."
+  (cdr (assoc type alist)))
 
 ;;; Various
 
-(defvar gnus-group-buffer)		; Compiler directive
+(defvar gnus-group-buffer) ; Compiler directive
 (defun gnus-alive-p ()
   "Say whether Gnus is running or not."
   (and (boundp 'gnus-group-buffer)
@@ -928,38 +971,34 @@ ARG is passed to the first function."
 	 (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)))
+  (let (new (tail list))
+    (while tail
+      (or (member (car tail) new)
+	  (setq new (cons (car tail) new)))
+      (setq tail (cdr tail)))
     (nreverse new)))
 
-(defun gnus-remove-if (predicate list)
-  "Return a copy of LIST with all items satisfying PREDICATE removed."
+(defun gnus-delete-if (predicate list)
+  "Delete elements from LIST that satisfy PREDICATE."
   (let (out)
     (while list
       (unless (funcall predicate (car list))
 	(push (car list) out))
-      (setq list (cdr list)))
+      (pop list))
     (nreverse out)))
 
-(if (fboundp 'assq-delete-all)
-    (defalias 'gnus-delete-alist 'assq-delete-all)
-  (defun gnus-delete-alist (key alist)
-    "Delete from ALIST all elements whose car is KEY.
-Return the modified alist."
-    (let (entry)
-      (while (setq entry (assq key alist))
-	(setq alist (delq entry alist)))
-      alist)))
-
-(defmacro gnus-pull (key alist &optional assoc-p)
+(defun gnus-delete-alist (key alist)
+  "Delete all entries in ALIST that have a key eq to KEY."
+  (let (entry)
+    (while (setq entry (assq key alist))
+      (setq alist (delq entry alist)))
+    alist))
+
+(defmacro gnus-pull (key alist)
   "Modify ALIST to be without KEY."
   (unless (symbolp alist)
     (error "Not a symbol: %s" alist))
-  (let ((fun (if assoc-p 'assoc 'assq)))
-    `(setq ,alist (delq (,fun ,key ,alist) ,alist))))
+  `(setq ,alist (delq (assq ,key ,alist) ,alist)))
 
 (defun gnus-globalify-regexp (re)
   "Returns a regexp that matches a whole line, iff RE matches a part of it."
@@ -967,351 +1006,6 @@ Return the modified alist."
 	  re
 	  (unless (string-match "\\$$" re) ".*$")))
 
-(defun gnus-set-window-start (&optional point)
-  "Set the window start to POINT, or (point) if nil."
-  (let ((win (gnus-get-buffer-window (current-buffer) t)))
-    (when win
-      (set-window-start win (or point (point))))))
-
-(defun gnus-annotation-in-region-p (b e)
-  (if (= b e)
-      (eq (cadr (memq 'gnus-undeletable (text-properties-at b))) t)
-    (text-property-any b e 'gnus-undeletable t)))
-
-(defun gnus-or (&rest elems)
-  "Return non-nil if any of the elements are non-nil."
-  (catch 'found
-    (while elems
-      (when (pop elems)
-	(throw 'found t)))))
-
-(defun gnus-and (&rest elems)
-  "Return non-nil if all of the elements are non-nil."
-  (catch 'found
-    (while elems
-      (unless (pop elems)
-	(throw 'found nil)))
-    t))
-
-(defun gnus-write-active-file (file hashtb &optional full-names)
-  (let ((coding-system-for-write nnmail-active-file-coding-system))
-    (with-temp-file file
-      (mapatoms
-       (lambda (sym)
-	 (when (and sym
-		    (boundp sym)
-		    (symbol-value sym))
-	   (insert (format "%S %d %d y\n"
-			   (if full-names
-			       sym
-			     (intern (gnus-group-real-name (symbol-name sym))))
-			   (or (cdr (symbol-value sym))
-			       (car (symbol-value sym)))
-			   (car (symbol-value sym))))))
-       hashtb)
-      (goto-char (point-max))
-      (while (search-backward "\\." nil t)
-	(delete-char 1)))))
-
-(if (fboundp 'union)
-    (defalias 'gnus-union 'union)
-  (defun gnus-union (l1 l2)
-    "Set union of lists L1 and L2."
-    (cond ((null l1) l2)
-	  ((null l2) l1)
-	  ((equal l1 l2) l1)
-	  (t
-	   (or (>= (length l1) (length l2))
-	       (setq l1 (prog1 l2 (setq l2 l1))))
-	   (while l2
-	     (or (member (car l2) l1)
-		 (push (car l2) l1))
-	     (pop l2))
-	   l1))))
-
-(defun gnus-add-text-properties-when
-  (property value start end properties &optional object)
-  "Like `gnus-add-text-properties', only applied on where PROPERTY is VALUE."
-  (let (point)
-    (while (and start
-		(< start end) ;; XEmacs will loop for every when start=end.
-		(setq point (text-property-not-all start end property value)))
-      (gnus-add-text-properties start point properties object)
-      (setq start (text-property-any point end property value)))
-    (if start
-	(gnus-add-text-properties start end properties object))))
-
-(defun gnus-remove-text-properties-when
-  (property value start end properties &optional object)
-  "Like `remove-text-properties', only applied on where PROPERTY is VALUE."
-  (let (point)
-    (while (and start
-		(< start end)
-		(setq point (text-property-not-all start end property value)))
-      (remove-text-properties start point properties object)
-      (setq start (text-property-any point end property value)))
-    (if start
-	(remove-text-properties start end properties object))
-    t))
-
-(defun gnus-string-equal (x y)
-  "Like `string-equal', except it compares case-insensitively."
-  (and (= (length x) (length y))
-       (or (string-equal x y)
-	   (string-equal (downcase x) (downcase y)))))
-
-(defcustom gnus-use-byte-compile t
-  "If non-nil, byte-compile crucial run-time codes.
-Setting it to nil has no effect after first time running
-`gnus-byte-compile'."
-  :type 'boolean
-  :version "21.1"
-  :group 'gnus-various)
-
-(defun gnus-byte-compile (form)
-  "Byte-compile FORM if `gnus-use-byte-compile' is non-nil."
-  (if gnus-use-byte-compile
-      (progn
-	(condition-case nil
-	    ;; Work around a bug in XEmacs 21.4
-	    (require 'byte-optimize)
-	  (error))
-	(require 'bytecomp)
-	(defalias 'gnus-byte-compile 'byte-compile)
-	(byte-compile form))
-    form))
-
-(defun gnus-remassoc (key alist)
-  "Delete by side effect any elements of LIST whose car is `equal' to KEY.
-The modified LIST is returned.  If the first member
-of LIST has a car that is `equal' to KEY, there is no way to remove it
-by side effect; therefore, write `(setq foo (remassoc key foo))' to be
-sure of changing the value of `foo'."
-  (when alist
-    (if (equal key (caar alist))
-	(cdr alist)
-      (setcdr alist (gnus-remassoc key (cdr alist)))
-      alist)))
-
-(defun gnus-update-alist-soft (key value alist)
-  (if value
-      (cons (cons key value) (gnus-remassoc key alist))
-    (gnus-remassoc key alist)))
-
-(defun gnus-create-info-command (node)
-  "Create a command that will go to info NODE."
-  `(lambda ()
-     (interactive)
-     ,(concat "Enter the info system at node " node)
-     (Info-goto-node ,node)
-     (setq gnus-info-buffer (current-buffer))
-     (gnus-configure-windows 'info)))
-
-(defun gnus-not-ignore (&rest args)
-  t)
-
-(defvar gnus-directory-sep-char-regexp "/"
-  "The regexp of directory separator character.
-If you find some problem with the directory separator character, try
-\"[/\\\\\]\" for some systems.")
-
-(defun gnus-url-unhex (x)
-  (if (> x ?9)
-      (if (>= x ?a)
-	  (+ 10 (- x ?a))
-	(+ 10 (- x ?A)))
-    (- x ?0)))
-
-(defun gnus-url-unhex-string (str &optional allow-newlines)
-  "Remove %XXX embedded spaces, etc in a url.
-If optional second argument ALLOW-NEWLINES is non-nil, then allow the
-decoding of carriage returns and line feeds in the string, which is normally
-forbidden in URL encoding."
-  (setq str (or (mm-subst-char-in-string ?+ ?  str) ""))
-  (let ((tmp "")
-	(case-fold-search t))
-    (while (string-match "%[0-9a-f][0-9a-f]" str)
-      (let* ((start (match-beginning 0))
-	     (ch1 (gnus-url-unhex (elt str (+ start 1))))
-	     (code (+ (* 16 ch1)
-		      (gnus-url-unhex (elt str (+ start 2))))))
-	(setq tmp (concat
-		   tmp (substring str 0 start)
-		   (cond
-		    (allow-newlines
-		     (char-to-string code))
-		    ((or (= code ?\n) (= code ?\r))
-		     " ")
-		    (t (char-to-string code))))
-	      str (substring str (match-end 0)))))
-    (setq tmp (concat tmp str))
-    tmp))
-
-(defun gnus-make-predicate (spec)
-  "Transform SPEC into a function that can be called.
-SPEC is a predicate specifier that contains stuff like `or', `and',
-`not', lists and functions.  The functions all take one parameter."
-  `(lambda (elem) ,(gnus-make-predicate-1 spec)))
-
-(defun gnus-make-predicate-1 (spec)
-  (cond
-   ((symbolp spec)
-    `(,spec elem))
-   ((listp spec)
-    (if (memq (car spec) '(or and not))
-	`(,(car spec) ,@(mapcar 'gnus-make-predicate-1 (cdr spec)))
-      (error "Invalid predicate specifier: %s" spec)))))
-
-(defun gnus-local-map-property (map)
-  "Return a list suitable for a text property list specifying keymap MAP."
-  (cond
-   ((featurep 'xemacs)
-    (list 'keymap map))
-   ((>= emacs-major-version 21)
-    (list 'keymap map))
-   (t
-    (list 'local-map map))))
-
-(defun gnus-completing-read (prompt table &optional predicate require-match
-				    history)
-  (when (and history
-	     (not (boundp history)))
-    (set history nil))
-  (completing-read
-   (if (symbol-value history)
-       (concat prompt " (" (car (symbol-value history)) "): ")
-     (concat prompt ": "))
-   table
-   predicate
-   require-match
-   nil
-   history
-   (car (symbol-value history))))
-
-(defun gnus-graphic-display-p ()
-  (or (and (fboundp 'display-graphic-p)
-	   (display-graphic-p))
-      ;;;!!!This is bogus.  Fixme!
-      (and (featurep 'xemacs)
-	   t)))
-
-(put 'gnus-parse-without-error 'lisp-indent-function 0)
-(put 'gnus-parse-without-error 'edebug-form-spec '(body))
-
-(defmacro gnus-parse-without-error (&rest body)
-  "Allow continuing onto the next line even if an error occurs."
-  `(while (not (eobp))
-     (condition-case ()
-	 (progn
-	   ,@body
-	   (goto-char (point-max)))
-       (error
-	(gnus-error 4 "Invalid data on line %d"
-		    (count-lines (point-min) (point)))
-	(forward-line 1)))))
-
-(defun gnus-cache-file-contents (file variable function)
-  "Cache the contents of FILE in VARIABLE.  The contents come from FUNCTION."
-  (let ((time (nth 5 (file-attributes file)))
-	contents value)
-    (if (or (null (setq value (symbol-value variable)))
-	    (not (equal (car value) file))
-	    (not (equal (nth 1 value) time)))
-	(progn
-	  (setq contents (funcall function file))
-	  (set variable (list file time contents))
-	  contents)
-      (nth 2 value))))
-
-(defun gnus-multiple-choice (prompt choice &optional idx)
-  "Ask user a multiple choice question.
-CHOICE is a list of the choice char and help message at IDX."
-  (let (tchar buf)
-    (save-window-excursion
-      (save-excursion
-	(while (not tchar)
-	  (message "%s (%s?): "
-		   prompt
-		   (mapconcat (lambda (s) (char-to-string (car s)))
-			      choice ""))
-	  (setq tchar (read-char))
-	  (when (not (assq tchar choice))
-	    (setq tchar nil)
-	    (setq buf (get-buffer-create "*Gnus Help*"))
-	    (pop-to-buffer buf)
-	    (fundamental-mode)		; for Emacs 20.4+
-	    (buffer-disable-undo)
-	    (erase-buffer)
-	    (insert prompt ":\n\n")
-	    (let ((max -1)
-		  (list choice)
-		  (alist choice)
-		  (idx (or idx 1))
-		  (i 0)
-		  n width pad format)
-	      ;; find the longest string to display
-	      (while list
-		(setq n (length (nth idx (car list))))
-		(unless (> max n)
-		  (setq max n))
-		(setq list (cdr list)))
-	      (setq max (+ max 4))	; %c, `:', SPACE, a SPACE at end
-	      (setq n (/ (1- (window-width)) max)) ; items per line
-	      (setq width (/ (1- (window-width)) n)) ; width of each item
-	      ;; insert `n' items, each in a field of width `width'
-	      (while alist
-		(if (< i n)
-		    ()
-		  (setq i 0)
-		  (delete-char -1)		; the `\n' takes a char
-		  (insert "\n"))
-		(setq pad (- width 3))
-		(setq format (concat "%c: %-" (int-to-string pad) "s"))
-		(insert (format format (caar alist) (nth idx (car alist))))
-		(setq alist (cdr alist))
-		(setq i (1+ i))))))))
-    (if (buffer-live-p buf)
-	(kill-buffer buf))
-    tchar))
-
-(defun gnus-select-frame-set-input-focus (frame)
-  "Select FRAME, raise it, and set input focus, if possible."
-  (cond ((featurep 'xemacs)
-	 (raise-frame frame)
-	 (select-frame frame)
-	 (focus-frame frame))
-	;; The function `select-frame-set-input-focus' won't set
-	;; the input focus under Emacs 21.2 and X window system.
-	;;((fboundp 'select-frame-set-input-focus)
-	;; (defalias 'gnus-select-frame-set-input-focus
-	;;   'select-frame-set-input-focus)
-	;; (select-frame-set-input-focus frame))
-	(t
-	 (raise-frame frame)
-	 (select-frame frame)
-	 (cond ((and (eq window-system 'x)
-		     (fboundp 'x-focus-frame))
-		(x-focus-frame frame))
-	       ((eq window-system 'w32)
-		(w32-focus-frame frame)))
-	 (when focus-follows-mouse
-	   (set-mouse-position frame (1- (frame-width frame)) 0)))))
-
-(defun gnus-frame-or-window-display-name (object)
-  "Given a frame or window, return the associated display name.
-Return nil otherwise."
-  (if (featurep 'xemacs)
-      (device-connection (dfw-device object))
-    (if (or (framep object)
-	    (and (windowp object)
-		 (setq object (window-frame object))))
-	(let ((display (frame-parameter object 'display)))
-	  (if (and (stringp display)
-		   ;; Exclude invalid display names.
-		   (string-match "\\`[^:]*:[0-9]+\\(\\.[0-9]+\\)?\\'"
-				 display))
-	      display)))))
-
 (provide 'gnus-util)
 
 ;;; gnus-util.el ends here