Mercurial > emacs
comparison lisp/calc/calc-mode.el @ 59417:8cb9d2c5b48e
(calc-settings-file-name): Compare calc-settings-file to
user-init-file instead of ~/.emacs. Replace ~/.emacs in a prompt by
calc-settings-file.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Sat, 08 Jan 2005 05:58:05 +0000 |
| parents | eb797263e910 |
| children | 8a30a4431922 cb67264d6096 |
comparison
equal
deleted
inserted
replaced
| 59416:d736a1979b98 | 59417:8cb9d2c5b48e |
|---|---|
| 307 (save-buffer)))) | 307 (save-buffer)))) |
| 308 | 308 |
| 309 (defun calc-settings-file-name (name &optional arg) | 309 (defun calc-settings-file-name (name &optional arg) |
| 310 (interactive | 310 (interactive |
| 311 (list (read-file-name (format "Settings file name (normally %s): " | 311 (list (read-file-name (format "Settings file name (normally %s): " |
| 312 (abbreviate-file-name (or user-init-file | 312 (abbreviate-file-name calc-settings-file))) |
| 313 "~/.emacs")))) | |
| 314 current-prefix-arg)) | 313 current-prefix-arg)) |
| 315 (calc-wrapper | 314 (calc-wrapper |
| 316 (setq arg (if arg (prefix-numeric-value arg) 0)) | 315 (setq arg (if arg (prefix-numeric-value arg) 0)) |
| 317 (if (equal name "") | 316 (if (string-equal (file-name-nondirectory name) "") |
| 318 (message "Calc settings file is \"%s\"" calc-settings-file) | 317 (message "Calc settings file is \"%s\"" calc-settings-file) |
| 319 (if (< (math-abs arg) 2) | 318 (if (< (math-abs arg) 2) |
| 320 (let ((list calc-mode-var-list)) | 319 (let ((list calc-mode-var-list)) |
| 321 (while list | 320 (while list |
| 322 (set (car (car list)) (nth 1 (car list))) | 321 (set (car (car list)) (nth 1 (car list))) |
| 323 (setq list (cdr list))))) | 322 (setq list (cdr list))))) |
| 324 ;; FIXME: we should use ~/.calc or so in order to avoid | |
| 325 ;; reexecuting ~/.emacs (it's not always idempotent) -cgw 2001.11.12 | |
| 326 (setq calc-settings-file name) | 323 (setq calc-settings-file name) |
| 327 (or (and | 324 (or (and |
| 328 calc-settings-file | 325 calc-settings-file |
| 329 (string-match "\\.emacs" calc-settings-file) | 326 (equal user-init-file calc-settings-file) |
| 330 (> arg 0)) | 327 (> arg 0)) |
| 331 (< arg 0) | 328 (< arg 0) |
| 332 (load name t) | 329 (load name t) |
| 333 (message "New file"))))) | 330 (message "New file"))))) |
| 334 | 331 |
| 335 (defun math-get-modes-vec () | 332 (defun math-get-modes-vec () |