*** vc-cvs.el.~1.163.~	2009-01-05 10:00:27.031250000 +0100
--- vc-cvs.el	2009-01-05 10:19:29.265625000 +0100
***************
*** 180,185 ****
--- 180,194 ----
    :version "22.1"
    :group 'vc)
  
+ (defcustom vc-cvs-message-switch "-m"
+   "String passed as message switch to CVS.
+ By default this is \"-m\".  With more recent versions of CVSNT
+ you might want to set this to \"-M\" to avoid inserting adverts
+ in commit logs."
+   :type 'string
+   :version "23.1"
+   :group 'vc)
+ 
  ;;;
  ;;; Internal variables
  ;;;
***************
*** 288,294 ****
    (apply 'vc-cvs-command nil 0 files
           "add"
           (and comment (string-match "[^\t\n ]" comment)
!               (concat "-m" comment))
           (vc-switches 'CVS 'register)))
  
  (defun vc-cvs-responsible-p (file)
--- 297,303 ----
    (apply 'vc-cvs-command nil 0 files
           "add"
           (and comment (string-match "[^\t\n ]" comment)
!               (concat vc-cvs-message-switch comment))
           (vc-switches 'CVS 'register)))
  
  (defun vc-cvs-responsible-p (file)
***************
*** 325,331 ****
  	    files)))
    (let ((status (apply 'vc-cvs-command nil 1 files
  		       "ci" (if rev (concat "-r" rev))
! 		       (concat "-m" comment)
  		       (vc-switches 'CVS 'checkin))))
      (set-buffer "*vc*")
      (goto-char (point-min))
--- 334,340 ----
  	    files)))
    (let ((status (apply 'vc-cvs-command nil 1 files
  		       "ci" (if rev (concat "-r" rev))
! 		       (concat vc-cvs-message-switch comment)
  		       (vc-switches 'CVS 'checkin))))
      (set-buffer "*vc*")
      (goto-char (point-min))
***************
*** 485,491 ****
  (defun vc-cvs-modify-change-comment (files rev comment)
    "Modify the change comments for FILES on a specified REV.
  Will fail unless you have administrative privileges on the repo."
!   (vc-cvs-command nil 0 files "admin" (concat "-m" rev ":" comment)))
  
  ;;;
  ;;; History functions
--- 494,501 ----
  (defun vc-cvs-modify-change-comment (files rev comment)
    "Modify the change comments for FILES on a specified REV.
  Will fail unless you have administrative privileges on the repo."
!   (vc-cvs-command
!    nil 0 files "admin" (concat vc-cvs-message-switch rev ":" comment)))
  
  ;;;
  ;;; History functions