[Emacs-diffs] Changes to emacs/lisp/calc/calc-prog.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-prog.el
diff -c emacs/lisp/calc/calc-prog.el:1.14 emacs/lisp/calc/calc-prog.el:1.15
*** emacs/lisp/calc/calc-prog.el:1.14   Wed Dec 29 04:58:24 2004
--- emacs/lisp/calc/calc-prog.el        Thu Dec 30 19:43:25 2004
***************
*** 722,728 ****
                                          (setcar mac new))))))))
             (let ((keys (progn (and (fboundp 'edit-kbd-macro)
                                     (edit-kbd-macro nil))
!                               (fboundp 'MacEdit-parse-keys))))
               (calc-wrapper
                (calc-edit-mode (list 'calc-finish-macro-edit
                                      (list 'quote def)
--- 722,728 ----
                                          (setcar mac new))))))))
             (let ((keys (progn (and (fboundp 'edit-kbd-macro)
                                     (edit-kbd-macro nil))
!                               (fboundp 'edmacro-parse-keys))))
               (calc-wrapper
                (calc-edit-mode (list 'calc-finish-macro-edit
                                      (list 'quote def)
***************
*** 775,781 ****
    (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 (symbolp (cdr def))
        (if (stringp (symbol-function (cdr def)))
            (fset (cdr def) str)
--- 775,781 ----
    (if (and keys (looking-at "\n")) (forward-line 1))
    (let* ((true-str (buffer-substring (point) (point-max)))
         (str true-str))
!     (if keys (setq str (edmacro-parse-keys str)))
      (if (symbolp (cdr def))
        (if (stringp (symbol-function (cdr def)))
            (fset (cdr def) str)
***************
*** 1019,1025 ****
                  (vectorp (nth 1 (nth 3 fcmd)))
                  (progn (and (fboundp 'edit-kbd-macro)
                              (edit-kbd-macro nil))
!                        (fboundp 'MacEdit-parse-keys))
                  (setq q-ok t)
                  (aset (nth 1 (nth 3 fcmd)) 1 nil))
             (insert (setq str (prin1-to-string
--- 1019,1025 ----
                  (vectorp (nth 1 (nth 3 fcmd)))
                  (progn (and (fboundp 'edit-kbd-macro)
                              (edit-kbd-macro nil))
!                        (fboundp 'edmacro-parse-keys))
                  (setq q-ok t)
                  (aset (nth 1 (nth 3 fcmd)) 1 nil))
             (insert (setq str (prin1-to-string
***************
*** 1105,1111 ****
        (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)))))))
    (if (< (prefix-numeric-value arg) 0)
        (execute-kbd-macro mac (- (prefix-numeric-value arg)))
      (if calc-executing-macro
--- 1105,1111 ----
        (setq mac (or (aref mac 1)
                    (aset mac 1 (progn (and (fboundp 'edit-kbd-macro)
                                            (edit-kbd-macro nil))
!                                      (edmacro-parse-keys (aref mac 0)))))))
    (if (< (prefix-numeric-value arg) 0)
        (execute-kbd-macro mac (- (prefix-numeric-value arg)))
      (if calc-executing-macro