From ddce73d32fa3e62e022842e3bbdc0aa83bb358cc Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 4 Nov 2014 21:08:12 -0800 Subject: Revert previous accidental commit --- lisp/shadowfile.el | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'lisp/shadowfile.el') diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el index e463cb7eca5..2bf200d07dd 100644 --- a/lisp/shadowfile.el +++ b/lisp/shadowfile.el @@ -117,7 +117,6 @@ 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 @@ -439,17 +438,14 @@ 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 ((name (if (buffer-file-name) - (nth 2 (shadow-parse-fullname - (shadow-contract-file-name (buffer-file-name)))))) - user site group) + (let* ((hup (shadow-parse-fullname + (shadow-contract-file-name (buffer-file-name)))) + (name (nth 2 hup)) + 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: " nil nil name)) - (if (zerop (length name)) - (error "You must specify a filename")) + name (read-string "Filename: " name)) (setq group (cons (shadow-make-fullname site (if (string-equal "" user) (shadow-get-user site) -- cgit v1.2.3