Mercurial > emacs
changeset 40997:70241447c9ef
(calc-settings-file-name): Don't hardcode
"~/.emacs"; use `read-file-name'.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Tue, 13 Nov 2001 07:29:33 +0000 |
| parents | 5a413baa253c |
| children | ee9c2872370b |
| files | lisp/calc/calc-mode.el |
| diffstat | 1 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calc/calc-mode.el Tue Nov 13 07:28:01 2001 +0000 +++ b/lisp/calc/calc-mode.el Tue Nov 13 07:29:33 2001 +0000 @@ -1,5 +1,5 @@ ;; Calculator for GNU Emacs, part II [calc-mode.el] -;; Copyright (C) 1990, 1991, 1992, 1993 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc. ;; Written by Dave Gillespie, daveg@synaptics.com. ;; This file is part of GNU Emacs. @@ -320,13 +320,18 @@ (run-hooks 'calc-mode-save-hook) (insert ";;; End of mode settings\n") (if quiet - (let ((executing-macro "")) ; what a kludge! + ;; FIXME: why is this here? -cgw 2001.11.12 + (let ((executing-kbd-macro "")) ; what a kludge! (save-buffer)) (save-buffer)))) ) (defun calc-settings-file-name (name &optional arg) - (interactive "sSettings file name (normally ~/.emacs): \nP") + (interactive + (list (read-file-name (format "Settings file name (normally %s): " + (abbreviate-file-name (or user-init-file + "~/.emacs")))) + current-prefix-arg)) (calc-wrapper (setq arg (if arg (prefix-numeric-value arg) 0)) (if (equal name "") @@ -336,13 +341,14 @@ (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 (string-match "\\.emacs" calc-settings-file) (> arg 0)) (< arg 0) (load name t) - (message "New file")))) -) + (message "New file"))))) (defun math-get-modes-vec () (list 'vec