X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/2058218eac7b3f04b402a876e63b3edd2f2cdd2f..1cc3c18fd41142d2d7f9c2252c526ed45792a2ab:/lisp/pcvs-info.el

diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index d56fa19fd3..fa7f3f6cdc 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -1,17 +1,18 @@
 ;;; pcvs-info.el --- internal representation of a fileinfo entry
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2004, 2005  Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
-;; Author: Stefan Monnier <monnier@cs.yale.edu>
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -41,16 +40,18 @@
 ;;;; config variables
 ;;;;
 
+(define-obsolete-variable-alias 'cvs-display-full-path
+    'cvs-display-full-name "22.1")
+
 (defcustom cvs-display-full-name t
-  "*Specifies how the filenames should be displayed in the listing.
+  "Specifies how the filenames should be displayed in the listing.
 If non-nil, their full filename name will be displayed, else only the
 non-directory part."
   :group 'pcl-cvs
   :type '(boolean))
-(define-obsolete-variable-alias 'cvs-display-full-path 'cvs-display-full-name)
 
 (defcustom cvs-allow-dir-commit nil
-  "*Allow `cvs-mode-commit' on directories.
+  "Allow `cvs-mode-commit' on directories.
 If you commit without any marked file and with the cursor positioned
 on a directory entry, cvs would commit the whole directory.  This seems
 to confuse some users sometimes."
@@ -85,9 +86,9 @@ to confuse some users sometimes."
 
 (defface cvs-unknown
   '((((class color) (background dark))
-     (:foreground "red"))
+     (:foreground "red1"))
     (((class color) (background light))
-     (:foreground "red"))
+     (:foreground "red1"))
     (t (:slant italic)))
   "PCL-CVS face used to highlight unknown file status."
   :group 'pcl-cvs)
@@ -225,7 +226,8 @@ to confuse some users sometimes."
       ;; Here, I use `concat' rather than `expand-file-name' because I want
       ;; the resulting path to stay relative if `dir' is relative.
       (concat dir (cvs-fileinfo->file fileinfo)))))
-(define-obsolete-function-alias 'cvs-fileinfo->full-path 'cvs-fileinfo->full-name)
+(define-obsolete-function-alias 'cvs-fileinfo->full-path
+    'cvs-fileinfo->full-name "22.1")
 
 (defun cvs-fileinfo->pp-name (fi)
   "Return the filename of FI as it should be displayed."
@@ -379,7 +381,8 @@ For use by the cookie package."
 		      ;; or nothing
 		      "")))
 	   (format "%-11s %s %-11s %-11s %s"
-		   side status type base file)))))))
+		   side status type base file))))
+     "\n")))
 
 
 (defun cvs-fileinfo-update (fi fi-new)