From 8951efefa167119b567b9d1aab0eb5dd05d362b8 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 6 Aug 2013 11:38:41 +0200 Subject: [PATCH] lisp/vc/vc.el: Silence byte-compiler warning. --- lisp/ChangeLog | 3 +++ lisp/vc/vc.el | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 61254731938..c7a5d6ae070 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-08-06 Juanma Barranquero + * vc/vc.el (vc-default-ignore-completion-table): + Silence byte-compiler warning. + * frameset.el (frameset-p): Don't check non-nullness of the `properties' slot , which can indeed be nil. (frameset-live-filter-alist, frameset-persistent-filter-alist): diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 9757d4a43be..35e91e7e059 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -486,7 +486,7 @@ ;; default implementation always returns nil. ;; ;; - root (file) -;; +;; ;; Return the root of the VC controlled hierarchy for file. ;; ;; - repository-hostname (dirname) @@ -502,13 +502,13 @@ ;; Ignore FILE under the current VCS. When called interactively and ;; with a prefix argument, remove an ignored file. When called from ;; Lisp code, if REMOVE is non-nil, remove FILE from ignored files." -;; +;; ;; - ignore-completion-table -;; +;; ;; Return the completion table for files ignored by the current ;; version control system, e.g., the entries in `.gitignore' and ;; `.bzrignore'. -;; +;; ;; - previous-revision (file rev) ;; ;; Return the revision number that precedes REV for FILE, or nil if no such @@ -1365,7 +1365,7 @@ non-nil, remove FILE from ignored files." (setq backend (vc-backend directory)) (vc-call-backend backend 'ignore file default-directory remove)))) -(defun vc-default-ignore-completion-table (file) +(defun vc-default-ignore-completion-table (_file) "Return the list of ignored files." ;; Unused lexical argument `file' nil) -- 2.11.4.GIT