(calendar-dst-check-each-year-flag): Avoid

[bpt/emacs.git] / lisp / shadowfile.el

diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index f047223..ac2ab0f 100644 (file)
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -1,6 +1,7 @@
 ;;; shadowfile.el --- automatic file copying
 
 ;;; shadowfile.el --- automatic file copying
 

-;; Copyright (C) 1993, 1994, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.

 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: comm files
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: comm files


@@ -19,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the

-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -96,12 +97,12 @@ is no buffer currently visiting the file."
   :group 'shadow)
 
 (defcustom shadow-inhibit-message nil
   :group 'shadow)
 
 (defcustom shadow-inhibit-message nil

-  "*If nonnil, do not display a message when a file needs copying."
+  "*If non-nil, do not display a message when a file needs copying."

   :type 'boolean
   :group 'shadow)
 
 (defcustom shadow-inhibit-overload nil
   :type 'boolean
   :group 'shadow)
 
 (defcustom shadow-inhibit-overload nil

-  "If nonnil, shadowfile won't redefine \\[save-buffers-kill-emacs].
+  "If non-nil, shadowfile won't redefine \\[save-buffers-kill-emacs].

 Normally it overloads the function `save-buffers-kill-emacs' to check
 for files have been changed and need to be copied to other systems."
   :type 'boolean
 Normally it overloads the function `save-buffers-kill-emacs' to check
 for files have been changed and need to be copied to other systems."
   :type 'boolean


@@ -145,7 +146,7 @@ Default: ~/.shadow_todo"
 (defvar shadow-literal-groups nil
   "List of files that are shared between hosts.
 This list contains shadow structures with literal filenames, created by
 (defvar shadow-literal-groups nil
   "List of files that are shared between hosts.
 This list contains shadow structures with literal filenames, created by

-shadow-define-group.")
+`shadow-define-literal-group'.")

 
 (defvar shadow-regexp-groups nil
   "List of file types that are shared between hosts.
 
 (defvar shadow-regexp-groups nil
   "List of file types that are shared between hosts.


@@ -177,7 +178,7 @@ created by `shadow-define-regexp-group'.")
       (shadow-union (cdr a) (cons (car a) b)))))
 
 (defun shadow-find (func list)
       (shadow-union (cdr a) (cons (car a) b)))))
 
 (defun shadow-find (func list)

-  "If FUNC applied to some element of LIST is nonnil, return first such element."
+  "If FUNC applied to some element of LIST is non-nil, return first such element."

   (while (and list (not (funcall func (car list))))
     (setq list (cdr list)))
   (car list))
   (while (and list (not (funcall func (car list))))
     (setq list (cdr list)))
   (car list))


