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 @@
+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 dbde4cd0c41..a48075cce91 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)