Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-380

Update uses of renamed pcvs faces

2005-06-10  Miles Bader  <miles@gnu.org>

   * lisp/pcvs.el (cvs-mode-find-file): Use renamed pcvs faces.
   * lisp/pcvs-defs.el (cvs-mode-map): Likewise.
   * lisp/cvs-status.el (cvs-status-font-lock-keywords): Likewise.

4 files changed, 10 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ec845adcf3..269d89ef376 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2005-06-10  Miles Bader  <miles@gnu.org>
 
+        * pcvs.el (cvs-mode-find-file): Use renamed pcvs faces.
+        * pcvs-defs.el (cvs-mode-map): Likewise.
+        * cvs-status.el (cvs-status-font-lock-keywords): Likewise.
+
         * pcvs-info.el (cvs-header, cvs-filename, cvs-unknown)
         (cvs-handled, cvs-need-action, cvs-marked, cvs-msg):
         Remove "-face" suffix from face names.
diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el
index 324da8d3ce1..c8bd1e7e905 100644
--- a/lisp/cvs-status.el
+++ b/lisp/cvs-status.el
@@ -1,6 +1,6 @@
 ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
 
-;; Copyright (C) 1999, 2000, 2003, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs cvs status tree tools
@@ -73,8 +73,8 @@
 
 (defconst cvs-status-font-lock-keywords
   `((,cvs-status-entry-leader-re
-     (1 'cvs-filename-face)
-     (2 'cvs-need-action-face))
+     (1 'cvs-filename)
+     (2 'cvs-need-action))
     (,cvs-status-tags-leader-re
      (,cvs-status-rev-re
       (save-excursion (re-search-forward "^\n" nil 'move) (point))
diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index 27629c5ddc6..62c0d62d161 100644
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -1,7 +1,7 @@
 ;;; pcvs-defs.el --- variable definitions for PCL-CVS
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2003, 2004  Free Software Foundation, Inc.
+;;   2000, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
@@ -381,7 +381,7 @@ This variable is buffer local and only used in the *cvs* buffer.")
     ;; mouse bindings
     ([mouse-2] . cvs-mode-find-file)
     ([follow-link] . (lambda (pos)
-                       (if (eq (get-char-property pos 'face) 'cvs-filename-face) t)))
+                       (if (eq (get-char-property pos 'face) 'cvs-filename) t)))
     ([(down-mouse-3)] . cvs-menu)
     ;; dired-like bindings
     ("\C-o" .   cvs-mode-display-file)
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 7c96a080c54..adcbba2792b 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -1980,7 +1980,7 @@ With a prefix, opens the buffer in an OTHER window."
   (when (and (/= (point) (progn (posn-set-point (event-end e)) (point)))
              (not (memq (get-text-property (1- (line-end-position))
                                            'font-lock-face)
-                        '(cvs-header-face cvs-filename-face))))
+                        '(cvs-header cvs-filename))))
     (error "Not a file name"))
   (cvs-mode!
    (lambda (&optional rev)