1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-11 09:20:51 +00:00
emacs/lisp/jka-compr.el

715 lines
24 KiB
EmacsLisp
Raw Normal View History

1995-10-30 17:35:01 +00:00
;;; jka-compr.el --- reading/writing/loading compressed files
;; Copyright (C) 1993-1995, 1997, 1999-2019 Free Software Foundation,
;; Inc.
1994-02-18 22:50:05 +00:00
;; Author: Jay K. Adams <jka@ece.cmu.edu>
;; Maintainer: emacs-devel@gnu.org
1994-02-18 22:50:05 +00:00
;; Keywords: data
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; Commentary:
1994-02-18 22:50:05 +00:00
1996-01-14 07:34:30 +00:00
;; This package implements low-level support for reading, writing,
;; and loading compressed files. It hooks into the low-level file
;; I/O functions (including write-region and insert-file-contents) so
;; that they automatically compress or uncompress a file if the file
;; appears to need it (based on the extension of the file name).
;; Packages like Rmail, VM, GNUS, and Info should be able to work
;; with compressed files without modification.
;; INSTRUCTIONS:
;;
2000-10-15 11:21:33 +00:00
;; To use jka-compr, invoke the command `auto-compression-mode' (which
;; see), or customize the variable of the same name. Its operation
;; should be transparent to the user (except for messages appearing when
;; a file is being compressed or uncompressed).
1996-01-14 07:34:30 +00:00
;;
;; The variable, jka-compr-compression-info-list can be used to
;; customize jka-compr to work with other compression programs.
;; The default value of this variable allows jka-compr to work with
;; Unix compress and gzip.
;;
;; If you don't want messages about compressing and decompressing
2007-01-27 11:55:59 +00:00
;; to show up in the echo area, you can set the compress-msg and
;; decompress-msg fields of the jka-compr-compression-info-list to
1996-01-14 07:34:30 +00:00
;; nil.
;; APPLICATION NOTES:
;;
;; crypt++
2002-06-09 17:13:56 +00:00
;; jka-compr can coexist with crypt++ if you take all the decompression
1996-01-14 07:34:30 +00:00
;; entries out of the crypt-encoding-list. Clearly problems will arise if
;; you have two programs trying to compress/decompress files. jka-compr
;; will not "work with" crypt++ in the following sense: you won't be able to
;; decode encrypted compressed files--that is, files that have been
;; compressed then encrypted (in that order). Theoretically, crypt++ and
;; jka-compr could properly handle a file that has been encrypted then
;; compressed, but there is little point in trying to compress an encrypted
;; file.
;;
;; ACKNOWLEDGMENTS
2003-02-04 12:29:42 +00:00
;;
1996-01-14 07:34:30 +00:00
;; jka-compr is a V19 adaptation of jka-compr for V18 of Emacs. Many people
2003-02-04 12:29:42 +00:00
;; have made helpful suggestions, reported bugs, and even fixed bugs in
1996-01-14 07:34:30 +00:00
;; jka-compr. I recall the following people as being particularly helpful.
;;
;; Jean-loup Gailly
;; David Hughes
;; Richard Pieri
;; Daniel Quinlan
;; Chris P. Ross
;; Rick Sladkey
;;
;; Andy Norman's ange-ftp was the inspiration for the original jka-compr for
;; Version 18 of Emacs.
;;
;; After I had made progress on the original jka-compr for V18, I learned of a
;; package written by Kazushi Jam Marukawa, called jam-zcat, that did exactly
;; what I was trying to do. I looked over the jam-zcat source code and
;; probably got some ideas from it.
;;
1994-02-18 22:50:05 +00:00
;;; Code:
(require 'jka-cmpr-hook)
(defcustom jka-compr-shell "sh"
* align.el: * allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
2008-12-03 05:48:14 +00:00
"Shell to be used for calling compression programs.
2007-01-27 11:55:59 +00:00
NOTE: Not used in MS-DOS and Windows systems."
:type 'string
:group 'jka-compr)
1994-02-18 22:50:05 +00:00
2003-02-04 12:29:42 +00:00
(defvar jka-compr-use-shell
(not (memq system-type '(ms-dos windows-nt))))
1994-02-18 22:50:05 +00:00
(defvar jka-compr-really-do-compress nil
"Non-nil in a buffer whose visited file was uncompressed on visiting it.
This means compress the data on writing the file, even if the
data appears to be compressed already.")
(make-variable-buffer-local 'jka-compr-really-do-compress)
(put 'jka-compr-really-do-compress 'permanent-local t)
1994-02-18 22:50:05 +00:00
* lisp/subr.el (define-error): New function. * doc/lispref/control.texi (Signaling Errors): Refer to define-error. (Error Symbols): Add `define-error'. * doc/lispref/errors.texi (Standard Errors): Don't refer to `error-conditions'. * lisp/progmodes/ada-xref.el (ada-error-file-not-found): Rename from error-file-not-found and define with define-error. * lisp/emacs-lisp/cl-lib.el (cl-assertion-failed): Move here from subr.el and define with define-error. * lisp/userlock.el (file-locked, file-supersession): * lisp/simple.el (mark-inactive): * lisp/progmodes/js.el (js-moz-bad-rpc, js-js-error): * lisp/progmodes/ada-mode.el (ada-mode-errors): * lisp/play/life.el (life-extinct): * lisp/nxml/xsd-regexp.el (xsdre-invalid-regexp, xsdre-parse-error): * lisp/nxml/xmltok.el (xmltok-markup-declaration-parse-error): * lisp/nxml/rng-util.el (rng-error): * lisp/nxml/rng-uri.el (rng-uri-error): * lisp/nxml/rng-match.el (rng-compile-error): * lisp/nxml/rng-cmpct.el (rng-c-incorrect-schema): * lisp/nxml/nxml-util.el (nxml-error, nxml-file-parse-error): * lisp/nxml/nxml-rap.el (nxml-scan-error): * lisp/nxml/nxml-outln.el (nxml-outline-error): * lisp/net/soap-client.el (soap-error): * lisp/net/gnutls.el (gnutls-error): * lisp/net/ange-ftp.el (ftp-error): * lisp/mpc.el (mpc-proc-error): * lisp/json.el (json-error, json-readtable-error, json-unknown-keyword) (json-number-format, json-string-escape, json-string-format) (json-key-format, json-object-format): * lisp/jka-compr.el (compression-error): * lisp/international/quail.el (quail-error): * lisp/international/kkc.el (kkc-error): * lisp/emacs-lisp/ert.el (ert-test-failed): * lisp/calc/calc.el (calc-error, inexact-result, math-overflow) (math-underflow): * lisp/bookmark.el (bookmark-error-no-filename): * lisp/epg.el (epg-error): Define with define-error.
2013-08-09 21:22:44 +00:00
(define-error 'compression-error nil 'file-error)
1994-02-18 22:50:05 +00:00
(defvar jka-compr-acceptable-retval-list '(0 2 141))
1994-02-18 22:50:05 +00:00
(defun jka-compr-error (prog args infile message &optional errfile)
(let ((errbuf (get-buffer-create " *jka-compr-error*")))
(with-current-buffer errbuf
(widen) (erase-buffer)
(insert (format "Error while executing \"%s %s < %s\"\n\n"
prog
(mapconcat 'identity args " ")
infile))
(and errfile
(insert-file-contents errfile)))
1994-02-18 22:50:05 +00:00
(display-buffer errbuf))
(signal 'compression-error
(list "Opening input file" (format "error %s" message) infile)))
2003-02-04 12:29:42 +00:00
(defcustom jka-compr-dd-program "/bin/dd"
"How to invoke `dd'."
:type 'string
:group 'jka-compr)
1994-02-18 22:50:05 +00:00
(defvar jka-compr-dd-blocksize 256)
1994-02-18 22:50:05 +00:00
(defun jka-compr-partial-uncompress (prog message args infile beg len)
"Call program PROG with ARGS args taking input from INFILE.
Fourth and fifth args, BEG and LEN, specify which part of the output
to keep: LEN chars starting BEG chars from the beginning."
(let ((start (point))
(prefix beg))
(if (and jka-compr-use-shell jka-compr-dd-program)
;; Put the uncompression output through dd
;; to discard the part we don't want.
(let ((skip (/ beg jka-compr-dd-blocksize))
(err-file (jka-compr-make-temp-name))
;; call-process barfs if default-directory is inaccessible.
(default-directory
(if (and default-directory
(file-accessible-directory-p default-directory))
default-directory
(file-name-directory infile)))
count)
;; Update PREFIX based on the text that we won't read in.
(setq prefix (- beg (* skip jka-compr-dd-blocksize))
count (and len (1+ (/ (+ len prefix) jka-compr-dd-blocksize))))
(unwind-protect
(or (memq (call-process
jka-compr-shell infile t nil "-c"
2011-01-15 20:03:38 +00:00
;; Windows shells need the program file name
;; after the pipe symbol be quoted if they use
;; forward slashes as directory separators.
(format
2011-01-15 20:03:38 +00:00
"%s %s 2> %s | \"%s\" bs=%d skip=%d %s 2> %s"
prog
(mapconcat 'identity args " ")
err-file
jka-compr-dd-program
jka-compr-dd-blocksize
skip
;; dd seems to be unreliable about
;; providing the last block. So, always
;; read one more than you think you need.
(if count (format "count=%d" (1+ count)) "")
null-device))
jka-compr-acceptable-retval-list)
(jka-compr-error prog args infile message err-file))
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
(delete-file err-file)))
;; Run the uncompression program directly.
;; We get the whole file and must delete what we don't want.
(jka-compr-call-process prog message infile t nil args))
1994-02-18 22:50:05 +00:00
;; Delete the stuff after what we want, if there is any.
1994-02-18 22:50:05 +00:00
(and
len
(< (+ start prefix len) (point))
(delete-region (+ start prefix len) (point)))
1994-02-18 22:50:05 +00:00
;; Delete the stuff before what we want.
1994-02-18 22:50:05 +00:00
(delete-region start (+ start prefix))))
(defun jka-compr-call-process (prog message infile output temp args)
;; call-process barfs if default-directory is inaccessible.
(let ((default-directory
(if (and default-directory
(not (file-remote-p default-directory))
(file-accessible-directory-p default-directory))
default-directory
(file-name-directory infile))))
(if jka-compr-use-shell
(let ((err-file (jka-compr-make-temp-name))
(coding-system-for-read (or coding-system-for-read 'undecided))
(coding-system-for-write 'no-conversion))
(unwind-protect
(or (memq
(call-process jka-compr-shell infile
(if (stringp output) nil output)
nil
"-c"
(format "%s %s 2> %s %s"
prog
(mapconcat 'identity args " ")
err-file
(if (stringp output)
(concat "> " output)
"")))
jka-compr-acceptable-retval-list)
(jka-compr-error prog args infile message err-file))
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
(delete-file err-file)))
(or (eq 0
(apply 'call-process
prog infile (if (stringp output) temp output)
nil args))
(jka-compr-error prog args infile message))
(and (stringp output)
(with-current-buffer temp
(write-region (point-min) (point-max) output)
(erase-buffer))))))
1994-02-18 22:50:05 +00:00
;; Support for temp files. Much of this was inspired if not lifted
;; from ange-ftp.
1994-02-18 22:50:05 +00:00
(defcustom jka-compr-temp-name-template
(expand-file-name "jka-com" temporary-file-directory)
"Prefix added to all temp files created by jka-compr.
There should be no more than seven characters after the final `/'."
:type 'string
:group 'jka-compr)
1994-02-18 22:50:05 +00:00
2011-04-19 13:44:55 +00:00
(defun jka-compr-make-temp-name (&optional _local-copy)
1994-02-18 22:50:05 +00:00
"This routine will return the name of a new file."
1999-10-15 16:03:59 +00:00
(make-temp-file jka-compr-temp-name-template))
(defun jka-compr-write-region (start end file &optional
append visit lockname mustbenew)
1994-02-18 22:50:05 +00:00
(let* ((filename (expand-file-name file))
(visit-file (if (stringp visit) (expand-file-name visit) filename))
(info (jka-compr-get-compression-info visit-file))
(magic (and info (jka-compr-info-file-magic-bytes info))))
;; If we uncompressed this file when visiting it,
;; then recompress it when writing it
;; even if the contents look compressed already.
(if (and jka-compr-really-do-compress
(or (null start)
(= (- end start) (buffer-size))))
(setq magic nil))
(if (and info
;; If the contents to be written out
;; are properly compressed already,
;; don't try to compress them over again.
(not (and magic
(equal (if (stringp start)
(substring start 0 (min (length start)
(length magic)))
2008-05-28 17:37:04 +00:00
(let* ((from (or start (point-min)))
(to (min (or end (point-max))
(+ from (length magic)))))
(buffer-substring from to)))
magic))))
(let ((can-append (jka-compr-info-can-append info))
(compress-program (jka-compr-info-compress-program info))
(compress-message (jka-compr-info-compress-message info))
(compress-args (jka-compr-info-compress-args info))
(base-name (file-name-nondirectory visit-file))
temp-file temp-buffer
;; we need to leave `last-coding-system-used' set to its
;; value after calling write-region the first time, so
;; that `basic-save-buffer' sees the right value.
(coding-system-used last-coding-system-used))
(or compress-program
(error "No compression program defined"))
(setq temp-buffer (get-buffer-create " *jka-compr-wr-temp*"))
(with-current-buffer temp-buffer
(widen) (erase-buffer))
(if (and append
(not can-append)
(file-exists-p filename))
(let* ((local-copy (file-local-copy filename))
(local-file (or local-copy filename)))
(setq temp-file local-file))
(setq temp-file (jka-compr-make-temp-name)))
2003-02-04 12:29:42 +00:00
(and
compress-message
jka-compr-verbose
(message "%s %s..." compress-message base-name))
(jka-compr-run-real-handler 'write-region
(list start end temp-file t 'dont))
;; save value used by the real write-region
(setq coding-system-used last-coding-system-used)
;; Here we must read the output of compress program as is
;; without any code conversion.
(let ((coding-system-for-read 'no-conversion))
(jka-compr-call-process compress-program
(concat compress-message
" " base-name)
temp-file
temp-buffer
nil
compress-args))
(with-current-buffer temp-buffer
(let ((coding-system-for-write 'no-conversion))
(jka-compr-run-real-handler 'write-region
(list (point-min) (point-max)
filename
(and append can-append) 'dont
lockname mustbenew))
(erase-buffer)) )
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
(delete-file temp-file)
1994-02-18 22:50:05 +00:00
(and
compress-message
jka-compr-verbose
(message "%s %s...done" compress-message base-name))
(cond
((eq visit t)
(setq buffer-file-name filename)
(setq jka-compr-really-do-compress t)
(set-visited-file-modtime))
((stringp visit)
(setq buffer-file-name visit)
(let ((buffer-file-name filename))
(set-visited-file-modtime))))
(and (or (eq visit t)
(eq visit nil)
(stringp visit))
(message "Wrote %s" visit-file))
;; ensure `last-coding-system-used' has an appropriate value
(setq last-coding-system-used coding-system-used)
nil)
2003-02-04 12:29:42 +00:00
(jka-compr-run-real-handler 'write-region
(list start end filename append visit
lockname mustbenew)))))
1994-02-18 22:50:05 +00:00
(defun jka-compr-insert-file-contents (file &optional visit beg end replace)
1994-02-18 22:50:05 +00:00
(barf-if-buffer-read-only)
(and (or beg end)
visit
(error "Attempt to visit less than an entire file"))
(let* ((filename (expand-file-name file))
(info (jka-compr-get-compression-info filename)))
(if (not info)
(jka-compr-run-real-handler 'insert-file-contents
(list file visit beg end replace))
(let ((uncompress-message (jka-compr-info-uncompress-message info))
(uncompress-program (jka-compr-info-uncompress-program info))
(uncompress-args (jka-compr-info-uncompress-args info))
(base-name (file-name-nondirectory filename))
(notfound nil)
(local-copy
(jka-compr-run-real-handler 'file-local-copy (list filename)))
local-file
size start)
(setq local-file (or local-copy filename))
(and
visit
(setq buffer-file-name filename))
(unwind-protect ; to make sure local-copy gets deleted
(progn
(and
uncompress-message
jka-compr-verbose
(message "%s %s..." uncompress-message base-name))
(condition-case error-code
(let ((coding-system-for-read 'no-conversion))
(if replace
(goto-char (point-min)))
(setq start (point))
(if (or beg end)
(jka-compr-partial-uncompress uncompress-program
(concat uncompress-message
" " base-name)
uncompress-args
local-file
(or beg 0)
(if (and beg end)
(- end beg)
end))
;; If visiting, bind off buffer-file-name so that
;; file-locking will not ask whether we should
;; really edit the buffer.
(let ((buffer-file-name
(if visit nil buffer-file-name)))
(jka-compr-call-process uncompress-program
(concat uncompress-message
" " base-name)
local-file
t
nil
uncompress-args)))
(setq size (- (point) start))
(if replace
(delete-region (point) (point-max)))
(goto-char start))
(error
;; If the file we wanted to uncompress does not exist,
;; handle that according to VISIT as `insert-file-contents'
;; would, maybe signaling the same error it normally would.
New error file-missing This fixes a recently-introduced bug in delete-directory, where the code assumes the C locale when determining whether a file-error corresponds to a missing file (Bug#24714). * doc/lispref/errors.texi (Standard Errors): * doc/lispref/files.texi (Changing Files): * etc/NEWS: Document this. * doc/lispref/loading.texi (How Programs Do Loading): Say "a file-error" rather than "the error file-error" since it might be a file-missing now. * lisp/emacs-lisp/bytecomp.el (byte-compile-file): * lisp/epa-file.el (epa-file--find-file-not-found-function): (epa-file-insert-file-contents, epa-file-write-region): * lisp/ffap.el (find-file-at-point, dired-at-point): * lisp/jka-compr.el (jka-compr-insert-file-contents) (jka-compr-insert-file-contents): * lisp/net/ange-ftp.el (ange-ftp-barf-if-not-directory) (ange-ftp-insert-file-contents, ange-ftp-copy-file-internal): * lisp/progmodes/etags.el (visit-tags-table): * lisp/url/url-handlers.el (url-copy-file): * src/fileio.c (report_file_errno): Signal file-missing if appropriate. * lisp/epa-file.el (epa-file-insert-file-contents): * lisp/jka-compr.el (jka-compr-insert-file-contents): Don't assume file-error is a leaf in the error hierarchy. * lisp/files.el (files--force): * lisp/gnus/nnmaildir.el (nnmaildir--enoent-p): * lisp/jka-compr.el (jka-compr-insert-file-contents): Use file-missing to detect whether the file is missing. * lisp/url/url-handlers.el (url-copy-file): Signal file-already-exists if appropriate. * src/fileio.c (syms_of_fileio): Define file-missing. 2016-10-18 Paul Eggert <eggert@cs.ucla.edu>
2016-10-21 20:04:02 +00:00
(if (and (eq (car error-code) 'file-missing)
(eq (nth 3 error-code) local-file))
(if visit
(setq notfound error-code)
New error file-missing This fixes a recently-introduced bug in delete-directory, where the code assumes the C locale when determining whether a file-error corresponds to a missing file (Bug#24714). * doc/lispref/errors.texi (Standard Errors): * doc/lispref/files.texi (Changing Files): * etc/NEWS: Document this. * doc/lispref/loading.texi (How Programs Do Loading): Say "a file-error" rather than "the error file-error" since it might be a file-missing now. * lisp/emacs-lisp/bytecomp.el (byte-compile-file): * lisp/epa-file.el (epa-file--find-file-not-found-function): (epa-file-insert-file-contents, epa-file-write-region): * lisp/ffap.el (find-file-at-point, dired-at-point): * lisp/jka-compr.el (jka-compr-insert-file-contents) (jka-compr-insert-file-contents): * lisp/net/ange-ftp.el (ange-ftp-barf-if-not-directory) (ange-ftp-insert-file-contents, ange-ftp-copy-file-internal): * lisp/progmodes/etags.el (visit-tags-table): * lisp/url/url-handlers.el (url-copy-file): * src/fileio.c (report_file_errno): Signal file-missing if appropriate. * lisp/epa-file.el (epa-file-insert-file-contents): * lisp/jka-compr.el (jka-compr-insert-file-contents): Don't assume file-error is a leaf in the error hierarchy. * lisp/files.el (files--force): * lisp/gnus/nnmaildir.el (nnmaildir--enoent-p): * lisp/jka-compr.el (jka-compr-insert-file-contents): Use file-missing to detect whether the file is missing. * lisp/url/url-handlers.el (url-copy-file): Signal file-already-exists if appropriate. * src/fileio.c (syms_of_fileio): Define file-missing. 2016-10-18 Paul Eggert <eggert@cs.ucla.edu>
2016-10-21 20:04:02 +00:00
(signal 'file-missing
(cons "Opening input file"
(nthcdr 2 error-code))))
;; If the uncompression program can't be found,
;; signal that as a non-file error
;; so that find-file-noselect-1 won't handle it.
New error file-missing This fixes a recently-introduced bug in delete-directory, where the code assumes the C locale when determining whether a file-error corresponds to a missing file (Bug#24714). * doc/lispref/errors.texi (Standard Errors): * doc/lispref/files.texi (Changing Files): * etc/NEWS: Document this. * doc/lispref/loading.texi (How Programs Do Loading): Say "a file-error" rather than "the error file-error" since it might be a file-missing now. * lisp/emacs-lisp/bytecomp.el (byte-compile-file): * lisp/epa-file.el (epa-file--find-file-not-found-function): (epa-file-insert-file-contents, epa-file-write-region): * lisp/ffap.el (find-file-at-point, dired-at-point): * lisp/jka-compr.el (jka-compr-insert-file-contents) (jka-compr-insert-file-contents): * lisp/net/ange-ftp.el (ange-ftp-barf-if-not-directory) (ange-ftp-insert-file-contents, ange-ftp-copy-file-internal): * lisp/progmodes/etags.el (visit-tags-table): * lisp/url/url-handlers.el (url-copy-file): * src/fileio.c (report_file_errno): Signal file-missing if appropriate. * lisp/epa-file.el (epa-file-insert-file-contents): * lisp/jka-compr.el (jka-compr-insert-file-contents): Don't assume file-error is a leaf in the error hierarchy. * lisp/files.el (files--force): * lisp/gnus/nnmaildir.el (nnmaildir--enoent-p): * lisp/jka-compr.el (jka-compr-insert-file-contents): Use file-missing to detect whether the file is missing. * lisp/url/url-handlers.el (url-copy-file): Signal file-already-exists if appropriate. * src/fileio.c (syms_of_fileio): Define file-missing. 2016-10-18 Paul Eggert <eggert@cs.ucla.edu>
2016-10-21 20:04:02 +00:00
(if (and (memq 'file-error (get (car error-code)
'error-conditions))
(equal (cadr error-code) "Searching for program"))
(error "Uncompression program `%s' not found"
(nth 3 error-code)))
(signal (car error-code) (cdr error-code))))))
(and
local-copy
(file-exists-p local-copy)
(delete-file local-copy)))
(unless notfound
(decode-coding-inserted-region
(point) (+ (point) size)
(jka-compr-byte-compiler-base-file-name file)
visit beg end replace))
(and
visit
(progn
(unlock-buffer)
(setq buffer-file-name filename)
(setq jka-compr-really-do-compress t)
(set-visited-file-modtime)))
(and
uncompress-message
jka-compr-verbose
(message "%s %s...done" uncompress-message base-name))
(and
visit
notfound
New error file-missing This fixes a recently-introduced bug in delete-directory, where the code assumes the C locale when determining whether a file-error corresponds to a missing file (Bug#24714). * doc/lispref/errors.texi (Standard Errors): * doc/lispref/files.texi (Changing Files): * etc/NEWS: Document this. * doc/lispref/loading.texi (How Programs Do Loading): Say "a file-error" rather than "the error file-error" since it might be a file-missing now. * lisp/emacs-lisp/bytecomp.el (byte-compile-file): * lisp/epa-file.el (epa-file--find-file-not-found-function): (epa-file-insert-file-contents, epa-file-write-region): * lisp/ffap.el (find-file-at-point, dired-at-point): * lisp/jka-compr.el (jka-compr-insert-file-contents) (jka-compr-insert-file-contents): * lisp/net/ange-ftp.el (ange-ftp-barf-if-not-directory) (ange-ftp-insert-file-contents, ange-ftp-copy-file-internal): * lisp/progmodes/etags.el (visit-tags-table): * lisp/url/url-handlers.el (url-copy-file): * src/fileio.c (report_file_errno): Signal file-missing if appropriate. * lisp/epa-file.el (epa-file-insert-file-contents): * lisp/jka-compr.el (jka-compr-insert-file-contents): Don't assume file-error is a leaf in the error hierarchy. * lisp/files.el (files--force): * lisp/gnus/nnmaildir.el (nnmaildir--enoent-p): * lisp/jka-compr.el (jka-compr-insert-file-contents): Use file-missing to detect whether the file is missing. * lisp/url/url-handlers.el (url-copy-file): Signal file-already-exists if appropriate. * src/fileio.c (syms_of_fileio): Define file-missing. 2016-10-18 Paul Eggert <eggert@cs.ucla.edu>
2016-10-21 20:04:02 +00:00
(signal 'file-missing
(cons "Opening input file" (nth 2 notfound))))
;; This is done in insert-file-contents after we return.
;; That is a little weird, but better to go along with it now
;; than to change it now.
;; ;; Run the functions that insert-file-contents would.
;; (let ((p after-insert-file-functions)
;; (insval size))
;; (while p
;; (setq insval (funcall (car p) size))
;; (if insval
;; (progn
;; (or (integerp insval)
;; (signal 'wrong-type-argument
;; (list 'integerp insval)))
;; (setq size insval)))
;; (setq p (cdr p))))
(or (jka-compr-info-compress-program info)
(message "You can't save this buffer because compression program is not defined"))
(list filename size)))))
1994-02-18 22:50:05 +00:00
(defun jka-compr-file-local-copy (file)
(let* ((filename (expand-file-name file))
(info (jka-compr-get-compression-info filename)))
(if info
(let ((uncompress-message (jka-compr-info-uncompress-message info))
(uncompress-program (jka-compr-info-uncompress-program info))
(uncompress-args (jka-compr-info-uncompress-args info))
(base-name (file-name-nondirectory filename))
(local-copy
(jka-compr-run-real-handler 'file-local-copy (list filename)))
1994-02-18 22:50:05 +00:00
(temp-file (jka-compr-make-temp-name t))
(temp-buffer (get-buffer-create " *jka-compr-flc-temp*"))
1994-02-18 22:50:05 +00:00
local-file)
(setq local-file (or local-copy filename))
(unwind-protect
(with-current-buffer temp-buffer
2003-02-04 12:29:42 +00:00
1994-02-18 22:50:05 +00:00
(and
uncompress-message
jka-compr-verbose
1994-02-18 22:50:05 +00:00
(message "%s %s..." uncompress-message base-name))
2003-02-04 12:29:42 +00:00
1997-07-22 03:45:44 +00:00
;; Here we must read the output of uncompress program
;; and write it to TEMP-FILE without any code
;; conversion. An appropriate code conversion (if
;; necessary) is done by the later I/O operation
;; (e.g. load).
(let ((coding-system-for-read 'no-conversion)
(coding-system-for-write 'no-conversion))
(jka-compr-call-process uncompress-program
(concat uncompress-message
" " base-name)
local-file
t
nil
uncompress-args)
(and
uncompress-message
jka-compr-verbose
1997-07-22 03:45:44 +00:00
(message "%s %s...done" uncompress-message base-name))
(write-region
(point-min) (point-max) temp-file nil 'dont)))
1994-02-18 22:50:05 +00:00
(and
local-copy
(file-exists-p local-copy)
(delete-file local-copy))
(kill-buffer temp-buffer))
temp-file)
2003-02-04 12:29:42 +00:00
(jka-compr-run-real-handler 'file-local-copy (list filename)))))
1994-02-18 22:50:05 +00:00
;; Support for loading compressed files.
2011-04-19 13:44:55 +00:00
(defun jka-compr-load (file &optional noerror nomessage _nosuffix)
1994-02-18 22:50:05 +00:00
"Documented as original."
(let* ((local-copy (jka-compr-file-local-copy file))
(load-file (or local-copy file)))
(unwind-protect
(let (inhibit-file-name-operation
inhibit-file-name-handlers)
1994-02-18 22:50:05 +00:00
(or nomessage
(message "Loading %s..." file))
(let ((load-force-doc-strings t))
(load load-file noerror t t))
1994-02-18 22:50:05 +00:00
(or nomessage
2000-01-30 17:52:18 +00:00
(message "Loading %s...done." file))
;; Fix up the load history to point at the right library.
(let ((l (or (assoc load-file load-history)
;; On MS-Windows, if load-file is in
;; temporary-file-directory, it will look like
;; "c:/DOCUME~1/USER/LOCALS~1/foo", whereas
;; readevalloop will record its truename in
;; load-history. Therefore try truename if the
;; original name is not in load-history.
(assoc (file-truename load-file) load-history))))
2000-01-30 17:52:18 +00:00
;; Remove .gz and .elc?.
(while (file-name-extension file)
(setq file (file-name-sans-extension file)))
(setcar l file)))
1994-02-18 22:50:05 +00:00
(delete-file local-copy))
1994-02-18 22:50:05 +00:00
t))
(defun jka-compr-byte-compiler-base-file-name (file)
(let ((info (jka-compr-get-compression-info file)))
(if (and info (jka-compr-info-strip-extension info))
(save-match-data
(substring file 0 (string-match (jka-compr-info-regexp info) file)))
file)))
(put 'write-region 'jka-compr 'jka-compr-write-region)
(put 'insert-file-contents 'jka-compr 'jka-compr-insert-file-contents)
(put 'file-local-copy 'jka-compr 'jka-compr-file-local-copy)
(put 'load 'jka-compr 'jka-compr-load)
(put 'byte-compiler-base-file-name 'jka-compr
'jka-compr-byte-compiler-base-file-name)
1994-02-18 22:50:05 +00:00
;;;###autoload
(defvar jka-compr-inhibit nil
"Non-nil means inhibit automatic uncompression temporarily.
Lisp programs can bind this to t to do that.
It is not recommended to set this variable permanently to anything but nil.")
;;;###autoload
1994-02-18 22:50:05 +00:00
(defun jka-compr-handler (operation &rest args)
(save-match-data
(let ((jka-op (get operation 'jka-compr)))
(if (and jka-op (not jka-compr-inhibit))
(apply jka-op args)
(jka-compr-run-real-handler operation args)))))
1994-02-18 22:50:05 +00:00
;; If we are given an operation that we don't handle,
;; call the Emacs primitive for that operation,
;; and manipulate the inhibit variables
;; to prevent the primitive from calling our handler again.
(defun jka-compr-run-real-handler (operation args)
(let ((inhibit-file-name-handlers
(cons 'jka-compr-handler
(and (eq inhibit-file-name-operation operation)
inhibit-file-name-handlers)))
(inhibit-file-name-operation operation))
(apply operation args)))
;;;###autoload
1994-02-18 22:50:05 +00:00
(defun jka-compr-uninstall ()
"Uninstall jka-compr.
This removes the entries in `file-name-handler-alist' and `auto-mode-alist'
and `inhibit-local-variables-suffixes' that were added
by `jka-compr-installed'."
;; Delete from inhibit-local-variables-suffixes what jka-compr-install added.
(mapc
(function (lambda (x)
(and (jka-compr-info-strip-extension x)
(setq inhibit-local-variables-suffixes
(delete (jka-compr-info-regexp x)
inhibit-local-variables-suffixes)))))
jka-compr-compression-info-list--internal)
1994-02-18 22:50:05 +00:00
(let* ((fnha (cons nil file-name-handler-alist))
(last fnha))
(while (cdr last)
(if (eq (cdr (car (cdr last))) 'jka-compr-handler)
(setcdr last (cdr (cdr last)))
(setq last (cdr last))))
(setq file-name-handler-alist (cdr fnha)))
(let* ((ama (cons nil auto-mode-alist))
(last ama)
entry)
(while (cdr last)
(setq entry (car (cdr last)))
(if (or (member entry jka-compr-mode-alist-additions--internal)
(and (consp (cdr entry))
(eq (nth 2 entry) 'jka-compr)))
1994-02-18 22:50:05 +00:00
(setcdr last (cdr (cdr last)))
(setq last (cdr last))))
2003-02-04 12:29:42 +00:00
(setq auto-mode-alist (cdr ama)))
(while jka-compr-added-to-file-coding-system-alist
(setq file-coding-system-alist
(delq (car (member (pop jka-compr-added-to-file-coding-system-alist)
file-coding-system-alist))
file-coding-system-alist)))
;; Remove the suffixes that were added by jka-compr.
(dolist (suff jka-compr-load-suffixes--internal)
(setq load-file-rep-suffixes (delete suff load-file-rep-suffixes)))
(setq jka-compr-compression-info-list--internal nil
jka-compr-mode-alist-additions--internal nil
jka-compr-load-suffixes--internal nil))
1994-02-18 22:50:05 +00:00
(provide 'jka-compr)
;;; jka-compr.el ends here