branch: master commit 0de88f408f512b80dacb09b4eab8dd7c6be78528 Author: Andrey Kotlarski <m00nati...@gmail.com> Commit: Andrey Kotlarski <m00nati...@gmail.com>
packages/vlf: Fix issue where tramp-verbose is bound to nil. --- packages/vlf/vlf-ediff.el | 3 ++- packages/vlf/vlf-occur.el | 3 ++- packages/vlf/vlf-search.el | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/vlf/vlf-ediff.el b/packages/vlf/vlf-ediff.el index e168cf9..2a861e7 100644 --- a/packages/vlf/vlf-ediff.el +++ b/packages/vlf/vlf-ediff.el @@ -170,7 +170,8 @@ logical chunks in case there is no difference at the current ones." (setq buffer-B (current-buffer) min-file-size (min min-file-size vlf-file-size) is-hexl (or is-hexl (derived-mode-p 'hexl-mode))) - (let ((tramp-verbose (if (boundp 'tramp-verbose) + (let ((tramp-verbose (if (and (boundp 'tramp-verbose) + tramp-verbose) (min tramp-verbose 1))) (end-B (= vlf-start-pos vlf-end-pos)) (chunk-B (cons vlf-start-pos vlf-end-pos)) diff --git a/packages/vlf/vlf-occur.el b/packages/vlf/vlf-occur.el index 71d1628..dd3fa38 100644 --- a/packages/vlf/vlf-occur.el +++ b/packages/vlf/vlf-occur.el @@ -206,7 +206,8 @@ Prematurely ending indexing will still show what's found so far." (defun vlf-build-occur (regexp vlf-buffer) "Build occur style index for REGEXP over VLF-BUFFER." - (let* ((tramp-verbose (if (boundp 'tramp-verbose) + (let* ((tramp-verbose (if (and (boundp 'tramp-verbose) + tramp-verbose) (min tramp-verbose 1))) (case-fold-search t) (line 1) diff --git a/packages/vlf/vlf-search.el b/packages/vlf/vlf-search.el index 1793ade..0268ee6 100644 --- a/packages/vlf/vlf-search.el +++ b/packages/vlf/vlf-search.el @@ -48,7 +48,8 @@ Return t if search has been at least partially successful." vlf-start-pos) vlf-file-size))) (or time (setq time (float-time))) - (let* ((tramp-verbose (if (boundp 'tramp-verbose) + (let* ((tramp-verbose (if (and (boundp 'tramp-verbose) + tramp-verbose) (min tramp-verbose 1))) (case-fold-search t) (match-chunk-start vlf-start-pos) @@ -215,7 +216,8 @@ Search is performed chunk by chunk in `vlf-batch-size' memory." (vlf-goto-line-hexl n) (run-hook-with-args 'vlf-before-batch-functions 'goto-line) (vlf-verify-size) - (let ((tramp-verbose (if (boundp 'tramp-verbose) + (let ((tramp-verbose (if (and (boundp 'tramp-verbose) + tramp-verbose) (min tramp-verbose 1))) (start-pos vlf-start-pos) (end-pos vlf-end-pos)