mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 03:40:56 -08:00
Code Issues Projects Releases Wiki Activity

(calc-user-define-edit, calc-finish-macro-edit)

Browse source 
(calc-user-define-permanent, calc-execute-kbd-macro):  Replace
obsolete function MacEdit-parse-keys with edmacro-parse-keys.
This commit is contained in:
Jay Belanger 2004-12-30 19:45:12 +00:00
parent 5196b99994
commit 0c753fd78f
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/calc/calc-prog.el
View file

@ -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