| author | Brian Utterback <brian.utterback@oracle.com> |
| Fri, 03 Mar 2017 10:53:18 -0800 | |
| branch | s11u3-sru |
| changeset 7927 | 9a07678a4c7f |
| parent 3813 | 9a588fb8b9a1 |
| child 4791 | fb9a6b5ef98f |
| permissions | -rw-r--r-- |
|
3813
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
1 |
# Prevent uninterruptible infinite loop. This is the fix for |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
2 |
# 20270656 calc: sign change of hh.mm value puts Emacs into tight loop |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
3 |
# See components/emacs/README. |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
4 |
# |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
5 |
--- emacs-24.3.orig/lisp/calc/calc-forms.el 2013-01-01 13:37:17.000000000 -0700 |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
6 |
+++ emacs-24.3/lisp/calc/calc-forms.el 2015-01-02 14:57:36.824358166 -0700 |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
7 |
@@ -271,7 +271,10 @@ |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
8 |
(m (math-normalize (nth 2 a))) |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
9 |
(s (let ((calc-internal-prec (max (- calc-internal-prec 4) 3))) |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
10 |
(math-normalize (nth 3 a))))) |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
11 |
- (if (math-negp h) |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
12 |
+ (if (or |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
13 |
+ (math-negp h) |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
14 |
+ (and (= h 0) (math-negp m)) |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
15 |
+ (and (= h 0) (= m 0) (math-negp s))) |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
16 |
(progn |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
17 |
(if (math-posp s) |
|
9a588fb8b9a1
20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff
changeset
|
18 |
(setq s (math-add s -60) |