@@ -204,7 +205,7 @@ This makes sure regexp matches nothing but STRING."
 
 (defun shadow-suffix (prefix string)
   "If PREFIX begins STRING, return the rest.
 
 (defun shadow-suffix (prefix string)
   "If PREFIX begins STRING, return the rest.

-Return value is nonnil if PREFIX and STRING are string= up to the length of
+Return value is non-nil if PREFIX and STRING are `string=' up to the length of

 PREFIX."
   (let ((lp (length prefix))
        (ls (length string)))
 PREFIX."
   (let ((lp (length prefix))
        (ls (length string)))


@@ -284,9 +285,9 @@ information defining the cluster.  For interactive use, call
       ans)))
 
 (defun shadow-site-match (site1 site2)
       ans)))
 
 (defun shadow-site-match (site1 site2)

-  "Nonnil iff SITE1 is or includes SITE2.
-Each may be a host or cluster name; if they are clusters, regexp of site1 will
-be matched against the primary of site2."
+  "Non-nil iff SITE1 is or includes SITE2.
+Each may be a host or cluster name; if they are clusters, regexp of SITE1 will
+be matched against the primary of SITE2."

   (or (string-equal site1 site2) ; quick check
       (let* ((cluster1 (shadow-get-cluster site1))
             (primary2 (shadow-site-primary site2)))
   (or (string-equal site1 site2) ; quick check
       (let* ((cluster1 (shadow-get-cluster site1))
             (primary2 (shadow-site-primary site2)))


@@ -354,7 +355,7 @@ Will return the name bare if it is a local file."
                                 (nth 2 hup))))))
 
 (defun shadow-expand-file-name (file &optional default)
                                 (nth 2 hup))))))
 
 (defun shadow-expand-file-name (file &optional default)

-  "Expand file name and get file's true name."
+  "Expand file name and get FILE's true name."

   (file-truename (expand-file-name file default)))
 
 (defun shadow-contract-file-name (file)
   (file-truename (expand-file-name file default)))
 
 (defun shadow-contract-file-name (file)


@@ -397,7 +398,7 @@ local filename."
  "Return t if PATTERN matches FILE.
 If REGEXP is supplied and non-nil, the file part of the pattern is a regular
 expression, otherwise it must match exactly.  The sites and usernames must
  "Return t if PATTERN matches FILE.
 If REGEXP is supplied and non-nil, the file part of the pattern is a regular
 expression, otherwise it must match exactly.  The sites and usernames must

-match---see shadow-same-site.  The pattern must be in full ange-ftp format, but
+match---see `shadow-same-site'.  The pattern must be in full ange-ftp format, but

 the file can be any valid filename.  This function does not do any filename
 expansion or contraction, you must do that yourself first."
  (let* ((pattern-sup (shadow-parse-fullname pattern))
 the file can be any valid filename.  This function does not do any filename
 expansion or contraction, you must do that yourself first."
  (let* ((pattern-sup (shadow-parse-fullname pattern))


@@ -437,7 +438,7 @@ in the cluster."
                       (sit-for 2))
                     try-regexp))
 ;       (username (read-no-blanks-input
                       (sit-for 2))
                     try-regexp))
 ;       (username (read-no-blanks-input

-;                  (format "Username [default: %s]: "
+;                  (format "Username (default %s): "

 ;                          (shadow-get-user primary))
 ;                  (if old (or (shadow-cluster-username old) "")
 ;                    (user-login-name))))
 ;                          (shadow-get-user primary))
 ;                  (if old (or (shadow-cluster-username old) "")
 ;                    (user-login-name))))


