diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-11 22:08:21 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-11 22:08:21 -0400 |
| commit | 940e5099142a1bb60e76ae2cbd1f47244cb2eb44 (patch) | |
| tree | 31e8ce32a3bc7f2de7040584db2faab8f35436e3 /lisp/shadowfile.el | |
| parent | cc72580827719a5012d4ac703c09f92e721f61de (diff) | |
| download | emacs-940e5099142a1bb60e76ae2cbd1f47244cb2eb44.tar.gz | |
Use locate-user-emacs-file.
* lisp/type-break.el (type-break-file-name):
* lisp/textmodes/remember.el (remember-data-file):
* lisp/strokes.el (strokes-file):
* lisp/shadowfile.el (shadow-initialize):
* lisp/saveplace.el (save-place-file):
* lisp/ps-bdf.el (bdf-cache-file):
* lisp/progmodes/idlwave.el (idlwave-config-directory):
* lisp/net/quickurl.el (quickurl-url-file):
* lisp/international/kkc.el (kkc-init-file-name):
* lisp/ido.el (ido-save-directory-list-file):
* lisp/emulation/viper.el (viper-custom-file-name):
* lisp/emulation/vip.el (vip-startup-file):
* lisp/calendar/todo-mode.el (todo-file-do, todo-file-done, todo-file-top):
* lisp/calendar/timeclock.el (timeclock-file): Use locate-user-emacs-file.
Diffstat (limited to 'lisp/shadowfile.el')
| -rw-r--r-- | lisp/shadowfile.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el index d10ea99afb1..ec6e6e7ff10 100644 --- a/lisp/shadowfile.el +++ b/lisp/shadowfile.el @@ -651,7 +651,7 @@ Return t unless files were locked; then return nil." (beep) (sit-for 3) nil) - (save-excursion + (save-current-buffer (when shadow-info-file (set-buffer (setq shadow-info-buffer (find-file-noselect shadow-info-file))) @@ -683,7 +683,7 @@ Also clear `shadow-hashtable', since when there are new shadows defined, the old hashtable info is invalid." (shadow-invalidate-hashtable) (if shadow-info-file - (save-excursion + (save-current-buffer (if (not shadow-info-buffer) (setq shadow-info-buffer (find-file-noselect shadow-info-file))) (set-buffer shadow-info-buffer) @@ -802,11 +802,13 @@ look for files that have been changed and need to be copied to other systems." (file-name-as-directory (shadow-expand-file-name "~")))) (if (null shadow-info-file) (setq shadow-info-file - (shadow-expand-file-name (convert-standard-filename "~/.shadows")))) + ;; FIXME: Move defaults to their defcustom. + (shadow-expand-file-name + (locate-user-emacs-file "shadows" ".shadows")))) (if (null shadow-todo-file) (setq shadow-todo-file (shadow-expand-file-name - (convert-standard-filename "~/.shadow_todo")))) + (locate-user-emacs-file "shadow_todo" ".shadow_todo")))) (if (not (shadow-read-files)) (progn (message "Shadowfile information files not found - aborting") |