# HG changeset patch
# User Jay Belanger <jay.p.belanger@gmail.com>
# Date 1104435805 0
# Node ID 644d716928bda7e0460a6806c4d0ce1ee667cb27
# Parent  f660508778f9993ae4ff022778c4d8745c05f6f5
(calc-user-define-edit, calc-finish-macro-edit)
(calc-user-define-permanent, calc-execute-kbd-macro):  Replace
obsolete function MacEdit-parse-keys with edmacro-parse-keys.

diff -r f660508778f9 -r 644d716928bd lisp/calc/calc-prog.el
--- a/lisp/calc/calc-prog.el	Thu Dec 30 18:08:14 2004 +0000
+++ b/lisp/calc/calc-prog.el	Thu Dec 30 19:43:25 2004 +0000
@@ -722,7 +722,7 @@
 					  (setcar mac new))))))))
 	     (let ((keys (progn (and (fboundp 'edit-kbd-macro)
 				     (edit-kbd-macro nil))
-				(fboundp 'MacEdit-parse-keys))))
+				(fboundp 'edmacro-parse-keys))))
 	       (calc-wrapper
 		(calc-edit-mode (list 'calc-finish-macro-edit
 				      (list 'quote def)
@@ -775,7 +775,7 @@
   (if (and keys (looking-at "\n")) (forward-line 1))
   (let* ((true-str (buffer-substring (point) (point-max)))
 	 (str true-str))
-    (if keys (setq str (MacEdit-parse-keys str)))
+    (if keys (setq str (edmacro-parse-keys str)))
     (if (symbolp (cdr def))
 	(if (stringp (symbol-function (cdr def)))
 	    (fset (cdr def) str)
@@ -1019,7 +1019,7 @@
 		  (vectorp (nth 1 (nth 3 fcmd)))
 		  (progn (and (fboundp 'edit-kbd-macro)
 			      (edit-kbd-macro nil))
-			 (fboundp 'MacEdit-parse-keys))
+			 (fboundp 'edmacro-parse-keys))
 		  (setq q-ok t)
 		  (aset (nth 1 (nth 3 fcmd)) 1 nil))
 	     (insert (setq str (prin1-to-string
@@ -1105,7 +1105,7 @@
       (setq mac (or (aref mac 1)
 		    (aset mac 1 (progn (and (fboundp 'edit-kbd-macro)
 					    (edit-kbd-macro nil))
-				       (MacEdit-parse-keys (aref mac 0)))))))
+				       (edmacro-parse-keys (aref mac 0)))))))
   (if (< (prefix-numeric-value arg) 0)
       (execute-kbd-macro mac (- (prefix-numeric-value arg)))
     (if calc-executing-macro