diff options
| author | Jay Belanger | 2014-09-04 20:04:47 -0500 |
|---|---|---|
| committer | Jay Belanger | 2014-09-04 20:04:47 -0500 |
| commit | 86e714105d760ce1bcc03cd4338b9839e0bfccb9 (patch) | |
| tree | 042d13f20bfd8e9abb6eeff2d840b5618cd1a970 | |
| parent | baee695a8b920aa39f50768d57aae18f9ba59e70 (diff) | |
| download | emacs-86e714105d760ce1bcc03cd4338b9839e0bfccb9.tar.gz emacs-86e714105d760ce1bcc03cd4338b9839e0bfccb9.zip | |
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 b2912deb23e..dc0c06709d5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-09-05 Jay Belanger <jay.p.belanger@gmail.com> | ||
| 2 | |||
| 3 | * calc/calc-forms.el (math-normalize-hms): Do a better check for | ||
| 4 | "negative" hms forms. | ||
| 5 | |||
| 1 | 2014-09-04 Rasmus Pank Roulund <emacs@pank.eu> | 6 | 2014-09-04 Rasmus Pank Roulund <emacs@pank.eu> |
| 2 | 7 | ||
| 3 | * vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status | 8 | * 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 dbde4cd0c41..a48075cce91 100644 --- a/lisp/calc/calc-forms.el +++ b/lisp/calc/calc-forms.el | |||
| @@ -273,7 +273,10 @@ | |||
| 273 | (m (math-normalize (nth 2 a))) | 273 | (m (math-normalize (nth 2 a))) |
| 274 | (s (let ((calc-internal-prec (max (- calc-internal-prec 4) 3))) | 274 | (s (let ((calc-internal-prec (max (- calc-internal-prec 4) 3))) |
| 275 | (math-normalize (nth 3 a))))) | 275 | (math-normalize (nth 3 a))))) |
| 276 | (if (math-negp h) | 276 | (if (or |
| 277 | (math-negp h) | ||
| 278 | (and (= h 0) (math-negp m)) | ||
| 279 | (and (= h 0) (= m 0) (math-negp s))) | ||
| 277 | (progn | 280 | (progn |
| 278 | (if (math-posp s) | 281 | (if (math-posp s) |
| 279 | (setq s (math-add s -60) | 282 | (setq s (math-add s -60) |