Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 05:17:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/calc/calc-forms.el (calc-date-notation): Fix regexp

Browse source 
used to find time codes.  Fix symbol for seconds.
This commit is contained in:
Jay Belanger 2012-11-27 22:51:13 -06:00
parent 48d6d9c019
commit e7c8fcc44e
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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):

5
lisp/calc/calc-forms.el
View file

@ -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))