aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-10-31 00:22:34 +0000
committerJuanma Barranquero2007-10-31 00:22:34 +0000
commit2fc88dcc2551856ae7c2c709421c64d3af5aa3aa (patch)
tree6451b48ae485e1b8596741f3d3225a96c10559cf
parent5c3a9e4c5ef80b09c9f85cc5e864bdfd6c81c45b (diff)
downloademacs-2fc88dcc2551856ae7c2c709421c64d3af5aa3aa.tar.gz
emacs-2fc88dcc2551856ae7c2c709421c64d3af5aa3aa.zip
(shadow-inhibit-overload, shadow-remove-from-todo, shadow-insert-var):
Doc fixes. (shadow-file-match, shadow-define-cluster, shadow-define-regexp-group): Reflow docstrings. (shadow-parse-fullname, shadow-read-files): Fix typos in docstrings.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/shadowfile.el29
2 files changed, 23 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9794cb4055..9deefd183f2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12007-10-31 Juanma Barranquero <lekktu@gmail.com>
2
3 * shadowfile.el (shadow-inhibit-overload, shadow-remove-from-todo)
4 (shadow-insert-var): Doc fixes.
5 (shadow-file-match, shadow-define-cluster, shadow-define-regexp-group):
6 Reflow docstrings.
7 (shadow-parse-fullname, shadow-read-files): Fix typos in docstrings.
8
12007-10-30 Juanma Barranquero <lekktu@gmail.com> 92007-10-30 Juanma Barranquero <lekktu@gmail.com>
2 10
3 * ediff-hook.el (ediff, ediff-files, ediff-buffers, ebuffers, ediff3) 11 * ediff-hook.el (ediff, ediff-files, ediff-buffers, ebuffers, ediff3)
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index d1de8be3910..8e970919721 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -103,8 +103,8 @@ is no buffer currently visiting the file."
103 103
104(defcustom shadow-inhibit-overload nil 104(defcustom shadow-inhibit-overload nil
105 "If non-nil, shadowfile won't redefine \\[save-buffers-kill-emacs]. 105 "If non-nil, shadowfile won't redefine \\[save-buffers-kill-emacs].
106Normally it overloads the function `save-buffers-kill-emacs' to check 106Normally it overloads the function `save-buffers-kill-emacs' to check for
107for files have been changed and need to be copied to other systems." 107files that have been changed and need to be copied to other systems."
108 :type 'boolean 108 :type 'boolean
109 :group 'shadow) 109 :group 'shadow)
110 110
@@ -305,7 +305,7 @@ be matched against the primary of SITE2."
305 305
306(defun shadow-parse-fullname (fullname) 306(defun shadow-parse-fullname (fullname)
307 "Parse FULLNAME into \(site user path) list. 307 "Parse FULLNAME into \(site user path) list.
308Leave it alone if it already is one. Returns nil if the argument is 308Leave it alone if it already is one. Return nil if the argument is
309not a full ange-ftp pathname." 309not a full ange-ftp pathname."
310 (if (listp fullname) 310 (if (listp fullname)
311 fullname 311 fullname
@@ -398,9 +398,9 @@ local filename."
398 "Return t if PATTERN matches FILE. 398 "Return t if PATTERN matches FILE.
399If REGEXP is supplied and non-nil, the file part of the pattern is a regular 399If REGEXP is supplied and non-nil, the file part of the pattern is a regular
400expression, otherwise it must match exactly. The sites and usernames must 400expression, otherwise it must match exactly. The sites and usernames must
401match---see `shadow-same-site'. The pattern must be in full ange-ftp format, but 401match---see `shadow-same-site'. The pattern must be in full ange-ftp format,
402the file can be any valid filename. This function does not do any filename 402but the file can be any valid filename. This function does not do any
403expansion or contraction, you must do that yourself first." 403filename expansion or contraction, you must do that yourself first."
404 (let* ((pattern-sup (shadow-parse-fullname pattern)) 404 (let* ((pattern-sup (shadow-parse-fullname pattern))
405 (file-sup (shadow-parse-name file))) 405 (file-sup (shadow-parse-name file)))
406 (and (shadow-same-site pattern-sup file-sup) 406 (and (shadow-same-site pattern-sup file-sup)
@@ -418,8 +418,8 @@ expansion or contraction, you must do that yourself first."
418This is a group of hosts that share directories, so that copying to or from 418This is a group of hosts that share directories, so that copying to or from
419one of them is sufficient to update the file on all of them. Clusters are 419one of them is sufficient to update the file on all of them. Clusters are
420defined by a name, the network address of a primary host \(the one we copy 420defined by a name, the network address of a primary host \(the one we copy
421files to), and a regular expression that matches the hostnames of all the sites 421files to), and a regular expression that matches the hostnames of all the
422in the cluster." 422sites in the cluster."
423 (interactive (list (completing-read "Cluster name: " shadow-clusters () ()))) 423 (interactive (list (completing-read "Cluster name: " shadow-clusters () ())))
424 (let* ((old (shadow-get-cluster name)) 424 (let* ((old (shadow-get-cluster name))
425 (primary (read-string "Primary host: " 425 (primary (read-string "Primary host: "
@@ -475,8 +475,8 @@ specific hostnames, or names of clusters \(see `shadow-define-cluster')."
475 "Make each of a group of files be shared between hosts. 475 "Make each of a group of files be shared between hosts.
476Prompts for regular expression; files matching this are shared between a list 476Prompts for regular expression; files matching this are shared between a list
477of sites, which are also prompted for. The filenames must be identical on all 477of sites, which are also prompted for. The filenames must be identical on all
478hosts \(if they aren't, use `shadow-define-literal-group' instead of this function). 478hosts \(if they aren't, use `shadow-define-literal-group' instead of this
479Each site can be either a hostname or the name of a cluster \(see 479function). Each site can be either a hostname or the name of a cluster \(see
480`shadow-define-cluster')." 480`shadow-define-cluster')."
481 (interactive) 481 (interactive)
482 (let ((regexp (read-string 482 (let ((regexp (read-string
@@ -647,7 +647,7 @@ Consider them as regular expressions if third arg REGEXP is true."
647 647
648(defun shadow-remove-from-todo (pair) 648(defun shadow-remove-from-todo (pair)
649 "Remove PAIR from `shadow-files-to-copy'. 649 "Remove PAIR from `shadow-files-to-copy'.
650PAIR must be (eq to) one of the elements of that list." 650PAIR must be `eq' to one of the elements of that list."
651 (setq shadow-files-to-copy 651 (setq shadow-files-to-copy
652 (shadow-remove-if (function (lambda (s) (eq s pair))) 652 (shadow-remove-if (function (lambda (s) (eq s pair)))
653 shadow-files-to-copy))) 653 shadow-files-to-copy)))
@@ -655,7 +655,7 @@ PAIR must be (eq to) one of the elements of that list."
655(defun shadow-read-files () 655(defun shadow-read-files ()
656 "Visit and load `shadow-info-file' and `shadow-todo-file'. 656 "Visit and load `shadow-info-file' and `shadow-todo-file'.
657Thus restores shadowfile's state from your last Emacs session. 657Thus restores shadowfile's state from your last Emacs session.
658Returns t unless files were locked; then returns nil." 658Return t unless files were locked; then return nil."
659 (interactive) 659 (interactive)
660 (if (and (fboundp 'file-locked-p) 660 (if (and (fboundp 'file-locked-p)
661 (or (stringp (file-locked-p shadow-info-file)) 661 (or (stringp (file-locked-p shadow-info-file))
@@ -731,8 +731,9 @@ With non-nil argument also saves the buffer."
731 (setq shadow-hashtable (make-vector 37 0))) 731 (setq shadow-hashtable (make-vector 37 0)))
732 732
733(defun shadow-insert-var (variable) 733(defun shadow-insert-var (variable)
734 "Prettily insert a `setq' command for VARIABLE, 734 "Build a `setq' to restore VARIABLE.
735which, when later evaluated, will restore it to its current setting. 735Prettily insert a `setq' command which, when later evaluated,
736will restore VARIABLE to its current setting.
736VARIABLE must be the name of a variable whose value is a list." 737VARIABLE must be the name of a variable whose value is a list."
737 (let ((standard-output (current-buffer))) 738 (let ((standard-output (current-buffer)))
738 (insert (format "(setq %s" variable)) 739 (insert (format "(setq %s" variable))