X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5025cdbcdca9c30c39729859003192a881f2e1a3..d2c6f2fbdb6b8489820ec00c66b03dae42498edf:/dot/emacs-calc

diff --git a/dot/emacs-calc b/dot/emacs-calc
index 0cea5a6..4754b4c 100644
--- a/dot/emacs-calc
+++ b/dot/emacs-calc
@@ -51,11 +51,16 @@ obtained using `z n' (`calc-integrate-numerically')."
 (put 'calc-define 'calc-path-length
      '(progn (define-key calc-mode-map "zp" 'calc-path-length)))
 
-(defvar var-IntegNumerRules 'calc-IntegNumerRules)
-(defun calc-IntegNumerRules ()
-  (math-read-plain-expr "[
-integ(f, x, a, b) := ninteg(f, x, a, b) :: constant(a) :: constant(b)
-]"))
+(defvar var-IntegNumerRules
+  '(vec (calcFunc-condition
+	 (calcFunc-condition
+	  (calcFunc-assign
+	   (calcFunc-integ (var f var-f) (var x var-x)
+			   (var a var-a) (var b var-b))
+	   (calcFunc-ninteg (var f var-f) (var x var-x)
+			    (var a var-a) (var b var-b)))
+	  (calcFunc-constant (var a var-a)))
+	 (calcFunc-constant (var b var-b)))))
 
 (defun calc-integrate-numerically ()
   "Computes an approximate result for a symbolic definite integral with
@@ -67,38 +72,49 @@ constant bounds."
 (put 'calc-define 'calc-integrate-numerically
      '(progn (define-key calc-mode-map "zn" 'calc-integrate-numerically)))
 
+(setq calc-highlight-selections-with-faces t
+      calc-show-selections nil)
 
 ;;; Mode settings stored by Calc on Mon Mar 15 16:25:50 2004
 (setq calc-group-char " ")
 (setq calc-frac-format '("/" nil))
 (setq calc-date-format '(Www " " D " " Mmmm " " YYYY (", " h ":" mm ":" ss)))
-(setq calc-standard-date-formats '("N" "<H:mmCSSpp >Www Mmm D, YYYY" "YYYY-MM-DD< hh:mm:ss>" "Www Mmm BD< hh:mm:ss> YYYY" "Www D Mmmm YYYY<, h:mm:ss>" "D.M.Y< h:mm:SS>" "M-D-Y< H:mm:SSpp>" "D-M-Y< h:mmCSS>" "j<, h:mm:SS>" "YYddd< hh:mm:ss>"))
+(setq calc-standard-date-formats '("N"
+				   "<H:mmCSSpp >Www Mmm D, YYYY"
+				   "YYYY-MM-DD< hh:mm:ss>"
+				   "Www Mmm BD< hh:mm:ss> YYYY"
+				   "Www D Mmmm YYYY<, h:mm:ss>"
+				   "D.M.Y< h:mm:SS>"
+				   "M-D-Y< H:mm:SSpp>"
+				   "D-M-Y< h:mmCSS>"
+				   "j<, h:mm:SS>"
+				   "YYddd< hh:mm:ss>"))
 (setq calc-complex-format 'i)
 (setq calc-previous-modulo '(bigpos 296 967 294 4))
 (setq calc-angle-mode 'rad)
 ;;; End of mode settings
 
 ;;; Custom units stored by Calc on Thu Mar 18 19:02:50 1999
-(setq math-additional-units '(
-  (EB "1024 * PB" "Exabyte")
-  (PB "1024 * TB" "Petabyte")
-  (TB "1024 * GB" "Terabyte")
-  (gig "GB" "Gigabyte")
-  (GB "1024 * MB" "Gigabyte")
-  (meg "MB" "Megabyte")
-  (MB "1024 * kB" "Megabyte")
-  (KB "kB" "Kilobyte")
-  (kB "1024 * byte" "Kilobyte")
-  (Eb "1024 * Pb" "Exabit")
-  (Pb "1024 * Tb" "Petabit")
-  (Tb "1024 * Gb" "Teraabit")
-  (Gb "1024 * Mb" "Gigabit")
-  (Mb "1024 * kb" "Megabit")
-  (Kb "kb" "Kilobit")
-  (kb "1024 * bit" "Kilobit")
-  (byte "octet" "Byte")
-  (octet "8 * bit" "Octet")
-  (bit nil "Bit")))
+(setq math-additional-units
+	'((EB "1024 * PB" "Exabyte")
+	  (PB "1024 * TB" "Petabyte")
+	  (TB "1024 * GB" "Terabyte")
+	  (gig "GB" "Gigabyte")
+	  (GB "1024 * MB" "Gigabyte")
+	  (meg "MB" "Megabyte")
+	  (MB "1024 * kB" "Megabyte")
+	  (KB "kB" "Kilobyte")
+	  (kB "1024 * byte" "Kilobyte")
+	  (Eb "1024 * Pb" "Exabit")
+	  (Pb "1024 * Tb" "Petabit")
+	  (Tb "1024 * Gb" "Teraabit")
+	  (Gb "1024 * Mb" "Gigabit")
+	  (Mb "1024 * kb" "Megabit")
+	  (Kb "kb" "Kilobit")
+	  (kb "1024 * bit" "Kilobit")
+	  (byte "octet" "Byte")
+	  (octet "8 * bit" "Octet")
+	  (bit nil "Bit")))
 ;;; End of custom units
 
 ;;; Variable "var-AlgSimpRules" stored by Calc on Thu Jan  6 21:04:23 2000