@@ -457,7 +458,7 @@ specific hostnames, or names of clusters \(see `shadow-define-cluster')."
         (name (nth 2 hup))
         user site group)
     (while (setq site (shadow-read-site))
         (name (nth 2 hup))
         user site group)
     (while (setq site (shadow-read-site))

-      (setq user (read-string (format "Username [default %s]: "
+      (setq user (read-string (format "Username (default %s): "

                                      (shadow-get-user site)))
            name (read-string "Filename: " name))
       (setq group (cons (shadow-make-fullname site
                                      (shadow-get-user site)))
            name (read-string "Filename: " name))
       (setq group (cons (shadow-make-fullname site


@@ -474,7 +475,7 @@ specific hostnames, or names of clusters \(see `shadow-define-cluster')."
   "Make each of a group of files be shared between hosts.
 Prompts for regular expression; files matching this are shared between a list
 of sites, which are also prompted for.  The filenames must be identical on all
   "Make each of a group of files be shared between hosts.
 Prompts for regular expression; files matching this are shared between a list
 of sites, which are also prompted for.  The filenames must be identical on all

-hosts \(if they aren't, use shadow-define-group instead of this function).
+hosts \(if they aren't, use `shadow-define-literal-group' instead of this function).

 Each site can be either a hostname or the name of a cluster \(see
 `shadow-define-cluster')."
   (interactive)
 Each site can be either a hostname or the name of a cluster \(see
 `shadow-define-cluster')."
   (interactive)


@@ -518,8 +519,9 @@ Pending copies are stored in variable `shadow-files-to-copy', and in
 `shadow-save-buffers-kill-emacs', so it is not usually necessary to
 call it manually."
   (interactive "P")
 `shadow-save-buffers-kill-emacs', so it is not usually necessary to
 call it manually."
   (interactive "P")

-  (if (and (not shadow-files-to-copy) (interactive-p))
-      (message "No files need to be shadowed.")
+  (if (not shadow-files-to-copy)
+      (if (interactive-p)
+         (message "No files need to be shadowed."))

     (save-excursion
       (map-y-or-n-p (function
                     (lambda (pair)
     (save-excursion
       (map-y-or-n-p (function
                     (lambda (pair)


@@ -659,7 +661,7 @@ Returns t unless files were locked; then returns nil."
           (or (stringp (file-locked-p shadow-info-file))
               (stringp (file-locked-p shadow-todo-file))))
       (progn
           (or (stringp (file-locked-p shadow-info-file))
               (stringp (file-locked-p shadow-todo-file))))
       (progn

-       (message "Shadowfile is running in another emacs; can't have two.")
+       (message "Shadowfile is running in another Emacs; can't have two.")

        (beep)
        (sit-for 3)
        nil)
        (beep)
        (sit-for 3)
        nil)


@@ -674,7 +676,7 @@ Returns t unless files were locked; then returns nil."
          (message "Data recovered from %s."
                   (car (insert-file-contents (make-auto-save-file-name))))
          (sit-for 1))
          (message "Data recovered from %s."
                   (car (insert-file-contents (make-auto-save-file-name))))
          (sit-for 1))

-       (eval-current-buffer))
+       (eval-buffer))

       (when shadow-todo-file
        (set-buffer (setq shadow-todo-buffer
                          (find-file-noselect shadow-todo-file)))
       (when shadow-todo-file
        (set-buffer (setq shadow-todo-buffer
                          (find-file-noselect shadow-todo-file)))


@@ -685,7 +687,7 @@ Returns t unless files were locked; then returns nil."
          (message "Data recovered from %s."
                   (car (insert-file-contents (make-auto-save-file-name))))
          (sit-for 1))
          (message "Data recovered from %s."
                   (car (insert-file-contents (make-auto-save-file-name))))
          (sit-for 1))

-       (eval-current-buffer nil))
+       (eval-buffer nil))

       (shadow-invalidate-hashtable))
     t))
 
       (shadow-invalidate-hashtable))
     t))
 


@@ -705,8 +707,8 @@ defined, the old hashtable info is invalid."
        (shadow-insert-var 'shadow-regexp-groups))))
 
 (defun shadow-write-todo-file (&optional save)
        (shadow-insert-var 'shadow-regexp-groups))))
 
 (defun shadow-write-todo-file (&optional save)

-  "Write out information to shadow-todo-file.
-With nonnil argument also saves the buffer."
+  "Write out information to `shadow-todo-file'.
+With non-nil argument also saves the buffer."

   (save-excursion
     (if (not shadow-todo-buffer)
        (setq shadow-todo-buffer (find-file-noselect shadow-todo-file)))
   (save-excursion
     (if (not shadow-todo-buffer)
        (setq shadow-todo-buffer (find-file-noselect shadow-todo-file)))


@@ -729,9 +731,9 @@ With nonnil argument also saves the buffer."
   (setq shadow-hashtable (make-vector 37 0)))
 
 (defun shadow-insert-var (variable)
   (setq shadow-hashtable (make-vector 37 0)))
 
 (defun shadow-insert-var (variable)

-  "Prettily insert a setq command for VARIABLE.
+  "Prettily insert a `setq' command for VARIABLE,

 which, when later evaluated, will restore it to its current setting.
 which, when later evaluated, will restore it to its current setting.

-SYMBOL must be the name of a variable whose value is a list."
+VARIABLE must be the name of a variable whose value is a list."

   (let ((standard-output (current-buffer)))
     (insert (format "(setq %s" variable))
     (cond ((consp (eval variable))
   (let ((standard-output (current-buffer)))
     (insert (format "(setq %s" variable))
     (cond ((consp (eval variable))