Changes committed gnus/lisp (8 files)
"Miles Bader" <[email protected]>
| Newsgroups | gmane.emacs.gnus.commits |
|---|---|
| Message-ID | <[email protected]> |
Modified: ChangeLog dgnushack.el gnus-xmas.el messagexmas.el netrc.el
nnheaderxm.el parse-time.el time-date.el
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 280-283)
- Update from CVS
- Update from CVS: lisp/lpath.el: Rearrange.
2008-03-01 Reiner Steib <[email protected]>
* Update copyright years.
2008-03-01 Reiner Steib <[email protected]>
* texi/Update texi/copyright texi/years.
Revision: [email protected]/gnus--devo--0--patch-469
Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1784 gnus/lisp/ChangeLog:7.1785
--- ChangeLog:7.1784 Sat Mar 8 17:03:26 2008
+++ ChangeLog Mon Mar 10 01:53:11 2008
@@ -20,7 +20,8 @@
* auth-source.el: New package.
(auth-source-choices): Add customization entry point variable.
- * gnus-registry.el (gnus-registry-user-format-function-M): Fix concat bug.
+ * gnus-registry.el (gnus-registry-user-format-function-M): Fix concat
+ bug.
2008-03-05 Teodor Zlatanov <[email protected]>
@@ -84,6 +85,16 @@
letters. Requested by Uwe Siart.
(message-send-mail-function): Doc fix. Add "Other" custom option.
+2008-03-01 Reiner Steib <[email protected]>
+
+ * Update copyright years.
+
+2008-03-01 Reiner Steib <[email protected]>
+
+ Sync from EMACS_22_BASE.
+
+ * parse-time.el: Rename elt->parse-time-elt and val->parse-time-val.
+
2008-02-29 Andreas Seltenreich <[email protected]>
* nnweb.el (nnweb-google-parse-1): Fix date parsing on articles with
@@ -188,7 +199,7 @@
2008-02-14 Glenn Morris <[email protected]>
- * calendar/time-date.el (format-seconds): New function.
+ * time-date.el (format-seconds): New function.
2008-02-14 Reiner Steib <[email protected]>
Index: dgnushack.el
diff -u gnus/lisp/dgnushack.el:7.31 gnus/lisp/dgnushack.el:7.32
--- dgnushack.el:7.31 Fri Dec 7 05:34:12 2007
+++ dgnushack.el Mon Mar 10 01:53:11 2008
@@ -1,6 +1,6 @@
;;; dgnushack.el --- a hack to set the load path for byte-compiling
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003,
-;; 2004, 2005, 2006, 2007
+;; 2004, 2005, 2006, 2007, 2008
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <[email protected]>
Index: gnus-xmas.el
diff -u gnus/lisp/gnus-xmas.el:7.24 gnus/lisp/gnus-xmas.el:7.25
--- gnus-xmas.el:7.24 Fri Feb 1 07:44:02 2008
+++ gnus-xmas.el Mon Mar 10 01:53:11 2008
@@ -1,7 +1,7 @@
;;; gnus-xmas.el --- Gnus functions for XEmacs
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2005, 2006 Free Software Foundation, Inc.
+;; 2005, 2006, 2008 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <[email protected]>
;; Keywords: news
Index: messagexmas.el
diff -u gnus/lisp/messagexmas.el:7.10 gnus/lisp/messagexmas.el:7.11
--- messagexmas.el:7.10 Thu Oct 4 20:51:28 2007
+++ messagexmas.el Mon Mar 10 01:53:11 2008
@@ -1,7 +1,7 @@
;;; messagexmas.el --- XEmacs extensions to message
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; 2005, 2008 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <[email protected]>
;; Keywords: mail, news
Index: netrc.el
diff -u gnus/lisp/netrc.el:7.20 gnus/lisp/netrc.el:7.21
--- netrc.el:7.20 Sun Jan 20 06:23:57 2008
+++ netrc.el Mon Mar 10 01:53:11 2008
@@ -3,8 +3,9 @@
;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <[email protected]>
-;; Modularizer: Ted Zlatanov <[email protected]>
;; Keywords: news
+;; Modularized by Ted Zlatanov <[email protected]>
+;; when it was part of Gnus.
;; This file is part of GNU Emacs.
@@ -60,7 +61,7 @@
(defun netrc-parse (file)
(interactive "fFile to Parse: ")
- "Parse FILE and return an list of all entries in the file."
+ "Parse FILE and return a list of all entries in the file."
(when (file-exists-p file)
(with-temp-buffer
(let ((tokens '("machine" "default" "login"
Index: nnheaderxm.el
diff -u gnus/lisp/nnheaderxm.el:7.7 gnus/lisp/nnheaderxm.el:7.8
--- nnheaderxm.el:7.7 Thu Oct 4 20:51:28 2007
+++ nnheaderxm.el Mon Mar 10 01:53:11 2008
@@ -1,6 +1,6 @@
;;; nnheaderxm.el --- making Gnus backends work under XEmacs
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2008
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <[email protected]>
Index: parse-time.el
diff -u gnus/lisp/parse-time.el:7.9 gnus/lisp/parse-time.el:7.10
--- parse-time.el:7.9 Sun Jan 20 06:23:57 2008
+++ parse-time.el Mon Mar 10 01:53:11 2008
@@ -1,4 +1,4 @@
-;;; parse-time.el --- Parsing time strings
+;;; parse-time.el --- parsing time strings
;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
;; Free Software Foundation, Inc.
@@ -43,8 +43,8 @@
(defvar parse-time-digits (make-vector 256 nil))
;; Byte-compiler warnings
-(defvar elt)
-(defvar val)
+(defvar parse-time-elt)
+(defvar parse-time-val)
(unless (aref parse-time-digits ?0)
(loop for i from ?0 to ?9
@@ -134,45 +134,49 @@
((4) parse-time-months)
((5) (100 4038))
((2 1 0)
- ,#'(lambda () (and (stringp elt)
- (= (length elt) 8)
- (= (aref elt 2) ?:)
- (= (aref elt 5) ?:)))
+ ,#'(lambda () (and (stringp parse-time-elt)
+ (= (length parse-time-elt) 8)
+ (= (aref parse-time-elt 2) ?:)
+ (= (aref parse-time-elt 5) ?:)))
[0 2] [3 5] [6 8])
((8 7) parse-time-zoneinfo
- ,#'(lambda () (car val))
- ,#'(lambda () (cadr val)))
+ ,#'(lambda () (car parse-time-val))
+ ,#'(lambda () (cadr parse-time-val)))
((8)
,#'(lambda ()
- (and (stringp elt)
- (= 5 (length elt))
- (or (= (aref elt 0) ?+) (= (aref elt 0) ?-))))
- ,#'(lambda () (* 60 (+ (parse-integer elt 3 5)
- (* 60 (parse-integer elt 1 3)))
- (if (= (aref elt 0) ?-) -1 1))))
+ (and (stringp parse-time-elt)
+ (= 5 (length parse-time-elt))
+ (or (= (aref parse-time-elt 0) ?+)
+ (= (aref parse-time-elt 0) ?-))))
+ ,#'(lambda () (* 60 (+ (parse-integer parse-time-elt 3 5)
+ (* 60 (parse-integer parse-time-elt 1 3)))
+ (if (= (aref parse-time-elt 0) ?-) -1 1))))
((5 4 3)
- ,#'(lambda () (and (stringp elt)
- (= (length elt) 10)
- (= (aref elt 4) ?-)
- (= (aref elt 7) ?-)))
+ ,#'(lambda () (and (stringp parse-time-elt)
+ (= (length parse-time-elt) 10)
+ (= (aref parse-time-elt 4) ?-)
+ (= (aref parse-time-elt 7) ?-)))
[0 4] [5 7] [8 10])
((2 1 0)
- ,#'(lambda () (and (stringp elt) (= (length elt) 5) (= (aref elt 2) ?:)))
+ ,#'(lambda () (and (stringp parse-time-elt)
+ (= (length parse-time-elt) 5)
+ (= (aref parse-time-elt 2) ?:)))
[0 2] [3 5] ,#'(lambda () 0))
((2 1 0)
- ,#'(lambda () (and (stringp elt)
- (= (length elt) 4)
- (= (aref elt 1) ?:)))
+ ,#'(lambda () (and (stringp parse-time-elt)
+ (= (length parse-time-elt) 4)
+ (= (aref parse-time-elt 1) ?:)))
[0 1] [2 4] ,#'(lambda () 0))
((2 1 0)
- ,#'(lambda () (and (stringp elt)
- (= (length elt) 7)
- (= (aref elt 1) ?:)))
+ ,#'(lambda () (and (stringp parse-time-elt)
+ (= (length parse-time-elt) 7)
+ (= (aref parse-time-elt 1) ?:)))
[0 1] [2 4] [5 7])
- ((5) (50 110) ,#'(lambda () (+ 1900 elt)))
- ((5) (0 49) ,#'(lambda () (+ 2000 elt))))
+ ((5) (50 110) ,#'(lambda () (+ 1900 parse-time-elt)))
+ ((5) (0 49) ,#'(lambda () (+ 2000 parse-time-elt))))
"(slots predicate extractor...)")
+;;;###autoload
(defun parse-time-string (string)
"Parse the time-string STRING into (SEC MIN HOUR DAY MON YEAR DOW DST TZ).
The values are identical to those of `decode-time', but any values that are
@@ -180,24 +184,24 @@
(let ((time (list nil nil nil nil nil nil nil nil nil))
(temp (parse-time-tokenize (downcase string))))
(while temp
- (let ((elt (pop temp))
+ (let ((parse-time-elt (pop temp))
(rules parse-time-rules)
(exit nil))
(while (and (not (null rules)) (not exit))
(let* ((rule (pop rules))
(slots (pop rule))
(predicate (pop rule))
- (val))
+ (parse-time-val))
(when (and (not (nth (car slots) time)) ;not already set
- (setq val (cond ((and (consp predicate)
+ (setq parse-time-val (cond ((and (consp predicate)
(not (eq (car predicate)
'lambda)))
- (and (numberp elt)
- (<= (car predicate) elt)
- (<= elt (cadr predicate))
- elt))
+ (and (numberp parse-time-elt)
+ (<= (car predicate) parse-time-elt)
+ (<= parse-time-elt (cadr predicate))
+ parse-time-elt))
((symbolp predicate)
- (cdr (assoc elt
+ (cdr (assoc parse-time-elt
(symbol-value predicate))))
((funcall predicate)))))
(setq exit t)
@@ -206,9 +210,11 @@
(let ((this (pop rule)))
(if (vectorp this)
(parse-integer
- elt (aref this 0) (aref this 1))
+ parse-time-elt
+ (aref this 0) (aref this 1))
(funcall this))))))
- (rplaca (nthcdr (pop slots) time) (or new-val val)))))))))
+ (rplaca (nthcdr (pop slots) time)
+ (or new-val parse-time-val)))))))))
time))
(provide 'parse-time)
Index: time-date.el
diff -u gnus/lisp/time-date.el:7.13 gnus/lisp/time-date.el:7.14
--- time-date.el:7.13 Sun Feb 24 16:39:37 2008
+++ time-date.el Mon Mar 10 01:53:11 2008
@@ -110,6 +110,7 @@
(timezone-make-date-arpa-standard date)))
(error (error "Invalid date: %s" date))))
+;;;###autoload
(defun time-to-seconds (time)
"Convert time value TIME to a floating point number.
You can use `float-time' instead."
@@ -213,7 +214,7 @@
;;;###autoload
(defun time-to-day-in-year (time)
- "Return the day number within the year of the date month/day/year."
+ "Return the day number within the year corresponding to TIME."
(let* ((tim (decode-time time))
(month (nth 4 tim))
(day (nth 3 tim))