[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/vlf de1948e 108/310: Merge branch 'master' into chunk-o
From: |
Stefan Monnier |
Subject: |
[elpa] externals/vlf de1948e 108/310: Merge branch 'master' into chunk-opt2 |
Date: |
Sat, 28 Nov 2020 00:32:56 -0500 (EST) |
branch: externals/vlf
commit de1948ed36c087565add3c59f98c5d001b90d04a
Merge: bbda9ab ae775f8
Author: Andrey Kotlarski <m00naticus@gmail.com>
Commit: Andrey Kotlarski <m00naticus@gmail.com>
Merge branch 'master' into chunk-opt2
---
vlfi.el | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/vlfi.el b/vlfi.el
index 0b1137e..9b3cbc9 100644
--- a/vlfi.el
+++ b/vlfi.el
@@ -200,9 +200,9 @@ with the prefix argument DECREASE it is halved."
"Update the current buffer name."
(rename-buffer (vlfi-format-buffer-name) t))
-(defmacro vlfi-get-file-size (file)
+(defun vlfi-get-file-size (file)
"Get size in bytes of FILE."
- `(nth 7 (file-attributes ,file)))
+ (nth 7 (file-attributes file)))
(defun vlfi-insert-file (&optional from-end)
"Insert first chunk of current file contents in current buffer.
@@ -428,6 +428,7 @@ Return cons \(success-status .
number-of-bytes-moved-back\)."
(defun vlfi-re-search (regexp count backward batch-step)
"Search for REGEXP COUNT number of times forward or BACKWARD.
BATCH-STEP is amount of overlap between successive chunks."
+ (assert (< 0 count))
(let* ((match-chunk-start vlfi-start-pos)
(match-chunk-end vlfi-end-pos)
(match-start-pos (+ vlfi-start-pos (position-bytes (point))))
@@ -561,18 +562,23 @@ Search is performed chunk by chunk in `vlfi-batch-size'
memory."
(vlfi-re-search regexp count t (/ vlfi-batch-size 8)))
(defun vlfi-goto-line (n)
- "Go to line N."
+ "Go to line N. If N is negative, count from the end of file."
(interactive "nGo to line: ")
(let ((start-pos vlfi-start-pos)
(end-pos vlfi-end-pos)
(pos (point))
(success nil))
(unwind-protect
- (progn (vlfi-beginning-of-file)
- (goto-char (point-min))
- (setq success (vlfi-re-search "[\n\C-m]" (1- n)
- nil 0)))
- (unless success
+ (if (< 0 n)
+ (progn (vlfi-beginning-of-file)
+ (goto-char (point-min))
+ (setq success (vlfi-re-search "[\n\C-m]" (1- n)
+ nil 0)))
+ (vlfi-end-of-file)
+ (goto-char (point-max))
+ (setq success (vlfi-re-search "[\n\C-m]" (- n) t 0)))
+ (if success
+ (message "Onto line %s" n)
(vlfi-move-to-chunk start-pos end-pos)
(goto-char pos)))))
- [elpa] externals/vlf 54927af 088/310: Update README and bump version., (continued)
- [elpa] externals/vlf 54927af 088/310: Update README and bump version., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf b8cc344 091/310: Add more detailed usage details., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf eaf85e5 093/310: Add key-binding to vlfi-mode-map in vlfi-edit-mode-map., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf e4d886a 092/310: Add check if VLFI buffer has been modified before occur jumping to new, Stefan Monnier, 2020/11/28
- [elpa] externals/vlf a63ea7a 095/310: Grammar fixes., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 57eb4c2 099/310: Initial attempt at optimizing chunk access., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf d2bd47c 100/310: More attempts to optimize decoding., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 7bfe665 102/310: More secure chunk decode adjustment and minor fixes., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf bbda9ab 105/310: Merge branch 'master' into chunk-opt2, Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 1ac1eec 106/310: Turn vlfi-get-file-size to function., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf de1948e 108/310: Merge branch 'master' into chunk-opt2,
Stefan Monnier <=
- [elpa] externals/vlf c827c3e 110/310: Prevent standard save procedure invocation in case user postpones, Stefan Monnier, 2020/11/28
- [elpa] externals/vlf b943008 113/310: Bump version and update README., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf c1aedbc 116/310: Update README: VLFI is now development version of VLF., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 616d676 114/310: Alters vlfi to respect the default-directory variable when opening, Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 3d652fe 103/310: Minor documentation fixes., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 4589c25 112/310: Return to current position after occur ending with quit., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf ce9441f 120/310: Update info as VLFI is merging back to VLF. Bump version., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 7cb0474 122/310: Add forgotten vlfi-encode-size local variable creation., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 02a37c4 123/310: Merge branch 'master' into chunk-opt2, Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 2d71996 125/310: Add end character shift when adjusting chunk. Apply partial chunk, Stefan Monnier, 2020/11/28