[Emacs-diffs] Changes to emacs/lisp/pcvs-util.el

[Juanma Barranquero]

Index: emacs/lisp/pcvs-util.el
diff -c emacs/lisp/pcvs-util.el:1.25 emacs/lisp/pcvs-util.el:1.26
*** emacs/lisp/pcvs-util.el:1.25        Mon Jul  4 23:08:56 2005
--- emacs/lisp/pcvs-util.el     Wed Jul 20 20:51:27 2005
***************
*** 188,194 ****
    "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."
    (let ((sep (or separator " ")))
      (mapconcat
       (lambda (str)
--- 188,194 ----
    "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 SEPARATORs will work properly."
    (let ((sep (or separator " ")))
      (mapconcat
       (lambda (str)
***************
*** 277,283 ****
  
  (defun cvs-flags-query (sym &optional desc arg)
    "Query flags based on SYM.
! 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
--- 277,283 ----
  
  (defun cvs-flags-query (sym &optional desc arg)
    "Query flags based on SYM.
! 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
***************
*** 382,388 ****
  
  (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."
    (prog1 (symbol-value sym)
      (unless (or read-only
                (cvs-flags-persist (symbol-value (cvs-prefix-sym sym))))
--- 382,388 ----
  
  (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."
    (prog1 (symbol-value sym)
      (unless (or read-only
                (cvs-flags-persist (symbol-value (cvs-prefix-sym sym))))