[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] [emacs] 01/02: 2014-11-16 Thierry Banel <address@hidden> (
From: |
Jay Belanger |
Subject: |
[Emacs-diffs] [emacs] 01/02: 2014-11-16 Thierry Banel <address@hidden> (tiny change) |
Date: |
Sun, 16 Nov 2014 05:27:58 +0000 |
jpb pushed a commit to branch master
in repository emacs.
commit 1a30156b984735be444d54e51c40bc3243345110
Author: Thierry Banel <address@hidden>
Date: Sat Nov 15 23:24:25 2014 -0600
2014-11-16 Thierry Banel <address@hidden> (tiny change)
* calc-arith.el (math-max-list, math-min-list): Fix bug
for date handling.
---
lisp/ChangeLog | 5 +++++
lisp/calc/calc-arith.el | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cfb7900..9a9e431 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-16 Thierry Banel <address@hidden> (tiny change)
+
+ * calc/calc-arith.el (math-max-list, math-min-list): Fix bug
+ for date handling.
+
2014-11-16 Oscar Fuentes <address@hidden>
Add faces for the VC modeline state indicator.
diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index 43b4203..3a2d159 100644
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -2249,7 +2249,7 @@
(defun math-min-list (a b)
(if b
- (if (or (Math-anglep (car b)) (eq (car b) 'date)
+ (if (or (Math-anglep (car b)) (eq (caar b) 'date)
(and (eq (car (car b)) 'intv) (math-intv-constp (car b)))
(math-infinitep (car b)))
(math-min-list (math-min a (car b)) (cdr b))
@@ -2279,7 +2279,7 @@
(defun math-max-list (a b)
(if b
- (if (or (Math-anglep (car b)) (eq (car b) 'date)
+ (if (or (Math-anglep (car b)) (eq (caar b) 'date)
(and (eq (car (car b)) 'intv) (math-intv-constp (car b)))
(math-infinitep (car b)))
(math-max-list (math-max a (car b)) (cdr b))