(dired-show-file-type): Format filename with "%s" to escape any format-like

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

diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 264d349..849bbd6 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
-;; Revision: $Id: pcvs-util.el,v 1.13 2001/07/16 07:46:48 pj Exp $
+;; Revision: $Id: pcvs-util.el,v 1.16 2001/12/02 07:41:47 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -185,18 +185,16 @@ Uses columns to keep the listing readable but compact."
 If ONELINE is t, only the first line (no \\n) will be returned.
 If ARGS is non-nil, the file will be executed with ARGS as its
 arguments.  If ARGS is not a list, no argument will be passed."
-  (with-temp-buffer
-    (condition-case nil
-       (progn
-         (if args
-             (apply 'call-process
-                    file nil t nil (when (listp args) args))
-           (insert-file-contents file))
-         (buffer-substring (point-min)
-                           (if oneline
-                               (progn (goto-char (point-min)) (end-of-line) (point))
-                             (point-max))))
-      (file-error nil))))
+  (condition-case nil
+      (with-temp-buffer
+       (if args
+           (apply 'call-process
+                  file nil t nil (when (listp args) args))
+         (insert-file-contents file))
+       (goto-char (point-min))
+       (buffer-substring (point)
+                         (if oneline (line-end-position) (point-max))))
+    (file-error nil)))
 
 (defun cvs-string-prefix-p (str1 str2)
   "Tell whether STR1 is a prefix of STR2."
@@ -230,7 +228,8 @@ The SEPARATOR regexp defaults to \"\\s-+\"."
       (append (unless (eq i 0) (split-string (substring string 0 i) sep))
              (let ((rfs (read-from-string string i)))
                (cons (car rfs)
-                     (cvs-string->strings (substring string (cdr rfs)) sep)))))))
+                     (cvs-string->strings (substring string (cdr rfs))
+                                          sep)))))))
 
 ;;;; 
 ;;;; file names
@@ -350,7 +349,7 @@ If it is \\[universal-argument] \\[universal-argument], behave just
     `(progn
        (defvar ,sym nil ,(concat (or docstring "") "
 See `cvs-prefix-set' for further description of the behavior."))
-       (defconst ,cps
+       (defvar ,cps
         (let ((defaults ,defaults))
           ;; sanity ensurance
           (unless (>= (length defaults) cvs-prefix-number)
@@ -373,7 +372,7 @@ If ARG is negative (or \\[universal-argument] which corresponds to negative 0),
   it queries the user and sets the -ARG'th default.
 If ARG is greater than 9 (or \\[universal-argument] \\[universal-argument]),
   the (ARG mod 10)'th prefix is made persistent.
-If ARG is NIL toggle the PREFIX's value between its 0th default and NIL
+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))