From 7679290d6ea68280dc4f6665156f178ec3bdcbc1 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Wed, 19 Jan 2005 16:49:06 +0000 Subject: (calc-fancy-prefix-other-key): Don't clear flags if the last command was a tab or M-tab. --- lisp/calc/calc-ext.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lisp/calc/calc-ext.el') 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)) -- cgit v1.2.3 From 3a91dd3e50cd2c2bc919dc55fa7abeca7a8cb47d Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Fri, 21 Jan 2005 05:43:09 +0000 Subject: (calc-fancy-prefix-other-key): Set prefix arg. --- lisp/calc/calc-ext.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/calc/calc-ext.el') diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 059dab35767..8d3be3b8505 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -1401,6 +1401,7 @@ calc-kill calc-kill-region calc-yank)))) (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. + (setq prefix-arg arg) (calc-unread-command) (setq overriding-terminal-local-map nil)) -- cgit v1.2.3