Update copyright year to 2016

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

diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index e0f514406edffb40d8a947b66f0e6045cfd569ba..36a1d91d90e6ba5c36988a142814ef82e847c679 100644 (file)
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -1,6 +1,6 @@
 ;;; pcvs.el --- a front-end to CVS  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1991-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2016 Free Software Foundation, Inc.
 
 ;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com
 ;;     (Per Cederqvist) ceder@lysator.liu.se
@@ -968,10 +968,10 @@ With a prefix argument, prompt for cvs FLAGS to use."
 The files are stored to DIR."
   (interactive
    (let* ((branch (cvs-prefix-get 'cvs-branch-prefix))
-         (prompt (format "CVS Checkout Directory for `%s%s': "
-                        (cvs-get-module)
-                        (if branch (format " (branch: %s)" branch)
-                          ""))))
+         (prompt (format-message "CVS Checkout Directory for `%s%s': "
+                                 (cvs-get-module)
+                                 (if branch (format " (branch: %s)" branch)
+                                   ""))))
      (list (read-directory-name prompt nil default-directory nil))))
   (let ((modules (split-string-and-unquote (cvs-get-module)))
        (flags (cvs-add-branch-prefix
@@ -2209,7 +2209,7 @@ With prefix argument, prompt for cvs flags."
 ;; Byte compile files.
 
 (defun-cvs-mode cvs-mode-byte-compile-files ()
-  "Run byte-compile-file on all selected files with '.el' extension."
+  "Run byte-compile-file on all selected files with `.el' extension."
   (interactive)
   (let ((marked (cvs-get-marked (cvs-ignore-marks-p "byte-compile"))))
     (dolist (fi marked)
@@ -2312,7 +2312,7 @@ this file, or a list of arguments to send to the program."
            (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes)
            ;; `preserve-modes' avoids changing the (minor) modes.  But we
            ;; do want to reset the mode for VC, so we do it explicitly.
-           (vc-find-file-hook)
+           (vc-refresh-state)
            (when (eq (cvs-fileinfo->type fileinfo) 'CONFLICT)
              (smerge-start-session))))))))
 
@@ -2403,9 +2403,9 @@ The exact behavior is determined also by `cvs-dired-use-hook'."
                         (goto-char (point-min))
                         (looking-at ".*to add this file permanently\n\\'"))
                 (dolist (file (if (listp files) files (list files)))
-                  (insert "cvs add: scheduling file `"
-                          (file-name-nondirectory file)
-                          "' for addition\n")))
+                  (insert (format-message
+                          "cvs add: scheduling file `%s' for addition\n"
+                          (file-name-nondirectory file)))))
              ;; VC never (?) does `cvs -n update' so dcd=nil
              ;; should probably always be the right choice.
              (cvs-parse-process nil subdir))))))))