From: Mattias Engdegård <mattiase@acm.org>
Date: Wed, 22 Jul 2020 09:27:15 +0000 (+0200)
Subject: Calc: fix interval entry snag (bug#42438)
X-Git-Tag: emacs-28.0.90~6950
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=687a9d3e2fca5f207ec3bd6acf744d0c0cd96962;p=emacs.git

Calc: fix interval entry snag (bug#42438)

* lisp/calc/calc.el (calcDigit-key): Don't signal a 'Bad format' error
when entering '..' after pushing an incomplete interval.

Reported by Allen Li.
---

diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 4e4fb671730..09b49621070 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -2429,7 +2429,7 @@ the United States."
 	  (if (and (memq last-command-event '(?@ ?o ?h ?\' ?m))
 		   (string-match " " calc-hms-format))
 	      (insert " "))
-	(if (and (eq this-command last-command)
+	(if (and (memq last-command '(calcDigit-start calcDigit-key))
 		 (eq last-command-event ?.))
 	    (progn
 	      (require 'calc-ext)