From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 22 Sep 2010 06:01:22 +0000 (+0000)
Subject: Remove Emacs 21 stuff.
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/4def29e7d611ccb7bf32df728e71c6cc4f2f92a1

Remove Emacs 21 stuff.

mailcap.el (mailcap-parse-mailcap, mailcap-parse-mimetypes)
mm-util.el (mm-decompress-buffer)
nnir.el (nnir-run-find-grep)
pop3.el (pop3-list): Use 3rd arg of split-string.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index eeba68f81a..c0651267d2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mailcap.el (mailcap-parse-mailcap, mailcap-parse-mimetypes)
+	* mm-util.el (mm-decompress-buffer)
+	* nnir.el (nnir-run-find-grep)
+	* pop3.el (pop3-list): Use 3rd arg of split-string.
+
 2010-09-21  Adam Sjøgren  <asjo@koldfront.dk>
 
 	* gnus-sum.el (gnus-adjust-marked-articles): Fix typo.
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index 71ffd1225b..524928586f 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -423,7 +423,7 @@ MAILCAPS if set; otherwise (on Unix) use the path from RFC 1524, plus
 		"/usr/local/etc/mailcap"))))
     (let ((fnames (reverse
 		   (if (stringp path)
-		       (delete "" (split-string path path-separator))
+		       (split-string path path-separator t)
 		     path)))
 	  fname)
       (while fnames
@@ -941,7 +941,7 @@ If FORCE, re-parse even if already parsed."
 		"/usr/local/etc/mime-types"
 		"/usr/local/www/conf/mime-types"))))
     (let ((fnames (reverse (if (stringp path)
-			       (delete "" (split-string path path-separator))
+			       (split-string path path-separator t)
 			     path)))
 	  fname)
       (while fnames
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 588915a1ab..7f0d3388e0 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1539,14 +1539,13 @@ decompressed data.  The buffer's multibyteness must be turned off."
 				       prog t (list t err-file) nil args)
 				jka-compr-acceptable-retval-list)
 		    (erase-buffer)
-		    (insert (mapconcat
-			     'identity
-			     (delete "" (split-string
-					 (prog2
-					     (insert-file-contents err-file)
-					     (buffer-string)
-					   (erase-buffer))))
-			     " ")
+		    (insert (mapconcat 'identity
+				       (split-string
+					(prog2
+					    (insert-file-contents err-file)
+					    (buffer-string)
+					  (erase-buffer)) t)
+				       " ")
 			    "\n")
 		    (setq err-msg
 			  (format "Error while executing \"%s %s < %s\""
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index a826b5be79..954b4895da 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -1536,17 +1536,13 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
 	   "find" group "-type" "f" "-name" "[0-9]*" "-exec"
 	   "grep"
 	   `("-l" ,@(and grep-options
-			 ;; Note: the 3rd arg of `split-string' is not
-			 ;; available in Emacs 21.
-			 (delete "" (split-string grep-options "\\s-")))
+			 (split-string grep-options "\\s-" t))
 	     "-e" ,regexp "{}" "+"))))
 
       ;; Translate relative paths to group names.
       (while (not (eobp))
-	(let* ((path (delete
-		      ""
-		      (split-string
-		       (buffer-substring (point) (line-end-position)) "/")))
+	(let* ((path (split-string
+		      (buffer-substring (point) (line-end-position)) "/" t))
 	       (art (string-to-number (car (last path)))))
 	  (while (string= "." (car path))
 	    (setq path (cdr path)))
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 950cae25c4..d2953dcffc 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -520,8 +520,7 @@ Otherwise, return the size of the message-id MSG"
 	  (mapcar #'(lambda (s) (let ((split (split-string s " ")))
 				  (cons (string-to-number (nth 0 split))
 					(string-to-number (nth 1 split)))))
-		  (delete "" (split-string (buffer-substring start end)
-					   "\r\n"))))))))
+		  (split-string (buffer-substring start end) "\r\n" t)))))))
 
 (defun pop3-retr (process msg crashbuf)
   "Retrieve message-id MSG to buffer CRASHBUF."