(match-string-no-properties): Use substring-no-properties.

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

diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index b3fea9776365875a84723dd87aae1d2be9bf5cd4..86fafea37ea55e35de9141c1747c2e29da3111d3 100644 (file)
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -1,11 +1,10 @@
-;;; pcvs-util.el --- Utility functions for PCL-CVS  -*- byte-compile-dynamic: t -*-
+;;; pcvs-util.el --- utility functions for PCL-CVS  -*- byte-compile-dynamic: t -*-
 
 ;; Copyright (C) 1991,92,93,94,95,96,97,98,99,2000, 2001
 ;;  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
-;; Revision: $Id: pcvs-util.el,v 1.10 2001/03/07 00:19:08 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -50,7 +49,7 @@
   (let ((zs ys))
     (dolist (x xs zs)
       (unless (member x ys) (push x zs)))))
-      
+
 
 (defun cvs-map (-cvs-map-f &rest -cvs-map-ls)
   (unless (cvs-every 'null -cvs-map-ls)
@@ -135,7 +134,7 @@ BUF is assumed to be a temporary buffer used from the buffer MAINBUF."
       (let ((mainwin (or (get-buffer-window mainbuf)
                         (get-buffer-window mainbuf 'visible))))
        (when mainwin (select-window mainwin))))))
-             
+
 (defun cvs-get-buffer-create (name &optional noreuse)
   "Create a buffer NAME unless such a buffer already exists.
 If the NAME looks like an absolute file name, the buffer will be created
@@ -167,8 +166,10 @@ Uses columns to keep the listing readable but compact."
                     ;; At least 2 columns; at least 2 spaces between columns.
                     (max 2 (/ wwidth (+ 2 length)))
                     ;; Don't allocate more columns than we can fill.
+                    ;; Windows can't show less than 3 lines anyway.
                     (max 1 (/ (length strings) 2))))
           (colwidth (/ wwidth columns)))
+      ;; Use tab-width rather than indent-to.
       (setq tab-width colwidth)
       ;; The insertion should be "sensible" no matter what choices were made.
       (dolist (str strings)
@@ -183,18 +184,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."
@@ -228,11 +227,12 @@ 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
-;;;; 
+;;;;
 
 (defsubst cvs-expand-dir-name (d)
   (file-name-as-directory (expand-file-name d)))
@@ -272,9 +272,9 @@ The SEPARATOR regexp defaults to \"\\s-+\"."
                                initval hist-sym))
              (t initval)))))
 
-;;;; 
+;;;;
 ;;;; Flags handling
-;;;; 
+;;;;
 
 (defstruct (cvs-flags
            (:constructor nil)
@@ -319,7 +319,7 @@ If it is \\[universal-argument] \\[universal-argument], behave just
 
     ;; sanity check
     (unless (< (abs numarg) (length defaults))
-      (error "There is no %sth default." (abs numarg)))
+      (error "There is no %sth default" (abs numarg)))
 
     (if permstr
        (let* ((prompt (format "%s%s: " desc permstr))
@@ -334,9 +334,9 @@ If it is \\[universal-argument] \\[universal-argument], behave just
   "Set SYM's INDEX'th setting to VALUE."
   (setf (nth index (cvs-flags-defaults (symbol-value sym))) value))
 
-;;;; 
+;;;;
 ;;;; Prefix keys
-;;;; 
+;;;;
 
 (defconst cvs-prefix-number 10)
 
@@ -346,9 +346,9 @@ If it is \\[universal-argument] \\[universal-argument], behave just
                                 &optional qtypedesc hist-sym)
   (let ((cps (cvs-prefix-sym sym)))
     `(progn
-       (defvar ,sym nil ,(cons (or docstring "") "
+       (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)
@@ -371,7 +371,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))
@@ -409,4 +409,5 @@ and reset it unless READ-ONLY is non-nil."
 
 (provide 'pcvs-util)
 
-;;; pcl-cvs-util.el ends here
+;;; arch-tag: 3b2588bb-2ae3-4f1f-bf5b-dea91b1f8a59
+;;; pcvs-util.el ends here