------------------------------------------------------------
revno: 419
revision-id: monn...@iro.umontreal.ca-20130722045834-ic7ez8v527ozg2mt
parent: monn...@iro.umontreal.ca-20130722040109-a0v1v60576n34gxk
author: Andrey Kotlarski <m00nati...@gmail.com>
committer: Stefan Monnier <monn...@iro.umontreal.ca>
branch nick: elpa
timestamp: Mon 2013-07-22 00:58:34 -0400
message:
* packages/vlf/vlf.el: Use lexical-binding. Bump version to 0.3.
Add ability to view newly added content if the file has grown meanwhile.
Provide a V binding in dired.
(vlf-mode-map): Change C-+ to M-+. Add M-- binding.
(vlf-next-batch, vlf-prev-batch): Add ability to jump/insert given number of
batches at once.
(vlf): Add autoload cookie. Add option to start viewing from the end of file.
(dired-vlf): New function.
(vlf-if-file-too-large): New function.
(abort-if-file-too-large): Use it to provide vlf as an option when opening
large files.
modified:
packages/vlf/vlf.el vlf.el-20120614203028-urlm47rgs71aoaqu-2
=== modified file 'packages/vlf/vlf.el'
--- a/packages/vlf/vlf.el 2012-11-29 19:56:52 +0000
+++ b/packages/vlf/vlf.el 2013-07-22 04:58:34 +0000
@@ -1,11 +1,12 @@
-;;; vlf.el --- View Large Files
-
-;; Copyright (C) 2006, 2012 Free Software Foundation, Inc.
-
-;; Version: 0.2
+;;; vlf.el --- View Large Files -*- lexical-binding: t -*-
+
+;; Copyright (C) 2006, 2012, 2013 Free Software Foundation, Inc.
+
+;; Version: 0.3
;; Keywords: large files, utilities
;; Authors: 2006 Mathias Dahl <mathias.d...@gmail.com>
;; 2012 Sam Steingold <s...@gnu.org>
+;; 2013 Andrey Kotlarski <m00nati...@gmail.com>
;; This file is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -56,7 +57,11 @@
(let ((map (make-sparse-keymap)))
(define-key map [M-next] 'vlf-next-batch)
(define-key map [M-prior] 'vlf-prev-batch)
- (define-key map (kbd "C-+") 'vlf-change-batch-size)
+ (define-key map (kbd "M-+") 'vlf-change-batch-size)
+ (define-key map (kbd "M--")
+ (lambda () "Decrease vlf batch size by factor of 2."
+ (interactive)
+ (vlf-change-batch-size t)))
map)
"Keymap for `vlf-mode'.")
@@ -71,22 +76,22 @@
(defun vlf-change-batch-size (decrease)
"Change the buffer-local value of `vlf-batch-size'.
Normally, the value is doubled;
-with the prefix argument it is halved."
+with the prefix argument DECREASE it is halved."
(interactive "P")
(or (assq 'vlf-batch-size (buffer-local-variables))
(error "%s is not local in this buffer" 'vlf-batch-size))
(setq vlf-batch-size
- (if decrease
- (/ vlf-batch-size 2)
- (* vlf-batch-size 2)))
+ (if decrease
+ (/ vlf-batch-size 2)
+ (* vlf-batch-size 2)))
(vlf-update-buffer-name))
(defun vlf-format-buffer-name ()
"Return format for vlf buffer name."
(format "%s(%s)[%d,%d](%d)"
- (file-name-nondirectory buffer-file-name)
- (file-size-human-readable vlf-file-size)
- vlf-start-pos vlf-end-pos vlf-batch-size))
+ (file-name-nondirectory buffer-file-name)
+ (file-size-human-readable vlf-file-size)
+ vlf-start-pos vlf-end-pos vlf-batch-size))
(defun vlf-update-buffer-name ()
"Update the current buffer name."
@@ -94,58 +99,121 @@
(defun vlf-next-batch (append)
"Display the next batch of file data.
-Append to the existing buffer when the prefix argument is supplied."
- (interactive "P")
- (when (= vlf-end-pos vlf-file-size)
- (error "Already at EOF"))
- (let ((inhibit-read-only t)
- (end (min vlf-file-size (+ vlf-end-pos vlf-batch-size))))
- (goto-char (point-max))
- ;; replacing `erase-buffer' with replace arg to `insert-file-contents'
- ;; hangs emacs
- (unless append (erase-buffer))
- (insert-file-contents buffer-file-name nil vlf-end-pos end)
- (unless append
- (setq vlf-start-pos vlf-end-pos))
- (setq vlf-end-pos end)
- (set-buffer-modified-p nil)
- (vlf-update-buffer-name)))
+When prefix argument is supplied and positive
+ jump over APPEND number of batches.
+When prefix argument is negative
+ append next APPEND number of batches to the existing buffer."
+ (interactive "p")
+ (let ((end (+ vlf-end-pos (* vlf-batch-size
+ (abs append)))))
+ (when (< vlf-file-size end) ; re-check file size
+ (setq vlf-file-size (nth 7 (file-attributes buffer-file-name)))
+ (cond ((= vlf-end-pos vlf-file-size)
+ (error "Already at EOF"))
+ ((< vlf-file-size end)
+ (setq end vlf-file-size))))
+ (let ((inhibit-read-only t)
+ (do-append (< append 0)))
+ (if do-append
+ (goto-char (point-max))
+ (setq vlf-start-pos (- end vlf-batch-size))
+ (erase-buffer))
+ (insert-file-contents buffer-file-name nil
+ (if do-append
+ vlf-end-pos
+ vlf-start-pos)
+ end))
+ (setq vlf-end-pos end))
+ (set-buffer-modified-p nil)
+ (vlf-update-buffer-name))
(defun vlf-prev-batch (prepend)
"Display the previous batch of file data.
-Prepend to the existing buffer when the prefix argument is supplied."
- (interactive "P")
- (when (= vlf-start-pos 0)
- (error "Already at BOF"))
+When prefix argument is supplied and positive
+ jump over PREPEND number of batches.
+When prefix argument is negative
+ append previous PREPEND number of batches to the existing buffer."
+ (interactive "p")
+ (if (zerop vlf-start-pos)
+ (error "Already at BOF"))
(let ((inhibit-read-only t)
- (start (max 0 (- vlf-start-pos vlf-batch-size))))
- (goto-char (point-min))
- (unless prepend (erase-buffer))
- (insert-file-contents buffer-file-name nil start vlf-start-pos)
- (unless prepend
- (setq vlf-end-pos vlf-start-pos))
- (setq vlf-start-pos start)
- (set-buffer-modified-p nil)
- (vlf-update-buffer-name)))
+ (start (max 0 (- vlf-start-pos (* vlf-batch-size
+ (abs prepend)))))
+ (do-prepend (< prepend 0)))
+ (if do-prepend
+ (goto-char (point-min))
+ (setq vlf-end-pos (+ start vlf-batch-size))
+ (erase-buffer))
+ (insert-file-contents buffer-file-name nil start
+ (if do-prepend
+ vlf-start-pos
+ vlf-end-pos))
+ (setq vlf-start-pos start))
+ (set-buffer-modified-p nil)
+ (vlf-update-buffer-name))
-(defun vlf (file)
+;;;###autoload
+(defun vlf (from-end file)
"View a Large File in Emacs.
+With FROM-END prefix, view from the back.
FILE is the file to open.
Batches of the file data from FILE will be displayed in a
read-only buffer.
You can customize the number of bytes to
display by customizing `vlf-batch-size'."
- (interactive "fFile to open: ")
+ (interactive "P\nfFile to open: ")
(with-current-buffer (generate-new-buffer "*vlf*")
(setq buffer-file-name file
- vlf-start-pos 0
- vlf-end-pos vlf-batch-size
- vlf-file-size (nth 7 (file-attributes file)))
+ vlf-file-size (nth 7 (file-attributes file)))
+ (if from-end
+ (setq vlf-start-pos (max 0 (- vlf-file-size vlf-batch-size))
+ vlf-end-pos vlf-file-size)
+ (setq vlf-start-pos 0
+ vlf-end-pos (min vlf-batch-size vlf-file-size)))
(vlf-update-buffer-name)
(insert-file-contents buffer-file-name nil
- vlf-start-pos vlf-end-pos nil)
+ vlf-start-pos vlf-end-pos)
(vlf-mode)
- (display-buffer (current-buffer))))
+ (switch-to-buffer (current-buffer))))
+
+;;;###autoload
+(defun dired-vlf (from-end)
+ "In Dired, visit the file on this line in VLF mode.
+With FROM-END prefix, view from the back."
+ (interactive "P")
+ (vlf from-end (dired-get-file-for-visit)))
+
+;;;###autoload
+(eval-after-load "dired"
+ '(define-key dired-mode-map "V" 'dired-vlf))
+
+;;;###autoload
+(defun vlf-if-file-too-large (size op-type &optional filename)
+ "If file SIZE larger than `large-file-warning-threshold', \
+allow user to view file with `vlf', open it normally or abort.
+OP-TYPE specifies the file operation being performed over FILENAME."
+ (and large-file-warning-threshold size
+ (> size large-file-warning-threshold)
+ (let ((char nil))
+ (while (not (memq (setq char
+ (read-event
+ (propertize
+ (format "File %s is large (%s): %s normally (o), %s with vlf (v) or abort (a)"
+ (file-name-nondirectory filename)
+ (file-size-human-readable size)
+ op-type op-type)
+ 'face 'minibuffer-prompt)))
+ '(?o ?O ?v ?V ?a ?A))))
+ (cond ((memq char '(?o ?O)))
+ ((memq char '(?v ?V))
+ (vlf nil filename)
+ (error ""))
+ ((memq char '(?a ?A))
+ (error "Aborted"))))))
+
+;;; hijack `abort-if-file-too-large'
+;;;###autoload
+(fset 'abort-if-file-too-large 'vlf-if-file-too-large)
(defun dired-vlf ()
"In Dired, visit the file on this line in VLF mode."
