aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2013-08-06 11:38:41 +0200
committerJuanma Barranquero2013-08-06 11:38:41 +0200
commit8951efefa167119b567b9d1aab0eb5dd05d362b8 (patch)
tree69dd4ac237d7180e85bb817499f40be95eb7dc8c
parente30b79c1c52a4428189ca148c73e7ecc993c6f6a (diff)
downloademacs-8951efefa167119b567b9d1aab0eb5dd05d362b8.tar.gz
emacs-8951efefa167119b567b9d1aab0eb5dd05d362b8.zip
lisp/vc/vc.el: Silence byte-compiler warning.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc/vc.el10
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 @@
12013-08-06 Juanma Barranquero <lekktu@gmail.com> 12013-08-06 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * vc/vc.el (vc-default-ignore-completion-table):
4 Silence byte-compiler warning.
5
3 * frameset.el (frameset-p): Don't check non-nullness of the `properties' 6 * frameset.el (frameset-p): Don't check non-nullness of the `properties'
4 slot , which can indeed be nil. 7 slot , which can indeed be nil.
5 (frameset-live-filter-alist, frameset-persistent-filter-alist): 8 (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 @@
486;; default implementation always returns nil. 486;; default implementation always returns nil.
487;; 487;;
488;; - root (file) 488;; - root (file)
489;; 489;;
490;; Return the root of the VC controlled hierarchy for file. 490;; Return the root of the VC controlled hierarchy for file.
491;; 491;;
492;; - repository-hostname (dirname) 492;; - repository-hostname (dirname)
@@ -502,13 +502,13 @@
502;; Ignore FILE under the current VCS. When called interactively and 502;; Ignore FILE under the current VCS. When called interactively and
503;; with a prefix argument, remove an ignored file. When called from 503;; with a prefix argument, remove an ignored file. When called from
504;; Lisp code, if REMOVE is non-nil, remove FILE from ignored files." 504;; Lisp code, if REMOVE is non-nil, remove FILE from ignored files."
505;; 505;;
506;; - ignore-completion-table 506;; - ignore-completion-table
507;; 507;;
508;; Return the completion table for files ignored by the current 508;; Return the completion table for files ignored by the current
509;; version control system, e.g., the entries in `.gitignore' and 509;; version control system, e.g., the entries in `.gitignore' and
510;; `.bzrignore'. 510;; `.bzrignore'.
511;; 511;;
512;; - previous-revision (file rev) 512;; - previous-revision (file rev)
513;; 513;;
514;; Return the revision number that precedes REV for FILE, or nil if no such 514;; 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."
1365 (setq backend (vc-backend directory)) 1365 (setq backend (vc-backend directory))
1366 (vc-call-backend backend 'ignore file default-directory remove)))) 1366 (vc-call-backend backend 'ignore file default-directory remove))))
1367 1367
1368(defun vc-default-ignore-completion-table (file) 1368(defun vc-default-ignore-completion-table (_file)
1369 "Return the list of ignored files." 1369 "Return the list of ignored files."
1370 ;; Unused lexical argument `file' 1370 ;; Unused lexical argument `file'
1371 nil) 1371 nil)