2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e425cb50d0..ad2b0fa9dfc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,10 @@
         * calc/calc-store.el (calc-copy-variable):  Fix mistyped variable
         name.  Change the way a variable is displayed in a message.
 
+        * calc/calc-prog.el (calc-user-define-edit, calc-finish-macro-edit)
+        (calc-user-define-permanent, calc-execute-kbd-macro):
+        Replace old function MacEdit-parse-keys with edmacro-parse-keys.
+
 2004-12-30  Kenichi Handa  <handa@m17n.org>
 
         * files.el (basic-save-buffer-1): Set
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index 88157cfb687..71f229a99d4 100644
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -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