components/emacs/patches/calc-forms.patch
author April Chin <april.chin@oracle.com>
Tue, 19 May 2015 14:52:54 -0700
branchs11-update
changeset 4326 967c8138ab7b
parent 3813 9a588fb8b9a1
child 4791 fb9a6b5ef98f
permissions -rw-r--r--
PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7 18681183 Remove Ruby 1.8

# Prevent uninterruptible infinite loop. This is the fix for
#    20270656 calc: sign change of hh.mm value puts Emacs into tight loop
# See components/emacs/README.
#
--- emacs-24.3.orig/lisp/calc/calc-forms.el	2013-01-01 13:37:17.000000000 -0700
+++ emacs-24.3/lisp/calc/calc-forms.el	2015-01-02 14:57:36.824358166 -0700
@@ -271,7 +271,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)