X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-group.el;h=602ee31944a1cf17de86adc2b8fa65b71c77ab49;hb=b2ecabb89c3f8ed19e0017080b57071f6a9eeb73;hp=219292b8dde2219f6ae3a7e9ae422737ab1b48ff;hpb=488771cd124f252f28b69710c03f4c44879d4951;p=gnus

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 219292b8d..602ee3194 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1,27 +1,25 @@
 ;;; gnus-group.el --- group mode commands for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1110,6 +1108,7 @@ See `gmm-tool-bar-from-list' for the format of the list."
   :group 'gnus-group)
 
 (defvar image-load-path)
+(defvar tool-bar-map)
 
 (defun gnus-group-make-tool-bar (&optional force)
   "Make a group mode tool bar from `gnus-group-tool-bar'.
@@ -1188,8 +1187,8 @@ The following commands are available:
       (goto-char (point-min))
       (setq gnus-group-mark-positions
 	    (list (cons 'process (and (search-forward
-				       (mm-string-as-multibyte "\200") nil t)
-				      (- (point) 2))))))))
+				       (mm-string-to-multibyte "\200") nil t)
+				      (- (point) (point-min) 1))))))))
 
 (defun gnus-mouse-pick-group (e)
   "Enter the group under the mouse pointer."
@@ -2400,7 +2399,7 @@ Valid input formats include:
 	   "^http://\\(?:thread\\|article\\|permalink\\)\.gmane\.org/\\([^/]+\\)/\\([0-9]+\\)"
 	   url)
 	  (string-match
-	   ;; Don't advertize these in the doc string yet:
+	   ;; Don't advertise these in the doc string yet:
 	   "^\\(?:nntp\\|news\\)://news\.gmane\.org/\\([^/]+\\)/\\([0-9]+\\)"
 	   url)
 	  (string-match
@@ -2926,7 +2925,10 @@ and NEW-NAME will be prompted for."
    (let ((entry (assoc (completing-read "Create group: " gnus-useful-groups
 					nil t)
 		       gnus-useful-groups)))
-     (list (cadr entry) (caddr entry))))
+     (list (cadr entry)
+	   ;; Don't use `caddr' here since macros within the `interactive'
+	   ;; form won't be expanded.
+	   (car (cddr entry)))))
   (setq method (gnus-copy-sequence method))
   (let (entry)
     (while (setq entry (memq (assq 'eval method) method))
@@ -3053,12 +3055,21 @@ If there is, use Gnus to create an nnrss group"
 	(let* ((title (gnus-newsgroup-savable-name
 		       (read-from-minibuffer "Title: "
 					     (gnus-newsgroup-savable-name
-					      (or (cdr (assoc 'title
-							      feedinfo))
-						  "")))))
+					      (mapconcat
+					       'identity
+					       (split-string
+						(or (cdr (assoc 'title
+								feedinfo))
+						    ""))
+					       " ")))))
 	       (desc  (read-from-minibuffer "Description: "
-					    (cdr (assoc 'description
-							feedinfo))))
+					    (mapconcat
+					     'identity
+					     (split-string
+					      (or (cdr (assoc 'description
+							      feedinfo))
+						  ""))
+					     " ")))
 	       (href (cdr (assoc 'href feedinfo)))
 	       (coding (gnus-group-name-charset '(nnrss "") title)))
 	  (when coding
@@ -3232,10 +3243,9 @@ score file entries for articles to include in the group."
 		       'summary 'group)))
       (error "Couldn't enter %s" dir))))
 
-(eval-and-compile
-  (autoload 'nnimap-expunge "nnimap")
-  (autoload 'nnimap-acl-get "nnimap")
-  (autoload 'nnimap-acl-edit "nnimap"))
+(autoload 'nnimap-expunge "nnimap")
+(autoload 'nnimap-acl-get "nnimap")
+(autoload 'nnimap-acl-edit "nnimap")
 
 (defun gnus-group-nnimap-expunge (group)
   "Expunge deleted articles in current nnimap GROUP."
@@ -4791,5 +4801,5 @@ Compacting group %s... (this may take a long time)"
 
 (provide 'gnus-group)
 
-;;; arch-tag: 2eb5440f-0bca-4091-814c-e37817536af6
+;; arch-tag: 2eb5440f-0bca-4091-814c-e37817536af6
 ;;; gnus-group.el ends here