aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2011-12-02 09:44:19 -0500
committerStefan Monnier2011-12-02 09:44:19 -0500
commit99c79fee5189adb5c4fe52fab4cc1e9f55d2a6bf (patch)
tree240738a58a0e5fbd9f18feec9c5db74d236fad0d
parent6131ba7f188a4f205d1b7ce9d6bbf657be7dceae (diff)
downloademacs-99c79fee5189adb5c4fe52fab4cc1e9f55d2a6bf.tar.gz
emacs-99c79fee5189adb5c4fe52fab4cc1e9f55d2a6bf.zip
* lisp/pcmpl-gnu.el (pcomplete/tar): large-file-warn-threshold can be nil.
Fixes: debbugs:9160
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/pcmpl-gnu.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c14312209b6..ef99c31d1e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-12-02 Stefan Monnier <monnier@iro.umontreal.ca> 12011-12-02 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * pcmpl-gnu.el (pcomplete/tar): large-file-warn-threshold can be nil
4 (bug#9160).
5
3 * dired-aux.el (dired-query): Don't assume help-char is modifier-free 6 * dired-aux.el (dired-query): Don't assume help-char is modifier-free
4 (bug#10191). 7 (bug#10191).
5 8
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index b2c8de6ec2f..608a9dc2e88 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -309,7 +309,8 @@
309 (let* ((fa (file-attributes (pcomplete-arg 1))) 309 (let* ((fa (file-attributes (pcomplete-arg 1)))
310 (size (nth 7 fa))) 310 (size (nth 7 fa)))
311 (and (numberp size) 311 (and (numberp size)
312 (< size large-file-warning-threshold)))) 312 (or (null large-file-warning-threshold)
313 (< size large-file-warning-threshold)))))
313 (let ((file (pcomplete-arg 1))) 314 (let ((file (pcomplete-arg 1)))
314 (completion-table-dynamic 315 (completion-table-dynamic
315 (lambda (_string) 316 (lambda (_string)