2 files changed, 11 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d53a10d40d..0a801ad992f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-19  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-ext.el (calc-fancy-prefix-other-key): Don't clear
+        flags if the last command was a tab or M-tab.
+
 2005-01-19  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-put-breakpoint-icon): Add help-echo for
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 280c3ca634b..059dab35767 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1394,9 +1394,12 @@ calc-kill calc-kill-region calc-yank))))
 
 (defun calc-fancy-prefix-other-key (arg)
   (interactive "P")
-  (if (or (not (integerp last-command-char))
-          (and (>= last-command-char 0) (< last-command-char ? )
-               (not (eq last-command-char meta-prefix-char))))
+  (if (and
+       (not (eq last-command-char 'tab))
+       (not (eq last-command-char 'M-tab))
+       (or (not (integerp last-command-char))
+           (and (>= last-command-char 0) (< last-command-char ? )
+                (not (eq last-command-char meta-prefix-char)))))
      (calc-wrapper))  ; clear flags if not a Calc command.
   (calc-unread-command)
   (setq overriding-terminal-local-map nil))