[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc-prog.el
From: |
Jay Belanger |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc-prog.el |
Date: |
Sat, 19 Feb 2005 15:01:01 -0500 |
Index: emacs/lisp/calc/calc-prog.el
diff -c emacs/lisp/calc/calc-prog.el:1.24 emacs/lisp/calc/calc-prog.el:1.25
*** emacs/lisp/calc/calc-prog.el:1.24 Tue Feb 8 05:03:07 2005
--- emacs/lisp/calc/calc-prog.el Sat Feb 19 20:01:01 2005
***************
*** 671,677 ****
(defun calc-user-define-edit ()
(interactive) ; but no calc-wrapper!
(message "Edit definition of command: z-")
! (let* ((key (read-char))
(def (or (assq key (calc-user-key-map))
(assq (upcase key) (calc-user-key-map))
(assq (downcase key) (calc-user-key-map))
--- 671,678 ----
(defun calc-user-define-edit ()
(interactive) ; but no calc-wrapper!
(message "Edit definition of command: z-")
! (let* (cmdname
! (key (read-char))
(def (or (assq key (calc-user-key-map))
(assq (upcase key) (calc-user-key-map))
(assq (downcase key) (calc-user-key-map))
***************
*** 720,736 ****
;; Formatting the macro buffer
(defun calc-edit-macro-repeats ()
(goto-char calc-edit-top)
(while
(re-search-forward "^\\([0-9]+\\)\\*" nil t)
! (setq num (string-to-int (match-string 1)))
! (setq line (buffer-substring (point) (line-end-position)))
! (goto-char (line-beginning-position))
! (kill-line 1)
! (while (> num 0)
! (insert line "\n")
! (setq num (1- num)))))
(defun calc-edit-macro-adjust-buffer ()
(calc-edit-macro-repeats)
--- 721,739 ----
;; Formatting the macro buffer
+ (defvar calc-edit-top)
+
(defun calc-edit-macro-repeats ()
(goto-char calc-edit-top)
(while
(re-search-forward "^\\([0-9]+\\)\\*" nil t)
! (let ((num (string-to-int (match-string 1)))
! (line (buffer-substring (point) (line-end-position))))
! (goto-char (line-beginning-position))
! (kill-line 1)
! (while (> num 0)
! (insert line "\n")
! (setq num (1- num))))))
(defun calc-edit-macro-adjust-buffer ()
(calc-edit-macro-repeats)
***************
*** 916,922 ****
(delete-char 3)
(insert "<return>")))
- (defvar calc-edit-top)
(defun calc-edit-macro-finish-edit (cmdname key)
"Finish editing a Calc macro.
Redefine the corresponding command."
--- 919,924 ----