[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master d775201 01/10: Fix the failing test
From: |
Oleh Krehel |
Subject: |
[elpa] master d775201 01/10: Fix the failing test |
Date: |
Wed, 30 Aug 2017 13:46:03 -0400 (EDT) |
branch: master
commit d775201a6e14aae03dda032132aa288ca93bddc4
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Fix the failing test
The test was failing because "Oct 15" was interpreted as "Oct 15 2016"
instead of "Oct 15 2015", due to passage of time.
---
tiny-test.el | 4 ++--
tiny.el | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tiny-test.el b/tiny-test.el
index 3d9ec54..1540e3d 100644
--- a/tiny-test.el
+++ b/tiny-test.el
@@ -150,7 +150,7 @@ convert img10.jpg -monochrome -resize 50% -rotate 180
img10_mono.pdf"))
;; 2744:196:14
;; 3375:225:15
;; 4096:256:16"))
- (should (equal (with-text-value "m\\n8|**** TODO Learning from Data Week %(+
x 2)\\nSCHEDULED: <%(date \"Oct 7\" (* x 7))> DEADLINE: <%(date \"Oct 14\" (* x
7))>"
+ (should (equal (with-text-value "m\\n8|**** TODO Learning from Data Week %(+
x 2)\\nSCHEDULED: <%(date \"Oct 7 2015\" (* x 7))> DEADLINE: <%(date \"Oct 14
2015\" (* x 7))>"
(lambda()(eval (read (tiny-mapconcat)))))
"**** TODO Learning from Data Week 2
SCHEDULED: <2015-10-07 Wed> DEADLINE: <2015-10-14 Wed>
@@ -170,7 +170,7 @@ SCHEDULED: <2015-11-18 Wed> DEADLINE: <2015-11-25 Wed>
SCHEDULED: <2015-11-25 Wed> DEADLINE: <2015-12-02 Wed>
**** TODO Learning from Data Week 10
SCHEDULED: <2015-12-02 Wed> DEADLINE: <2015-12-09 Wed>"))
- (should (string= (with-text-value "m\\n4|**** TODO Classical Mechanics Week
%(+ x 5)\\nSCHEDULED: <%(date \"Oct 15\" (* x 7))> DEADLINE: <%(date \"Oct 23\"
(* x 7))>"
+ (should (string= (with-text-value "m\\n4|**** TODO Classical Mechanics Week
%(+ x 5)\\nSCHEDULED: <%(date \"Oct 15 2015\" (* x 7))> DEADLINE: <%(date \"Oct
23 2015\" (* x 7))>"
(lambda()(eval (read (tiny-mapconcat)))))
"**** TODO Classical Mechanics Week 5
SCHEDULED: <2015-10-15 Thu> DEADLINE: <2015-10-23 Fri>
diff --git a/tiny.el b/tiny.el
index 90c89d5..f6b2b02 100644
--- a/tiny.el
+++ b/tiny.el
@@ -335,7 +335,8 @@ Return nil if nothing was matched, otherwise
(if (equal str "")
""
(ignore-errors
- (let ((i 0) (j 1)
+ (let ((i 0)
+ (j 1)
(len (length str))
sym s out allow-spc
(n-paren 0)
@@ -373,7 +374,8 @@ Return nil if nothing was matched, otherwise
((progn (setq sym (intern-soft s))
(cond
;; general functionp
- ((not (eq t (help-function-arglist sym)))
+ ((and (not (eq t (help-function-arglist sym)))
+ (not (eq sym '\,)))
(setq expect-fun nil)
(setq allow-spc t)
;; (when (zerop n-paren) (push "(" out))
- [elpa] master updated (78af78e -> 3f47a2a), Oleh Krehel, 2017/08/30
- [elpa] master c501c16 02/10: allow for easier decreasing lists as well, Oleh Krehel, 2017/08/30
- [elpa] master 79ecc9d 04/10: Makefile: Fix "test" target offline, Oleh Krehel, 2017/08/30
- [elpa] master e959cd5 03/10: add a couple tests, Oleh Krehel, 2017/08/30
- [elpa] master d775201 01/10: Fix the failing test,
Oleh Krehel <=
- [elpa] master 1766056 06/10: .travis.yml: Try to install undercover, Oleh Krehel, 2017/08/30
- [elpa] master f1f40b6 05/10: .travis.yml: Try without Cask, Oleh Krehel, 2017/08/30
- [elpa] master 3ae24d6 09/10: tiny.el: Bump version, Oleh Krehel, 2017/08/30
- [elpa] master 354b635 08/10: Add tiny-helper command, Oleh Krehel, 2017/08/30
- [elpa] master 6e8e8ad 07/10: Minor Commentary edits, Oleh Krehel, 2017/08/30
- [elpa] master 3f47a2a 10/10: Merge commit '3ae24d6b02b3b13a5468174599183102e1cb3c11' from tiny, Oleh Krehel, 2017/08/30