procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(calc-settings-file-name): Compare calc-settings-file to

Browse source 
user-init-file instead of ~/.emacs.  Replace ~/.emacs in a prompt by
calc-settings-file.
This commit is contained in:
Jay Belanger 2005-01-08 05:58:05 +00:00
parent fcda0a6649
commit c5a15067e5
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/calc/calc-mode.el
View file

@ -309,25 +309,22 @@
(defun calc-settings-file-name (name &optional arg)
(interactive
(list (read-file-name (format "Settings file name (normally %s): "
(abbreviate-file-name (or user-init-file
"~/.emacs"))))
(abbreviate-file-name calc-settings-file)))
current-prefix-arg))
(calc-wrapper
(setq arg (if arg (prefix-numeric-value arg) 0))
(if (equal name "")
(if (string-equal (file-name-nondirectory name) "")
(message "Calc settings file is \"%s\"" calc-settings-file)
(if (< (math-abs arg) 2)
(let ((list calc-mode-var-list))
(while list
(set (car (car list)) (nth 1 (car list)))
(setq list (cdr list)))))
;; FIXME: we should use ~/.calc or so in order to avoid
;; reexecuting ~/.emacs (it's not always idempotent) -cgw 2001.11.12
(setq calc-settings-file name)
(or (and
calc-settings-file
(string-match "\\.emacs" calc-settings-file)
(> arg 0))
(equal user-init-file calc-settings-file)
(> arg 0))
(< arg 0)
(load name t)
(message "New file")))))