Attachment 302475 Details for Bug 442564 – xemacs-calc.patch

xemacs-calc.patch

xemacs-calc.patch (text/x-patch), 2.50 KB, created by Alan Matsuoka on 2008-04-15 15:20:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Matsuoka

Created: 2008-04-15 15:20:28 UTC

Size: 2.50 KB

patch

obsolete

>diff -Naurp xemacs-sumo-20040818/xemacs-packages/lisp/calc/calc.el xemacs-sumo-20040818-mod/xemacs-packages/lisp/calc/calc.el
>--- xemacs-sumo-20040818/xemacs-packages/lisp/calc/calc.el	2004-06-06 12:19:56.000000000 +0100
>+++ xemacs-sumo-20040818-mod/xemacs-packages/lisp/calc/calc.el	2008-03-17 16:28:56.000000000 +0000
>@@ -82,9 +82,15 @@
> (defvar calc-info-filename "calc.info"
>   "*File name in which to look for the Calculator's Info documentation.")
> 
>-;;;###autoload
>-(defvar calc-settings-file user-init-file
>-  "*File in which to record permanent settings; default is `user-init-file'.")
>+(defgroup calc nil
>+  "Calculator settings."
>+  :prefix "calc-"
>+  :group 'emacs)
>+
>+(defcustom calc-settings-file (expand-file-name ".calc.el" (getenv "HOME"))
>+  "*File in which to record permanent settings; default is `~/.calc.el'."
>+  :type 'file
>+  :group 'calc)
> 
> ;;;###autoload
> (defvar calc-autoload-directory nil
>@@ -1059,11 +1065,10 @@ Notations:  3.14e6     3.14 * 10^6
> 				   (setq calc-stack (list (list 'top-of-stack
> 								1 nil))))))
>   (setq calc-stack-top (- (length calc-stack) calc-stack-top -1))
>-  (or calc-loaded-settings-file
>-      (string-match "\\.emacs" calc-settings-file)
>-      (progn
>-	(setq calc-loaded-settings-file t)
>-	(load calc-settings-file t)))   ; t = missing-ok
>+  (unless calc-loaded-settings-file
>+    (when (file-exists-p calc-settings-file)
>+      (load-file calc-settings-file))
>+    (setq calc-loaded-settings-file t))
>   (if (and (eq window-system 'x) (boundp 'mouse-map))
>       (substitute-key-definition 'x-paste-text 'calc-x-paste-text
> 				 mouse-map))
>diff -Naurp xemacs-sumo-20040818/xemacs-packages/lisp/calc/calc-mode.el xemacs-sumo-20040818-mod/xemacs-packages/lisp/calc/calc-mode.el
>--- xemacs-sumo-20040818/xemacs-packages/lisp/calc/calc-mode.el	1998-07-19 14:42:23.000000000 +0100
>+++ xemacs-sumo-20040818-mod/xemacs-packages/lisp/calc/calc-mode.el	2008-03-17 16:28:57.000000000 +0000
>@@ -326,7 +326,7 @@
> )
> 
> (defun calc-settings-file-name (name &optional arg)
>-  (interactive "sSettings file name (normally ~/.emacs): \nP")
>+  (interactive "sSettings file name (normally ~/.calc.el): \nP")
>   (calc-wrapper
>    (setq arg (if arg (prefix-numeric-value arg) 0))
>    (if (equal name "")
>@@ -337,7 +337,7 @@
> 	     (set (car (car list)) (nth 1 (car list)))
> 	     (setq list (cdr list)))))
>      (setq calc-settings-file name)
>-     (or (and (string-match "\\.emacs" calc-settings-file)
>+     (or (and (string-match "\\.calc.el" calc-settings-file)
> 	      (> arg 0))
> 	 (< arg 0)
> 	 (load name t)

Actions: View

Attachments on bug 442564: 302475 | 302476