? poe-pdump.dif Index: poe.el =================================================================== RCS file: /cvs/root/apel/poe.el,v retrieving revision 1.78 diff -c -c -r1.78 poe.el *** poe.el 2001/10/15 02:13:52 1.78 --- poe.el 2001/11/01 17:52:37 *************** *** 1486,1495 **** ;; format string "%z" nor the third argument `universal'. (unless (string-match "\\`[\\-\\+][0-9]+\\'" (format-time-string "%z" (current-time))) ! (defadvice format-time-string ! (before support-timezone-in-numeric-form-and-3rd-arg ! (format-string &optional time universal) activate compile) ! "Advice to support the construct `%z' and the third argument `universal'." (let ((tz (car (current-time-zone))) case-fold-search ms ls) (while (string-match "\\(\\(\\`\\|[^%]\\)\\(%%\\)*\\)%z" format-string) --- 1486,1547 ---- ;; format string "%z" nor the third argument `universal'. (unless (string-match "\\`[\\-\\+][0-9]+\\'" (format-time-string "%z" (current-time))) ! (or (fboundp 'si:format-time-string) ! (progn ! (fset 'si:format-time-string (symbol-function 'format-time-string)) ! (defun format-time-string (format-string &optional time universal) ! "Use FORMAT-STRING to format the time TIME, or now if omitted. ! TIME is specified as (HIGH LOW . IGNORED) or (HIGH . LOW), as returned by ! `current-time' or `file-attributes'. ! The third, optional, argument UNIVERSAL, if non-nil, means describe TIME ! as Universal Time; nil means describe TIME in the local time zone. ! The value is a copy of FORMAT-STRING, but with certain constructs replaced ! by text that describes the specified date and time in TIME: ! ! %Y is the year, %y within the century, %C the century. ! %G is the year corresponding to the ISO week, %g within the century. ! %m is the numeric month. ! %b and %h are the locale's abbreviated month name, %B the full name. ! %d is the day of the month, zero-padded, %e is blank-padded. ! %u is the numeric day of week from 1 (Monday) to 7, %w from 0 (Sunday) to 6. ! %a is the locale's abbreviated name of the day of week, %A the full name. ! %U is the week number starting on Sunday, %W starting on Monday, ! %V according to ISO 8601. ! %j is the day of the year. ! ! %H is the hour on a 24-hour clock, %I is on a 12-hour clock, %k is like %H ! only blank-padded, %l is like %I blank-padded. ! %p is the locale's equivalent of either AM or PM. ! %M is the minute. ! %S is the second. ! %Z is the time zone name, %z is the numeric form. ! %s is the number of seconds since 1970-01-01 00:00:00 +0000. ! ! %c is the locale's date and time format. ! %x is the locale's \"preferred\" date format. ! %D is like \"%m/%d/%y\". ! ! %R is like \"%H:%M\", %T is like \"%H:%M:%S\", %r is like \"%I:%M:%S %p\". ! %X is the locale's \"preferred\" time format. ! ! Finally, %n is a newline, %t is a tab, %% is a literal %. ! ! Certain flags and modifiers are available with some format controls. ! The flags are `_' and `-'. For certain characters X, %_X is like %X, ! but padded with blanks; %-X is like %X, but without padding. ! %NX (where N stands for an integer) is like %X, ! but takes up at least N (a number) positions. ! The modifiers are `E' and `O'. For certain characters X, ! %EX is a locale's alternative version of %X; ! %OX is like %X, but uses the locale's number symbols. ! ! For example, to produce full ISO 8601 format, use \"%Y-%m-%dT%T%z\". ! ! Compatibility Note. ! ! Those format constructs are yet to be implemented. ! %c, %C, %j, %U, %W, %x, %X ! Not fully compatible especially when invalid format is specified." (let ((tz (car (current-time-zone))) case-fold-search ms ls) (while (string-match "\\(\\(\\`\\|[^%]\\)\\(%%\\)*\\)%z" format-string) *************** *** 1521,1527 **** ((>= ls 65536) (setq ms (1+ ms) ls (- ls 65536)))) ! (setq time (append (list ms ls) (nth 2 time)))))))) ;; Emacs 20.1/XEmacs 20.3(?) and later: (split-string STRING &optional PATTERN) ;; Here is a XEmacs version. --- 1573,1580 ---- ((>= ls 65536) (setq ms (1+ ms) ls (- ls 65536)))) ! (setq time (append (list ms ls) (nth 2 time)))))) ! (si:format-time-string format-string time))))) ;; Emacs 20.1/XEmacs 20.3(?) and later: (split-string STRING &optional PATTERN) ;; Here is a XEmacs version.