* lisp/mouse.el (mouse-select-region-move-to-beginning): Add :group.

[gnu-emacs] / lisp / vc / pcvs-info.el

diff --git a/lisp/vc/pcvs-info.el b/lisp/vc/pcvs-info.el
index 4af1e73a3582ff20d0cf825fc3d1e997cb2d5559..6bb1370682e3046e3926711d837612b53e336b86 100644 (file)
--- a/lisp/vc/pcvs-info.el
+++ b/lisp/vc/pcvs-info.el
@@ -1,6 +1,6 @@
 ;;; pcvs-info.el --- internal representation of a fileinfo entry
 
-;; Copyright (C) 1991-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2016 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
@@ -69,7 +69,6 @@ to confuse some users sometimes."
     (t (:weight bold)))
   "PCL-CVS face used to highlight directory changes."
   :group 'pcl-cvs)
-(define-obsolete-face-alias 'cvs-header-face 'cvs-header "22.1")
 
 (defface cvs-filename
   '((((class color) (background dark))
@@ -79,7 +78,6 @@ to confuse some users sometimes."
     (t ()))
   "PCL-CVS face used to highlight file names."
   :group 'pcl-cvs)
-(define-obsolete-face-alias 'cvs-filename-face 'cvs-filename "22.1")
 
 (defface cvs-unknown
   '((((class color) (background dark))
@@ -89,7 +87,6 @@ to confuse some users sometimes."
     (t (:slant italic)))
   "PCL-CVS face used to highlight unknown file status."
   :group 'pcl-cvs)
-(define-obsolete-face-alias 'cvs-unknown-face 'cvs-unknown "22.1")
 
 (defface cvs-handled
   '((((class color) (background dark))
@@ -99,7 +96,6 @@ to confuse some users sometimes."
     (t ()))
   "PCL-CVS face used to highlight handled file status."
   :group 'pcl-cvs)
-(define-obsolete-face-alias 'cvs-handled-face 'cvs-handled "22.1")
 
 (defface cvs-need-action
   '((((class color) (background dark))
@@ -109,7 +105,6 @@ to confuse some users sometimes."
     (t (:slant italic)))
   "PCL-CVS face used to highlight status of files needing action."
   :group 'pcl-cvs)
-(define-obsolete-face-alias 'cvs-need-action-face 'cvs-need-action "22.1")
 
 (defface cvs-marked
   '((((min-colors 88) (class color) (background dark))
@@ -121,13 +116,11 @@ to confuse some users sometimes."
     (t (:weight bold)))
   "PCL-CVS face used to highlight marked file indicator."
   :group 'pcl-cvs)
-(define-obsolete-face-alias 'cvs-marked-face 'cvs-marked "22.1")
 
 (defface cvs-msg
   '((t :slant italic))
   "PCL-CVS face used to highlight CVS messages."
   :group 'pcl-cvs)
-(define-obsolete-face-alias 'cvs-msg-face 'cvs-msg "22.1")
 
 (defvar cvs-fi-up-to-date-face 'cvs-handled)
 (defvar cvs-fi-unknown-face 'cvs-unknown)
@@ -465,7 +458,7 @@ DIR can also be a file."
               ((equal date "Result of merge") (setq subtype 'MERGED))
               ((let ((mtime (nth 5 (file-attributes (concat dir f))))
                      (system-time-locale "C"))
-                 (setq timestamp (format-time-string "%c" mtime 'utc))
+                 (setq timestamp (format-time-string "%c" mtime t))
                  ;; Solaris sometimes uses "Wed Sep 05", not "Wed Sep  5".
                  ;; See "grep '[^a-z_]ctime' cvs/src/*.c" for reference.
                  (if (= (aref timestamp 8) ?0)