From c6e7b5804ad9967c0b5a5c1ddf626091c1eac7a5 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Thu, 9 Nov 2000 14:32:25 +0000 Subject: [PATCH] (gnus-group-make-directory-group) (gnus-group-fetch-faq): Use expand-file-name. (gnus-group-fetch-faq): Simplify completing-read form. --- lisp/gnus/ChangeLog | 7 +++++++ lisp/gnus/gnus-group.el | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 55342810a79..c53be3a0352 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,12 @@ 2000-11-09 Dave Love + * 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 --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index ab752dcb0cc..2a50e83287a 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -3,7 +3,6 @@ ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen -;; Maintainer: bugs@gnus.org ;; Keywords: news ;; This file is part of GNU Emacs. @@ -2344,8 +2343,7 @@ mail messages or news articles in files that have numeric names." (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 @@ to use." (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 @@ to use." (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)) -- 2.39.5