diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-11-04 21:04:30 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-11-04 21:04:30 -0800 |
| commit | 6a278b64f7356613c4a7709ed699655fa7415260 (patch) | |
| tree | 089f1e051d97e213382ee15633b45e831c60b9f2 /lisp/shadowfile.el | |
| parent | fdcbfeac69b3e9c7edb114d47beb7e9ac9d10df4 (diff) | |
| download | emacs-6a278b64f7356613c4a7709ed699655fa7415260.tar.gz | |
Merge from emacs-24; up to 117669
Diffstat (limited to 'lisp/shadowfile.el')
| -rw-r--r-- | lisp/shadowfile.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el index 2bf200d07dd..e463cb7eca5 100644 --- a/lisp/shadowfile.el +++ b/lisp/shadowfile.el @@ -117,6 +117,7 @@ ensure consistency. Default: ~/.emacs.d/shadows" :type '(choice (const nil) file) :group 'shadow) +;; FIXME use .emacs.d (defcustom shadow-todo-file nil "File to store the list of uncopied shadows in. This means that if a remote system is down, or for any reason you cannot or @@ -438,14 +439,17 @@ It may have different filenames on each site. When this file is edited, the new version will be copied to each of the other locations. Sites can be specific hostnames, or names of clusters (see `shadow-define-cluster')." (interactive) - (let* ((hup (shadow-parse-fullname - (shadow-contract-file-name (buffer-file-name)))) - (name (nth 2 hup)) - user site group) + (let ((name (if (buffer-file-name) + (nth 2 (shadow-parse-fullname + (shadow-contract-file-name (buffer-file-name)))))) + user site group) (while (setq site (shadow-read-site)) + ;; FIXME fix read-string calls (setq user (read-string (format "Username (default %s): " (shadow-get-user site))) - name (read-string "Filename: " name)) + name (read-string "Filename: " nil nil name)) + (if (zerop (length name)) + (error "You must specify a filename")) (setq group (cons (shadow-make-fullname site (if (string-equal "" user) (shadow-get-user site) |