upstream

3 files changed, 4 insertions, 6 deletions

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 7de9d17e3f7..ba4a2766526 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -237,7 +237,7 @@ from disabled to enabled, it tries to refine the current hunk, as
 well."
   :group 'diff-mode :init-value t :lighter nil ;; " Auto-Refine"
   (when diff-auto-refine-mode
-    (condition-case-no-debug nil (diff-refine-hunk) (error nil))))
+    (condition-case-unless-debug nil (diff-refine-hunk) (error nil))))
 
 ;;;;
 ;;;; font-lock support
@@ -542,7 +542,7 @@ but in the file header instead, in which case move forward to the first hunk."
 (easy-mmode-define-navigation
  diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view
  (if diff-auto-refine-mode
-     (condition-case-no-debug nil (diff-refine-hunk) (error nil))))
+     (condition-case-unless-debug nil (diff-refine-hunk) (error nil))))
 
 (easy-mmode-define-navigation
  diff-file diff-file-header-re "file" diff-end-of-hunk)
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 7512c9283eb..d345a20a0f5 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -561,9 +561,6 @@ changeset that affected the currently considered file(s)."
                log-view-vc-fileset))
      to fr)))
 
-(declare-function vc-diff-internal "vc"
-                  (async vc-fileset rev1 rev2 &optional verbose))
-
 (defun log-view-diff-changeset (beg end)
   "Get the diff between two revisions.
 If the mark is not active or the mark is on the revision at point,
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el
index 9d55e9c7b43..6cd2b1ddf76 100644
--- a/lisp/vc/vc-dav.el
+++ b/lisp/vc/vc-dav.el
@@ -7,6 +7,8 @@
 ;; Keywords: url, vc
 ;; Package: vc
 
+;; This file is part of GNU Emacs.
+
 ;; 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 3 of the License, or
@@ -20,7 +22,6 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-
 ;;; Commentary:
 
 ;;; Todo: