(cvs-prefix-define): Typo cons->concat.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7acca6d69bb27f1bcdc350a125d47a8587af431..71671acc0a1ceaf624b4654fe4e3c442f0b69e11 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-03  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * pcvs-util.el (cvs-prefix-define): Typo cons->concat.
+
 2001-10-02  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * emulation/tpu-edt.el: Make messages match original TPU/edt
@@ -28,8 +32,8 @@
        (calendar-mouse-holidays, calendar-mouse-view-diary-entries)
        (calendar-mouse-view-other-diary-entries)
        (calendar-mouse-print-dates, calendar-mouse-2-date-menu)
-       (calendar-mouse-cal-tex-menu, cal-tex-mouse-filofax): Call
-       cal-menu-x-popup-menu instead of x-popup-menu.
+       (calendar-mouse-cal-tex-menu, cal-tex-mouse-filofax):
+       Call cal-menu-x-popup-menu instead of x-popup-menu.
 
 2001-10-01  Gerd Moellmann  <gerd@gnu.org>
 
@@ -41,8 +45,12 @@
 
 2001-10-01  Eli Zaretskii  <eliz@is.elta.co.il>
 
+<<<<<<< ChangeLog
+       * help.el (help-for-help): Doc fix.  From Pavel@Janik.cz (Pavel Janik).
+=======
        * help.el (help-for-help): Doc fix.  From Pavel@Janik.cz (Pavel
        Jan\e,Bm\e(Bk).
+>>>>>>> 1.2772
 
 2001-09-30  Eli Zaretskii  <eliz@is.elta.co.il>
 
@@ -62,10 +70,10 @@
        beginning of the *Apropos* buffer more clear.
 
 2001-09-27  Michael Kifer  <kifer@cs.sunysb.edu>
-       
+
        * ediff-mult.el (ediff-get-meta-info): Installed Gerd's changes.
        Added comments.
-       
+
 2001-09-27  Stefan Monnier  <monnier@cs.yale.edu>
 
        * newcomment.el (comment-normalize-vars): Use " \t" rather than

diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 9b7d2c8cb719d90c0d528514ef77f0a90a8f9191..264d3496e15942a4e730a458b95826329c04a6f4 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.12 2001/04/13 14:56:10 monnier Exp $
+;; Revision: $Id: pcvs-util.el,v 1.13 2001/07/16 07:46:48 pj Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -348,7 +348,7 @@ 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
         (let ((defaults ,defaults))