[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.12 emacs/lisp/calc/calc-prog.el:1.13
*** emacs/lisp/calc/calc-prog.el:1.12   Tue Nov 30 17:20:50 2004
--- emacs/lisp/calc/calc-prog.el        Wed Dec 29 04:04:09 2004
***************
*** 214,232 ****
         (setq cmd (intern (concat "calc-User-" keyname))))
       (while
         (progn
!          (setq func (completing-read "Define algebraic function name: "
!                                      obarray 'fboundp nil
!                                      (concat "calcFunc-"
!                                              (if cmd-base
!                                                  (if (string-match
!                                                       "\\`User-.+" cmd-base)
!                                                      (concat
!                                                       "User"
!                                                       (substring cmd-base 5))
!                                                    cmd-base)
!                                                "")))
!                func (and (not (or (string-equal func "")
!                                   (string-equal func "calcFunc-")))
                           (intern func)))
           (and func
                (fboundp func)
--- 214,238 ----
         (setq cmd (intern (concat "calc-User-" keyname))))
       (while
         (progn
!          (setq func 
!                  (concat "calcFunc-"
!                          (completing-read "Define algebraic function name: "
!                                           (mapcar (lambda (x) (substring x 9))
!                                                   (all-completions "calcFunc-"
!                                                                    obarray))
!                                           (lambda (x) 
!                                             (fboundp 
!                                              (intern (concat "calcFunc-" x))))
!                                           nil
!                                           (if cmd-base
!                                               (if (string-match
!                                                    "\\`User-.+" cmd-base)
!                                                   (concat
!                                                    "User"
!                                                    (substring cmd-base 5))
!                                                 cmd-base)
!                                             "")))
!                  func (and (not (string-equal func "calcFunc-"))
                           (intern func)))
           (and func
                (fboundp func)
***************
*** 359,366 ****
     (if (eq calc-language 'unform)
         (error "Can't define formats for unformatted mode"))
     (let* ((comp (calc-top 1))
!         (func (intern (completing-read "Define format for which function: "
!                                        obarray 'fboundp nil "calcFunc-")))
          (comps (get func 'math-compose-forms))
          entry entry2
          (arglist nil)
--- 365,379 ----
     (if (eq calc-language 'unform)
         (error "Can't define formats for unformatted mode"))
     (let* ((comp (calc-top 1))
!         (func (intern 
!                  (concat "calcFunc-"
!                          (completing-read "Define format for which function: "
!                                           (mapcar (lambda (x) (substring x 9))
!                                                   (all-completions "calcFunc-"
!                                                                    obarray))
!                                           (lambda (x) 
!                                             (fboundp 
!                                              (intern (concat "calcFunc-" 
x))))))))
          (comps (get func 'math-compose-forms))
          entry entry2
          (arglist nil)
***************
*** 952,961 ****
                   (assq (downcase key) (calc-user-key-map))
                   (and (eq key ?\')
                        (cons nil
                              (intern (completing-read
!                                      (format "Record in %s the function: "
                                               calc-settings-file)
!                                      obarray 'fboundp nil "calcFunc-"))))
                   (error "No command defined for that key"))))
       (set-buffer (find-file-noselect (substitute-in-file-name
                                      calc-settings-file)))
--- 965,988 ----
                   (assq (downcase key) (calc-user-key-map))
                   (and (eq key ?\')
                        (cons nil
+                               (intern
+                                (concat "calcFunc-"
+                                        (completing-read
+                                         (format "Record in %s the algebraic 
function: "
+                                                 calc-settings-file)
+                                         (mapcar (lambda (x) (substring x 9))
+                                                 (all-completions "calcFunc-"
+                                                                  obarray))
+                                         (lambda (x) 
+                                           (fboundp 
+                                            (intern (concat "calcFunc-" x))))
+                                         t)))))
+                    (and (eq key ?\M-x)
+                       (cons nil
                              (intern (completing-read
!                                      (format "Record in %s the command: "
                                               calc-settings-file)
!                                      obarray 'fboundp nil "calc-"))))
                   (error "No command defined for that key"))))
       (set-buffer (find-file-noselect (substitute-in-file-name
                                      calc-settings-file)))