diff options
| author | Jay Belanger <jay.p.belanger@gmail.com> | 2014-09-04 20:04:47 -0500 |
|---|---|---|
| committer | Jay Belanger <jay.p.belanger@gmail.com> | 2014-09-04 20:04:47 -0500 |
| commit | 86e714105d760ce1bcc03cd4338b9839e0bfccb9 (patch) | |
| tree | 042d13f20bfd8e9abb6eeff2d840b5618cd1a970 | |
| parent | baee695a8b920aa39f50768d57aae18f9ba59e70 (diff) | |
calc/calc-forms.el (math-normalize-hms): Do a better check for
"negative" hms forms.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calc/calc-forms.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b2912deb23..dc0c06709d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-09-05 Jay Belanger <jay.p.belanger@gmail.com> + + * calc/calc-forms.el (math-normalize-hms): Do a better check for + "negative" hms forms. + 2014-09-04 Rasmus Pank Roulund <emacs@pank.eu> * vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el index dbde4cd0c4..a48075cce9 100644 --- a/lisp/calc/calc-forms.el +++ b/lisp/calc/calc-forms.el @@ -273,7 +273,10 @@ (m (math-normalize (nth 2 a))) (s (let ((calc-internal-prec (max (- calc-internal-prec 4) 3))) (math-normalize (nth 3 a))))) - (if (math-negp h) + (if (or + (math-negp h) + (and (= h 0) (math-negp m)) + (and (= h 0) (= m 0) (math-negp s))) (progn (if (math-posp s) (setq s (math-add s -60) |