diff options
| author | Jay Belanger <jay.p.belanger@gmail.com> | 2012-11-27 22:51:13 -0600 |
|---|---|---|
| committer | Jay Belanger <jay.p.belanger@gmail.com> | 2012-11-27 22:51:13 -0600 |
| commit | e7c8fcc44eff6dbc6ccb6ebc7f6389233ee516ab (patch) | |
| tree | 22bb18c81564605c1eaa9e5fa8e454c127dd223e | |
| parent | 48d6d9c01917c8dc7b29dfb208962224bf1d3035 (diff) | |
| download | emacs-e7c8fcc44eff6dbc6ccb6ebc7f6389233ee516ab.tar.gz | |
* lisp/calc/calc-forms.el (calc-date-notation): Fix regexp
used to find time codes. Fix symbol for seconds.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calc/calc-forms.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6a1ac6f680d..1ec3c88fbc2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-11-28 Jay Belanger <jay.p.belanger@gmail.com> + + * calc/calc-forms.el (calc-date-notation): Fix regexp + used to find time codes. Fix symbol for seconds. + 2012-11-27 Glenn Morris <rgm@gnu.org> * emacs-lisp/derived.el (derived-mode-make-docstring): diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el index 98b22550f75..15a153059a8 100644 --- a/lisp/calc/calc-forms.el +++ b/lisp/calc/calc-forms.el @@ -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)) |