# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 973780345 0
# Node ID ae432b5b679d764c27db4c2b677a92ec28995546
# Parent  074ad4abf8e0add0d91b1b2017b3e6b0bb391968
(gnus-group-make-directory-group)
(gnus-group-fetch-faq): Use expand-file-name.
(gnus-group-fetch-faq): Simplify completing-read form.

diff -r 074ad4abf8e0 -r ae432b5b679d lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Thu Nov 09 14:23:43 2000 +0000
+++ b/lisp/gnus/ChangeLog	Thu Nov 09 14:32:25 2000 +0000
@@ -1,5 +1,12 @@
 2000-11-09  Dave Love  <fx@gnu.org>
 
+	* gnus-group.el (gnus-group-make-directory-group) 
+	(gnus-group-fetch-faq): Use expand-file-name.
+	(gnus-group-fetch-faq): Simplify completing-read form.
+
+	* mm-bodies.el (mm-encode-body): Use mm-multibyte-p, don't just
+	test for Mule.
+
 	* message.el (tool-bar-map): Defvar when compiling.
 
 	* gnus-setup.el (running-xemacs, gnus-use-installed-tm)
diff -r 074ad4abf8e0 -r ae432b5b679d lisp/gnus/gnus-group.el
--- a/lisp/gnus/gnus-group.el	Thu Nov 09 14:23:43 2000 +0000
+++ b/lisp/gnus/gnus-group.el	Thu Nov 09 14:32:25 2000 +0000
@@ -3,7 +3,6 @@
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;; Maintainer: bugs@gnus.org
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -2344,8 +2343,7 @@
     (while (or (not group) (gnus-gethash group gnus-newsrc-hashtb))
       (setq group
 	    (gnus-group-prefixed-name
-	     (concat (file-name-as-directory (directory-file-name dir))
-		     ext)
+	     (expand-file-name ext dir)
 	     '(nndir "")))
       (setq ext (format "<%d>" (setq i (1+ i)))))
     (gnus-group-make-group
@@ -3281,7 +3279,7 @@
     (when current-prefix-arg
       (completing-read
        "Faq dir: " (and (listp gnus-group-faq-directory)
-			(mapcar (lambda (file) (list file))
+			(mapcar #'list
 				gnus-group-faq-directory))))))
   (unless group
     (error "No group name given"))
@@ -3292,7 +3290,7 @@
     (while (and (not found)
 		(setq dir (pop dirs)))
       (let ((name (gnus-group-real-name group)))
-	(setq file (concat (file-name-as-directory dir) name)))
+	(setq file (expand-file-name name dir)))
       (if (not (file-exists-p file))
 	  (gnus-message 1 "No such file: %s" file)
 	(let ((enable-local-variables nil))