[Emacs-diffs] /srv/bzr/emacs/trunk r111021: * lisp/calc/calc-forms.el (calc-date-notation): Fix regexp

[Jay Belanger]

------------------------------------------------------------
revno: 111021
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Tue 2012-11-27 22:51:13 -0600
message:
  * lisp/calc/calc-forms.el (calc-date-notation): Fix regexp
    used to find time codes.  Fix symbol for seconds.
modified:
  lisp/ChangeLog
  lisp/calc/calc-forms.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-27 16:40:04 +0000
+++ b/lisp/ChangeLog    2012-11-28 04:51:13 +0000
@@ -1,3 +1,8 @@
+2012-11-28  Jay Belanger  <address@hidden>
+
+       * calc/calc-forms.el (calc-date-notation): Fix regexp
+       used to find time codes.  Fix symbol for seconds.
+
 2012-11-27  Glenn Morris  <address@hidden>
 
        * emacs-lisp/derived.el (derived-mode-make-docstring):

=== modified file 'lisp/calc/calc-forms.el'
--- a/lisp/calc/calc-forms.el   2012-11-19 05:03:08 +0000
+++ b/lisp/calc/calc-forms.el   2012-11-28 04:51:13 +0000
@@ -94,7 +94,8 @@
        (setcar (nthcdr arg calc-standard-date-formats) fmt))
    (let ((case-fold-search nil))
      (and (not (string-match "<.*>" fmt))
-         (string-match 
"\\`[^hHspP]*\\([^ac-gi-lnoqrt-zAC-GI-OQRT-Z]*[bBhHmpPsS]+[^ac-gi-lnoqrt-zAC-GI-OQRT-Z]*\\)[^hHspP]*\\'"
 fmt)
+          ;; Find time part to put in <...>
+         (string-match 
"\\`[^hHspP]*\\([^ac-gi-lnoqrt-zAC-GI-OQRT-Z]*\\(bs\\|bm\\|bh\\|BS\\|BH\\|[hHmpPsS]\\)+[^ac-gi-lnoqrt-zAC-GI-OQRT-Z]*\\)[^hHspP]*\\'"
 fmt)
          (string-match (concat "[^ac-gi-lnoqrt-zAC-GI-OQRT-Z]*"
                                (regexp-quote (math-match-substring fmt 1))
                                "[^ac-gi-lnoqrt-zAC-GI-OQRT-Z]*") fmt)
@@ -140,7 +141,7 @@
                                W www Www Wwww WWW WWWW
                                h hh bh H HH BH
                                p P pp PP pppp PPPP
-                               m mm bm s ss bss SS BS C
+                               m mm bm s ss bs SS BS C
                                N n J j U b))
                  (and (eq sym 'X) (not lfmt) (not fullfmt))
                  (error "Bad format code: %s" sym))