From: yamaoka Date: Sun, 10 Apr 2005 11:09:21 +0000 (+0000) Subject: Synch to No Gnus 200504100421. X-Git-Tag: t-gnus-6_17_4-quimby-~512 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=096419e63f742476b72ae24655f1204718925ef3;p=elisp%2Fgnus.git- Synch to No Gnus 200504100421. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dded9b3..95f7a68 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -36,6 +36,13 @@ (nnrss-get-encoding): Return a compatible encoding according to nnrss-compatible-encoding-alist. (nnrss-find-el): Use consp instead of listp. + (nnrss-opml-export, nnrss-order-hrefs, nnrss-find-el): Use dolist. + +2005-04-06 Katsumi Yamaoka + + * time-date.el (time-to-seconds): Don't use the #xhhhh syntax + which Emacs 20 doesn't support. + (seconds-to-time, days-to-time, time-subtract, time-add): Ditto. 2005-04-04 Reiner Steib @@ -1080,7 +1087,7 @@ 2004-11-04 Katsumi Yamaoka - * gnus-art. (gnus-article-edit-article): Don't associate the + * gnus-art.el (gnus-article-edit-article): Don't associate the article buffer with a draft file. This is a temporary measure against the 2004-08-22 change to gnus-article-edit-mode. diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 2a5fc6a..6bbec68 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -12604,7 +12604,7 @@ * nnfolder.el (nnfolder-read-folder): Use group instead of nnfolder-current-group. - Suggested by Lorentey Karoly . + Suggested by K,Ba(Broly L,Bu(Brentey . 2001-11-17 Simon Josefsson diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 2fc4c0b..b72813e 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1,5 +1,5 @@ -;;; gnus-agent.el --- unplugged support for Semi-gnus -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +;;; gnus-agent.el --- unplugged support for Gnus +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el index a2ee72e..2516924 100644 --- a/lisp/gnus-cache.el +++ b/lisp/gnus-cache.el @@ -1,6 +1,6 @@ ;;; gnus-cache.el --- cache interface for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Tatsuya Ichikawa diff --git a/lisp/mm-util.el b/lisp/mm-util.el index 16956cf..352830a 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -57,7 +57,8 @@ mm-mime-mule-charset-alist) nil t)))) (subst-char-in-string - . (lambda (from to string &optional inplace) ;; stolen (and renamed) from nnheader.el + . (lambda (from to string &optional inplace) + ;; stolen (and renamed) from nnheader.el "Replace characters in STRING from FROM to TO. Unless optional argument INPLACE is non-nil, return a new string." (let ((string (if inplace string (copy-sequence string))) diff --git a/lisp/nnrss.el b/lisp/nnrss.el index cdd4923..d07a5c3 100644 --- a/lisp/nnrss.el +++ b/lisp/nnrss.el @@ -620,10 +620,9 @@ Export subscriptions to a buffer in OPML Format." " " (user-full-name) "\n" " \n" " \n") - (mapc (lambda (sub) - (insert " \n")) - nnrss-group-alist) + (dolist (sub nnrss-group-alist) + (insert " \n")) (insert " \n" "\n")) (pop-to-buffer "*OPML Export*") @@ -697,27 +696,26 @@ It is useful when `(setq nnrss-use-local t)'." "Find the all matching elements in the data. Careful with this on large documents!" (when (consp data) - (mapc (lambda (bit) - (when (car-safe bit) - (when (equal tag (car bit)) - ;; Old xml.el may return a list of string. - (when (and (consp (caddr bit)) - (stringp (caaddr bit))) - (setcar (cddr bit) (caaddr bit))) - (setq found-list - (append found-list - (list bit)))) - (if (and (consp (car-safe (caddr bit))) - (not (stringp (caddr bit)))) - (setq found-list - (append found-list - (nnrss-find-el - tag (caddr bit)))) - (setq found-list - (append found-list - (nnrss-find-el - tag (cddr bit))))))) - data)) + (dolist (bit data) + (when (car-safe bit) + (when (equal tag (car bit)) + ;; Old xml.el may return a list of string. + (when (and (consp (caddr bit)) + (stringp (caaddr bit))) + (setcar (cddr bit) (caaddr bit))) + (setq found-list + (append found-list + (list bit)))) + (if (and (consp (car-safe (caddr bit))) + (not (stringp (caddr bit)))) + (setq found-list + (append found-list + (nnrss-find-el + tag (caddr bit)))) + (setq found-list + (append found-list + (nnrss-find-el + tag (cddr bit)))))))) found-list) (defun nnrss-rsslink-p (el) @@ -763,27 +761,26 @@ whether they are `offsite' or `onsite'." rss-onsite-in rdf-onsite-in xml-onsite-in rss-offsite-end rdf-offsite-end xml-offsite-end rss-offsite-in rdf-offsite-in xml-offsite-in) - (mapc (lambda (href) - (if (not (null href)) - (cond ((string-match "\\.rss$" href) - (nnrss-match-macro - base-uri href rss-onsite-end rss-offsite-end)) - ((string-match "\\.rdf$" href) - (nnrss-match-macro - base-uri href rdf-onsite-end rdf-offsite-end)) - ((string-match "\\.xml$" href) - (nnrss-match-macro - base-uri href xml-onsite-end xml-offsite-end)) - ((string-match "rss" href) - (nnrss-match-macro - base-uri href rss-onsite-in rss-offsite-in)) - ((string-match "rdf" href) - (nnrss-match-macro - base-uri href rdf-onsite-in rdf-offsite-in)) - ((string-match "xml" href) - (nnrss-match-macro - base-uri href xml-onsite-in xml-offsite-in))))) - hrefs) + (dolist (href hrefs) + (cond ((null href)) + ((string-match "\\.rss$" href) + (nnrss-match-macro + base-uri href rss-onsite-end rss-offsite-end)) + ((string-match "\\.rdf$" href) + (nnrss-match-macro + base-uri href rdf-onsite-end rdf-offsite-end)) + ((string-match "\\.xml$" href) + (nnrss-match-macro + base-uri href xml-onsite-end xml-offsite-end)) + ((string-match "rss" href) + (nnrss-match-macro + base-uri href rss-onsite-in rss-offsite-in)) + ((string-match "rdf" href) + (nnrss-match-macro + base-uri href rdf-onsite-in rdf-offsite-in)) + ((string-match "xml" href) + (nnrss-match-macro + base-uri href xml-onsite-in xml-offsite-in)))) (append rss-onsite-end rdf-onsite-end xml-onsite-end rss-onsite-in rdf-onsite-in xml-onsite-in diff --git a/lisp/time-date.el b/lisp/time-date.el index bf80680..b1977da 100644 --- a/lisp/time-date.el +++ b/lisp/time-date.el @@ -1,5 +1,6 @@ ;;; time-date.el --- Date and time handling functions -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu Umeda @@ -113,15 +114,15 @@ and type 3 is the list (HIGH LOW MICRO)." "Convert time value TIME to a floating point number. You can use `float-time' instead." (with-decoded-time-value ((high low micro time)) - (+ (* 1.0 high #x10000) + (+ (* 1.0 high 65536) low (/ micro 1000000.0)))) ;;;###autoload (defun seconds-to-time (seconds) "Convert SECONDS (a floating point number) to a time value." - (list (floor seconds #x10000) - (floor (mod seconds #x10000)) + (list (floor seconds 65536) + (floor (mod seconds 65536)) (floor (* (- seconds (ffloor seconds)) 1000000)))) ;;;###autoload @@ -139,10 +140,10 @@ You can use `float-time' instead." (defun days-to-time (days) "Convert DAYS into a time value." (let* ((seconds (* 1.0 days 60 60 24)) - (high (condition-case nil (floor (/ seconds #x10000)) + (high (condition-case nil (floor (/ seconds 65536)) (range-error most-positive-fixnum)))) - (list high (condition-case nil (floor (- seconds (* 1.0 high #x10000))) - (range-error #xffff))))) + (list high (condition-case nil (floor (- seconds (* 1.0 high 65536))) + (range-error 65535))))) ;;;###autoload (defun time-since (time) @@ -171,7 +172,7 @@ Return the difference in the format of a time value." micro (+ micro 1000000))) (when (< low 0) (setq high (1- high) - low (+ low #x10000))) + low (+ low 65536))) (encode-time-value high low micro type))) ;;;###autoload @@ -186,9 +187,9 @@ Return the difference in the format of a time value." (when (>= micro 1000000) (setq low (1+ low) micro (- micro 1000000))) - (when (>= low #x10000) + (when (>= low 65536) (setq high (1+ high) - low (- low #x10000))) + low (- low 65536))) (encode-time-value high low micro type))) ;;;###autoload