Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/emacs/patches/calc-forms.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 28 Jan 2016 07:08:16 -0800
changeset 5357 76a31ece4c74
parent 4791 fb9a6b5ef98f
permissions -rw-r--r--
22611402 irssi should be 64-bit
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3626
48d8d7ae6e0a 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
48d8d7ae6e0a 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
48d8d7ae6e0a 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.
48d8d7ae6e0a 20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     4
 
#
4791
fb9a6b5ef98f 21481648 update GNU Emacs to 24.5
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 3626
diff changeset 
     5
 
--- emacs-24.5.orig/lisp/calc/calc-forms.el	2015-04-02 01:23:06.000000000 -0600
fb9a6b5ef98f 21481648 update GNU Emacs to 24.5
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 3626
diff changeset 
     6
 
+++ emacs-24.5/lisp/calc/calc-forms.el	2015-06-29 11:29:19.191046059 -0600
fb9a6b5ef98f 21481648 update GNU Emacs to 24.5
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents: 3626
diff changeset 
     7
 
@@ -273,7 +273,10 @@
3626
48d8d7ae6e0a 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)))
48d8d7ae6e0a 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)))
48d8d7ae6e0a 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)))))
48d8d7ae6e0a 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)
48d8d7ae6e0a 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
48d8d7ae6e0a 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)
48d8d7ae6e0a 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))
48d8d7ae6e0a 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)))
48d8d7ae6e0a 20270656 calc: sign change of hh.mm value puts Emacs into tight loop
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    16
 
 	(progn
48d8d7ae6e0a 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)
48d8d7ae6e0a 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)
upstream/oracle/userland-gate