Merge from emacs-24; up to 2012-12-14T15:38:50Z!monnier@iro.umontreal.ca

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

diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index b1c334ddcfcef6164186fa0f1d5f23d130e1d1fe..8b4ff7929692c99c3e40b178729d3ac883dfba7e 100644 (file)
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -1,6 +1,7 @@
 ;;; diff.el --- run `diff'  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1992, 1994, 1996, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1996, 2001-2013 Free Software Foundation,
+;; Inc.
 
 ;; Author: Frank Bresz
 ;; (according to authors.el)
@@ -85,7 +86,7 @@ exists.  If NO-ASYNC is non-nil, call diff synchronously.
 
 When called interactively with a prefix argument, prompt
 interactively for diff switches.  Otherwise, the switches
-specified in `diff-switches' are passed to the diff command."
+specified in the variable `diff-switches' are passed to the diff command."
   (interactive
    (let* ((newf (if (and buffer-file-name (file-exists-p buffer-file-name))
                    (read-file-name