(diary-face, holiday-face): Add dark-background variants.

[bpt/emacs.git] / lisp / pcvs-util.el

diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 9763fd8..06a0758 100644 (file)
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -5,7 +5,7 @@
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
 ;; Version: $Name:  $
-;; Revision: $Id: pcl-cvs-util.el,v 1.26 2000/03/05 21:32:21 monnier Exp $
+;; Revision: $Id: pcvs-util.el,v 1.1 2000/08/05 19:33:53 gerd Exp gerd $
 
 ;; This file is part of GNU Emacs.
 
@@ -172,7 +172,7 @@ Only some SEPARATOR will work properly."
     (mapconcat
      (lambda (str)
        (if (string-match "[\\\"]" str)
-          (concat "\"" (replace-regexps-in-string "[\\\"]" "\\\\\\&" str) "\"")
+          (concat "\"" (replace-regexp-in-string "[\\\"]" "\\\\\\&" str) "\"")
         str))
      strings sep)))
 
@@ -189,15 +189,6 @@ The SEPARATOR regexp defaults to \"\\s-+\"."
              (let ((rfs (read-from-string string i)))
                (cons (car rfs)
                      (cvs-string->strings (substring string (cdr rfs)) sep)))))))
-      
-
-(defun cvs-string-fill (str n &optional filling truncate)
-  "Add FILLING (defaults to the space char) to STR to reach size N.
-If STR is longer than N, truncate if TRUNCATE is set, else don't do anything."
-  (let ((l (length str)))
-    (if (> l n)
-       (if truncate (substring str 0 n) str)
-      (concat str (make-string (- n l) (or filling ? ))))))
 
 ;;;; 
 ;;;; file names
@@ -323,7 +314,7 @@ See `cvs-prefix-set' for further description of the behavior."))
           (unless (>= (length defaults) cvs-prefix-number)
             (setq defaults (append defaults
                                    (make-list (1- cvs-prefix-number)
-                                              (first defaults)))))
+                                              (nth 0 defaults)))))
           (-cvs-flags-make ,desc defaults ,qtypedesc ,hist-sym))))))
 
 (defun cvs-prefix-make-local (sym)
@@ -356,7 +347,7 @@ If ARG is NIL toggle the PREFIX's value between its 0th default and NIL
         (cond
          ((null arg)
           (setf (cvs-flags-persist prefix) nil)
-          (unless (symbol-value sym) (first (cvs-flags-defaults prefix))))
+          (unless (symbol-value sym) (nth 0 (cvs-flags-defaults prefix))))
 
          ((or (consp arg) (< numarg 0))
           (setf (nth (- numarg) (cvs-flags-defaults prefix))