summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-02-26 13:35:30 -0500
committerGlenn Morris <rgm@gnu.org>2018-02-26 13:35:30 -0500
commit2ea62d635dd71ddb3368dd743ea9deb2bd68d34d (patch)
tree0854067a32dc177f8e3d7774b2c5b25a817c8617 /lisp/vc/ediff.el
parent25271a63a01f5cfd7983713fb7a67b21c3c72b1c (diff)
downloademacs-2ea62d635dd71ddb3368dd743ea9deb2bd68d34d.tar.gz
emacs-2ea62d635dd71ddb3368dd743ea9deb2bd68d34d.tar.bz2
emacs-2ea62d635dd71ddb3368dd743ea9deb2bd68d34d.zip
Update some lisp function declarations
Diffstat (limited to 'lisp/vc/ediff.el')
-rw-r--r--lisp/vc/ediff.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index cd2b2c4e628..a5e8022f1c8 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -153,7 +153,7 @@
(declare-function dired-get-filename "dired"
(&optional localp no-error-if-not-filep))
(declare-function dired-get-marked-files "dired"
- (&optional localp arg filter distinguish-one-marked))
+ (&optional localp arg filter distinguish-one-marked error))
;; Return a plausible default for ediff's first file:
;; In dired, return the file number FILENO (or 0) in the list