diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/calc/calc-arith.el | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2fabb8eade1..1c49034665c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-16 Thierry Banel <tbanelwebmin@free.fr> (tiny change) + + * calc/calc-arith.el (math-max-list, math-min-list): Fix bug + for date handling. + 2014-11-16 Andreas Schwab <schwab@linux-m68k.org> * version.el (emacs-repository-get-version): Use git rev-parse @@ -17,6 +22,7 @@ * mail/emacsbug.el (report-emacs-bug): Make a better guess at envelope-from when reporting through sendmail (bug#19054). +>>>>>>> 1a713024a012f574d16084cf42703e6ef49473cf 2014-11-16 Oscar Fuentes <ofv@wanadoo.es> diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el index 43b42038aa6..3a2d1598491 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)) |