(command-line-1): Refer to Lisp manual when

[gnu-emacs] / lisp / pcvs-util.el

diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 2cbb00b324ca9338cd06b7d1522f5f0ce9063881..cb18fc83d59202934c33c314b2b6bbed80974ca2 100644 (file)
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -1,9 +1,9 @@
 ;;; pcvs-util.el --- utility functions for PCL-CVS  -*- byte-compile-dynamic: t -*-
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2004, 2005  Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
-;; Author: Stefan Monnier <monnier@cs.yale.edu>
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
 
 ;; This file is part of GNU Emacs.
@@ -20,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
-;; 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:
 
@@ -157,10 +157,11 @@ Uses columns to keep the listing readable but compact."
       (setq tab-width colwidth)
       ;; The insertion should be "sensible" no matter what choices were made.
       (dolist (str strings)
-       (unless (bolp) (insert " \t"))
-       (when (< wwidth (+ (max colwidth (length str)) (current-column)))
-         (delete-char -2) (insert "\n"))
-       (insert str)))))
+       (unless (bolp)
+          (insert " \t")
+          (when (< wwidth (+ (max colwidth (length str)) (current-column)))
+            (delete-char -2) (insert "\n")))
+        (insert str)))))
 
 
 (defun cvs-file-to-string (file &optional oneline args)
@@ -188,7 +189,7 @@ arguments.  If ARGS is not a list, no argument will be passed."
   "Concatenate the STRINGS, adding the SEPARATOR (default \" \").
 This tries to quote the strings to avoid ambiguity such that
   (cvs-string->strings (cvs-strings->string strs)) == strs
-Only some SEPARATOR will work properly."
+Only some SEPARATORs will work properly."
   (let ((sep (or separator " ")))
     (mapconcat
      (lambda (str)
@@ -277,7 +278,7 @@ The SEPARATOR regexp defaults to \"\\s-+\"."
 
 (defun cvs-flags-query (sym &optional desc arg)
   "Query flags based on SYM.
-Optional argument DESC will be used for the prompt
+Optional argument DESC will be used for the prompt.
 If ARG (or a prefix argument) is nil, just use the 0th default.
 If it is a non-negative integer, use the corresponding default.
 If it is a negative integer query for a new value of the corresponding
@@ -357,7 +358,8 @@ If ARG is nil toggle the PREFIX's value between its 0th default and nil
   and reset the persistence."
   (let* ((prefix (symbol-value (cvs-prefix-sym sym)))
         (numarg (if (integerp arg) arg 0))
-        (defs (cvs-flags-defaults prefix)))
+        ;; (defs (cvs-flags-defaults prefix))
+         )
 
     ;; set persistence if requested
     (when (> (prefix-numeric-value arg) 9)
@@ -382,7 +384,7 @@ If ARG is nil toggle the PREFIX's value between its 0th default and nil
 
 (defun cvs-prefix-get (sym &optional read-only)
   "Return the current value of the prefix SYM.
-and reset it unless READ-ONLY is non-nil."
+And reset it unless READ-ONLY is non-nil."
   (prog1 (symbol-value sym)
     (unless (or read-only
                (cvs-flags-persist (symbol-value (cvs-prefix-sym sym))))