Mercurial > emacs
annotate lisp/jka-compr.el @ 82988:f82e3a6f5ccb
A few more bugfixes and new features.
(Sigh.) I obviously need to remember to separate individual changes
to multiple commits.
src/emacsclient.c: Improved error handling.
(decode_options): Changed frame option (again) from -f to -t.
(print_help_and_exit): Ditto.
(copy_from_to): Check EINTR after write, not EAGAIN. Removed SIGIO hack.
(pty_conversation): Handle errors transmitted through the socket.
Handle pty errors by not reading from it anymore.
(main): Restore correct errno after socket_status failed. Send -tty
on -t, not -pty.
lisp/server.el (server-process-filter): Watch -tty, not -pty.
Use make-frame-on-tty instead of make-terminal-frame.
Don't set newframe to t if make-frame-on-tty failed.
Don't delete frames here. Print correct message when there are no
files to edit, but a new frame was requested.
(server-sentinel): Delete the frame after the process.
(server-handle-delete-frame): New function for delete-frame-functions.
(server-start): Add server-handle-delete-frame to delete-frame-functions.
(server-buffer-done): Don't delete frames here.
src/alloc.c (mark_ttys): Add prototype.
(Fgarbage_collect): Call mark_ttys.
src/emacs.c: (shut_down_emacs): Don't flush stdout before
reset_sys_modes().
src/process.c (add_keyboard_wait_descriptor_called_flag): Removed.
(add_keyboard_wait_descriptor): Removed stdin hack.
src/sysdep.c: Unconditionally include sysselect.h.
(old_fcntl_flags): Changed to an array.
(init_sigio, reset_sigio): Use it.
(narrow_foreground_group, widen_foreground_group): Use setpgid, not
setpgrp.
(old_fcntl_owner): Changed to an array.
(init_sys_modes, reset_sys_modes): Use it. Fix fsync() and reset_sigio() calls.
src/term.c (Qframe_tty_name, Qframe_tty_type): New variables.
(syms_of_term): Initialize them.
(Fframe_tty_name, Fframe_tty_type): New functions.
(term_init): Call add_keyboard_wait_descriptor().
(Fdelete_tty): New function.
(delete_tty): Call delete_keyboard_wait_descriptor().
(get_current_tty): Removed.
(mark_ttys): New function.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-28
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 31 Dec 2003 05:09:29 +0000 |
parents | b9463f85fb04 |
children | 79093b308520 |
rev | line source |
---|---|
13337 | 1 ;;; jka-compr.el --- reading/writing/loading compressed files |
2 | |
49385
08f632f2bdae
(jka-compr-insert-file-contents): Fix typo in last change.
Andreas Schwab <schwab@suse.de>
parents:
49377
diff
changeset
|
3 ;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2003 Free Software Foundation, Inc. |
6002 | 4 |
5 ;; Author: jka@ece.cmu.edu (Jay K. Adams) | |
17976 | 6 ;; Maintainer: FSF |
6002 | 7 ;; Keywords: data |
8 | |
13514
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
9 ;; This file is part of GNU Emacs. |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
10 |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
12 ;; it under the terms of the GNU General Public License as published by |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
13 ;; the Free Software Foundation; either version 2, or (at your option) |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
14 ;; any later version. |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
15 |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful, |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
19 ;; GNU General Public License for more details. |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
20 |
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
13514
0e46e8075a1d
(auto-compression-mode): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
13337
diff
changeset
|
25 |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
34732
diff
changeset
|
26 ;;; Commentary: |
6002 | 27 |
14169 | 28 ;; This package implements low-level support for reading, writing, |
29 ;; and loading compressed files. It hooks into the low-level file | |
30 ;; I/O functions (including write-region and insert-file-contents) so | |
31 ;; that they automatically compress or uncompress a file if the file | |
32 ;; appears to need it (based on the extension of the file name). | |
33 ;; Packages like Rmail, VM, GNUS, and Info should be able to work | |
34 ;; with compressed files without modification. | |
6002 | 35 |
36 | |
14169 | 37 ;; INSTRUCTIONS: |
38 ;; | |
32497 | 39 ;; To use jka-compr, invoke the command `auto-compression-mode' (which |
40 ;; see), or customize the variable of the same name. Its operation | |
41 ;; should be transparent to the user (except for messages appearing when | |
42 ;; a file is being compressed or uncompressed). | |
14169 | 43 ;; |
44 ;; The variable, jka-compr-compression-info-list can be used to | |
45 ;; customize jka-compr to work with other compression programs. | |
46 ;; The default value of this variable allows jka-compr to work with | |
47 ;; Unix compress and gzip. | |
48 ;; | |
49 ;; If you are concerned about the stderr output of gzip and other | |
50 ;; compression/decompression programs showing up in your buffers, you | |
51 ;; should set the discard-error flag in the compression-info-list. | |
52 ;; This will cause the stderr of all programs to be discarded. | |
53 ;; However, it also causes emacs to call compression/uncompression | |
54 ;; programs through a shell (which is specified by jka-compr-shell). | |
55 ;; This may be a drag if, on your system, starting up a shell is | |
56 ;; slow. | |
57 ;; | |
58 ;; If you don't want messages about compressing and decompressing | |
59 ;; to show up in the echo area, you can set the compress-name and | |
60 ;; decompress-name fields of the jka-compr-compression-info-list to | |
61 ;; nil. | |
6002 | 62 |
63 | |
14169 | 64 ;; APPLICATION NOTES: |
65 ;; | |
66 ;; crypt++ | |
45720 | 67 ;; jka-compr can coexist with crypt++ if you take all the decompression |
14169 | 68 ;; entries out of the crypt-encoding-list. Clearly problems will arise if |
69 ;; you have two programs trying to compress/decompress files. jka-compr | |
70 ;; will not "work with" crypt++ in the following sense: you won't be able to | |
71 ;; decode encrypted compressed files--that is, files that have been | |
72 ;; compressed then encrypted (in that order). Theoretically, crypt++ and | |
73 ;; jka-compr could properly handle a file that has been encrypted then | |
74 ;; compressed, but there is little point in trying to compress an encrypted | |
75 ;; file. | |
76 ;; | |
6002 | 77 |
78 | |
14169 | 79 ;; ACKNOWLEDGMENTS |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
80 ;; |
14169 | 81 ;; jka-compr is a V19 adaptation of jka-compr for V18 of Emacs. Many people |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
82 ;; have made helpful suggestions, reported bugs, and even fixed bugs in |
14169 | 83 ;; jka-compr. I recall the following people as being particularly helpful. |
84 ;; | |
85 ;; Jean-loup Gailly | |
86 ;; David Hughes | |
87 ;; Richard Pieri | |
88 ;; Daniel Quinlan | |
89 ;; Chris P. Ross | |
90 ;; Rick Sladkey | |
91 ;; | |
92 ;; Andy Norman's ange-ftp was the inspiration for the original jka-compr for | |
93 ;; Version 18 of Emacs. | |
94 ;; | |
95 ;; After I had made progress on the original jka-compr for V18, I learned of a | |
96 ;; package written by Kazushi Jam Marukawa, called jam-zcat, that did exactly | |
97 ;; what I was trying to do. I looked over the jam-zcat source code and | |
98 ;; probably got some ideas from it. | |
99 ;; | |
6002 | 100 |
101 ;;; Code: | |
102 | |
17411
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
103 (defgroup compression nil |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
104 "Data compression utilities" |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
105 :group 'data) |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
106 |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
107 (defgroup jka-compr nil |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
108 "jka-compr customization" |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
109 :group 'compression) |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
110 |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
111 |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
112 (defcustom jka-compr-shell "sh" |
6002 | 113 "*Shell to be used for calling compression programs. |
114 The value of this variable only matters if you want to discard the | |
115 stderr of a compression/decompression program (see the documentation | |
17411
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
116 for `jka-compr-compression-info-list')." |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
117 :type 'string |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
118 :group 'jka-compr) |
6002 | 119 |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
120 (defvar jka-compr-use-shell |
21633
185e8e424ee9
(jka-compr-use-shell) [ms-dos, windows-nt]: Do not use a shell.
Richard M. Stallman <rms@gnu.org>
parents:
20893
diff
changeset
|
121 (not (memq system-type '(ms-dos windows-nt)))) |
6002 | 122 |
123 ;;; I have this defined so that .Z files are assumed to be in unix | |
20873
d2b5d0e2607e
(jka-compr-compression-info-list): Handle bzip.
Richard M. Stallman <rms@gnu.org>
parents:
20497
diff
changeset
|
124 ;;; compress format; and .gz files, in gzip format, and .bz2 files in bzip fmt. |
17411
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
125 (defcustom jka-compr-compression-info-list |
6002 | 126 ;;[regexp |
7616
b0098553bafe
(jka-compr-compression-info-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7066
diff
changeset
|
127 ;; compr-message compr-prog compr-args |
b0098553bafe
(jka-compr-compression-info-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7066
diff
changeset
|
128 ;; uncomp-message uncomp-prog uncomp-args |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
129 ;; can-append auto-mode-flag strip-extension-flag file-magic-bytes] |
8774
ade4b542a74c
(jka-compr-compression-info-list): Expand regular
Richard M. Stallman <rms@gnu.org>
parents:
8593
diff
changeset
|
130 '(["\\.Z\\(~\\|\\.~[0-9]+~\\)?\\'" |
6002 | 131 "compressing" "compress" ("-c") |
132 "uncompressing" "uncompress" ("-c") | |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
133 nil t "\037\235"] |
23348
051cdf587a57
(jka-compr-compression-info-list): Remove "-c" from
Dave Love <fx@gnu.org>
parents:
22746
diff
changeset
|
134 ;; Formerly, these had an additional arg "-c", but that fails with |
051cdf587a57
(jka-compr-compression-info-list): Remove "-c" from
Dave Love <fx@gnu.org>
parents:
22746
diff
changeset
|
135 ;; "Version 0.1pl2, 29-Aug-97." (RedHat 5.1 GNU/Linux) and |
051cdf587a57
(jka-compr-compression-info-list): Remove "-c" from
Dave Love <fx@gnu.org>
parents:
22746
diff
changeset
|
136 ;; "Version 0.9.0b, 9-Sept-98". |
20873
d2b5d0e2607e
(jka-compr-compression-info-list): Handle bzip.
Richard M. Stallman <rms@gnu.org>
parents:
20497
diff
changeset
|
137 ["\\.bz2\\'" |
23348
051cdf587a57
(jka-compr-compression-info-list): Remove "-c" from
Dave Love <fx@gnu.org>
parents:
22746
diff
changeset
|
138 "bzip2ing" "bzip2" nil |
051cdf587a57
(jka-compr-compression-info-list): Remove "-c" from
Dave Love <fx@gnu.org>
parents:
22746
diff
changeset
|
139 "bunzip2ing" "bzip2" ("-d") |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
140 nil t "BZh"] |
9493
0160fca3dee1
(jka-compr-mode-compression-info-list): Add .tgz extension.
Richard M. Stallman <rms@gnu.org>
parents:
9084
diff
changeset
|
141 ["\\.tgz\\'" |
0160fca3dee1
(jka-compr-mode-compression-info-list): Add .tgz extension.
Richard M. Stallman <rms@gnu.org>
parents:
9084
diff
changeset
|
142 "zipping" "gzip" ("-c" "-q") |
0160fca3dee1
(jka-compr-mode-compression-info-list): Add .tgz extension.
Richard M. Stallman <rms@gnu.org>
parents:
9084
diff
changeset
|
143 "unzipping" "gzip" ("-c" "-q" "-d") |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
144 t nil "\037\213"] |
28484
10b2b22a5b89
(jka-compr-compression-info-list): Add `.z'
Gerd Moellmann <gerd@gnu.org>
parents:
27512
diff
changeset
|
145 ["\\.g?z\\(~\\|\\.~[0-9]+~\\)?\\'" |
6002 | 146 "zipping" "gzip" ("-c" "-q") |
147 "unzipping" "gzip" ("-c" "-q" "-d") | |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
148 t t "\037\213"]) |
6002 | 149 |
150 "List of vectors that describe available compression techniques. | |
151 Each element, which describes a compression technique, is a vector of | |
7616
b0098553bafe
(jka-compr-compression-info-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7066
diff
changeset
|
152 the form [REGEXP COMPRESS-MSG COMPRESS-PROGRAM COMPRESS-ARGS |
b0098553bafe
(jka-compr-compression-info-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7066
diff
changeset
|
153 UNCOMPRESS-MSG UNCOMPRESS-PROGRAM UNCOMPRESS-ARGS |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
154 APPEND-FLAG STRIP-EXTENSION-FLAG FILE-MAGIC-CHARS], where: |
6002 | 155 |
156 regexp is a regexp that matches filenames that are | |
157 compressed with this format | |
158 | |
7616
b0098553bafe
(jka-compr-compression-info-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7066
diff
changeset
|
159 compress-msg is the message to issue to the user when doing this |
b0098553bafe
(jka-compr-compression-info-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7066
diff
changeset
|
160 type of compression (nil means no message) |
b0098553bafe
(jka-compr-compression-info-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7066
diff
changeset
|
161 |
6002 | 162 compress-program is a program that performs this compression |
163 | |
164 compress-args is a list of args to pass to the compress program | |
165 | |
7616
b0098553bafe
(jka-compr-compression-info-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7066
diff
changeset
|
166 uncompress-msg is the message to issue to the user when doing this |
b0098553bafe
(jka-compr-compression-info-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7066
diff
changeset
|
167 type of uncompression (nil means no message) |
6002 | 168 |
169 uncompress-program is a program that performs this compression | |
170 | |
171 uncompress-args is a list of args to pass to the uncompress program | |
172 | |
173 append-flag is non-nil if this compression technique can be | |
174 appended | |
175 | |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
176 strip-extension-flag non-nil means strip the regexp from file names |
6002 | 177 before attempting to set the mode. |
178 | |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
179 file-magic-chars is a string of characters that you would find |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
180 at the beginning of a file compressed in this way. |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
181 |
7976
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
182 Because of the way `call-process' is defined, discarding the stderr output of |
6002 | 183 a program adds the overhead of starting a shell each time the program is |
17411
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
184 invoked." |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
185 :type '(repeat (vector regexp |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
186 (choice :tag "Compress Message" |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
187 (string :format "%v") |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
188 (const :tag "No Message" nil)) |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
189 (string :tag "Compress Program") |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
190 (repeat :tag "Compress Arguments" string) |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
191 (choice :tag "Uncompress Message" |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
192 (string :format "%v") |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
193 (const :tag "No Message" nil)) |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
194 (string :tag "Uncompress Program") |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
195 (repeat :tag "Uncompress Arguments" string) |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
196 (boolean :tag "Append") |
34332
8a132d69a4df
(jka-compr-compression-info-list): Fix :type.
Dave Love <fx@gnu.org>
parents:
33190
diff
changeset
|
197 (boolean :tag "Strip Extension") |
8a132d69a4df
(jka-compr-compression-info-list): Fix :type.
Dave Love <fx@gnu.org>
parents:
33190
diff
changeset
|
198 (string :tag "Magic Bytes"))) |
17411
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
199 :group 'jka-compr) |
6002 | 200 |
40782
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
201 (defcustom jka-compr-mode-alist-additions |
9493
0160fca3dee1
(jka-compr-mode-compression-info-list): Add .tgz extension.
Richard M. Stallman <rms@gnu.org>
parents:
9084
diff
changeset
|
202 (list (cons "\\.tgz\\'" 'tar-mode)) |
40782
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
203 "A list of pairs to add to `auto-mode-alist' when jka-compr is installed." |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
204 :type '(repeat (cons string symbol)) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
205 :group 'jka-compr) |
19004
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
206 |
40782
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
207 (defcustom jka-compr-load-suffixes '(".gz") |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
208 "List of suffixes to try when loading files." |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
209 :type '(repeat string) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
210 :group 'jka-compr) |
39829
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
211 |
19004
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
212 ;; List of all the elements we actually added to file-coding-system-alist. |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
213 (defvar jka-compr-added-to-file-coding-system-alist nil) |
6002 | 214 |
7617
edc853e14f7b
(jka-compr-op-table, jka-compr-file-name-handler-entry): Move defvars.
Richard M. Stallman <rms@gnu.org>
parents:
7616
diff
changeset
|
215 (defvar jka-compr-file-name-handler-entry |
edc853e14f7b
(jka-compr-op-table, jka-compr-file-name-handler-entry): Move defvars.
Richard M. Stallman <rms@gnu.org>
parents:
7616
diff
changeset
|
216 nil |
edc853e14f7b
(jka-compr-op-table, jka-compr-file-name-handler-entry): Move defvars.
Richard M. Stallman <rms@gnu.org>
parents:
7616
diff
changeset
|
217 "The entry in `file-name-handler-alist' used by the jka-compr I/O functions.") |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
218 |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
219 (defvar jka-compr-really-do-compress nil |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
220 "Non-nil in a buffer whose visited file was uncompressed on visiting it.") |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
221 (put 'jka-compr-really-do-compress 'permanent-local t) |
7617
edc853e14f7b
(jka-compr-op-table, jka-compr-file-name-handler-entry): Move defvars.
Richard M. Stallman <rms@gnu.org>
parents:
7616
diff
changeset
|
222 |
15083 | 223 ;;; Functions for accessing the return value of jka-compr-get-compression-info |
6002 | 224 (defun jka-compr-info-regexp (info) (aref info 0)) |
225 (defun jka-compr-info-compress-message (info) (aref info 1)) | |
226 (defun jka-compr-info-compress-program (info) (aref info 2)) | |
227 (defun jka-compr-info-compress-args (info) (aref info 3)) | |
228 (defun jka-compr-info-uncompress-message (info) (aref info 4)) | |
229 (defun jka-compr-info-uncompress-program (info) (aref info 5)) | |
230 (defun jka-compr-info-uncompress-args (info) (aref info 6)) | |
231 (defun jka-compr-info-can-append (info) (aref info 7)) | |
232 (defun jka-compr-info-strip-extension (info) (aref info 8)) | |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
233 (defun jka-compr-info-file-magic-bytes (info) (aref info 9)) |
6002 | 234 |
235 | |
236 (defun jka-compr-get-compression-info (filename) | |
237 "Return information about the compression scheme of FILENAME. | |
238 The determination as to which compression scheme, if any, to use is | |
7066 | 239 based on the filename itself and `jka-compr-compression-info-list'." |
6002 | 240 (catch 'compression-info |
241 (let ((case-fold-search nil)) | |
242 (mapcar | |
243 (function (lambda (x) | |
244 (and (string-match (jka-compr-info-regexp x) filename) | |
245 (throw 'compression-info x)))) | |
246 jka-compr-compression-info-list) | |
247 nil))) | |
248 | |
249 | |
250 (put 'compression-error 'error-conditions '(compression-error file-error error)) | |
251 | |
252 | |
11635
b56f6afa16ec
(jka-compr-write-region): Handle the append
Richard M. Stallman <rms@gnu.org>
parents:
11621
diff
changeset
|
253 (defvar jka-compr-acceptable-retval-list '(0 2 141)) |
6002 | 254 |
255 | |
256 (defun jka-compr-error (prog args infile message &optional errfile) | |
257 | |
258 (let ((errbuf (get-buffer-create " *jka-compr-error*")) | |
259 (curbuf (current-buffer))) | |
16940
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
260 (with-current-buffer errbuf |
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
261 (widen) (erase-buffer) |
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
262 (insert (format "Error while executing \"%s %s < %s\"\n\n" |
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
263 prog |
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
264 (mapconcat 'identity args " ") |
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
265 infile)) |
6002 | 266 |
16940
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
267 (and errfile |
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
268 (insert-file-contents errfile))) |
6002 | 269 (display-buffer errbuf)) |
270 | |
16940
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
271 (signal 'compression-error |
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
272 (list "Opening input file" (format "error %s" message) infile))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
273 |
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
274 |
40782
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
275 (defcustom jka-compr-dd-program "/bin/dd" |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
276 "How to invoke `dd'." |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
277 :type 'string |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
278 :group 'jka-compr) |
6002 | 279 |
280 | |
6041
649926e9c1a8
(jka-compr-partial-uncompress): Make dd give you
Richard M. Stallman <rms@gnu.org>
parents:
6002
diff
changeset
|
281 (defvar jka-compr-dd-blocksize 256) |
6002 | 282 |
283 | |
284 (defun jka-compr-partial-uncompress (prog message args infile beg len) | |
285 "Call program PROG with ARGS args taking input from INFILE. | |
286 Fourth and fifth args, BEG and LEN, specify which part of the output | |
8065
31eb7a0e2763
(jka-compr-partial-uncompress): Handle the case where
Richard M. Stallman <rms@gnu.org>
parents:
7976
diff
changeset
|
287 to keep: LEN chars starting BEG chars from the beginning." |
40782
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
288 (let ((start (point)) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
289 (prefix beg)) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
290 (if (and jka-compr-use-shell jka-compr-dd-program) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
291 ;; Put the uncompression output through dd |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
292 ;; to discard the part we don't want. |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
293 (let ((skip (/ beg jka-compr-dd-blocksize)) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
294 (err-file (jka-compr-make-temp-name)) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
295 count) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
296 ;; Update PREFIX based on the text that we won't read in. |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
297 (setq prefix (- beg (* skip jka-compr-dd-blocksize)) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
298 count (and len (1+ (/ (+ len prefix) jka-compr-dd-blocksize)))) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
299 (unwind-protect |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
300 (or (memq (call-process |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
301 jka-compr-shell infile t nil "-c" |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
302 (format |
42231
054cf5ce349b
(jka-compr-partial-uncompress): Use null-device instead of a literal
Eli Zaretskii <eliz@gnu.org>
parents:
41102
diff
changeset
|
303 "%s %s 2> %s | %s bs=%d skip=%d %s 2> %s" |
40782
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
304 prog |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
305 (mapconcat 'identity args " ") |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
306 err-file |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
307 jka-compr-dd-program |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
308 jka-compr-dd-blocksize |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
309 skip |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
310 ;; dd seems to be unreliable about |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
311 ;; providing the last block. So, always |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
312 ;; read one more than you think you need. |
42231
054cf5ce349b
(jka-compr-partial-uncompress): Use null-device instead of a literal
Eli Zaretskii <eliz@gnu.org>
parents:
41102
diff
changeset
|
313 (if count (format "count=%d" (1+ count)) "") |
054cf5ce349b
(jka-compr-partial-uncompress): Use null-device instead of a literal
Eli Zaretskii <eliz@gnu.org>
parents:
41102
diff
changeset
|
314 null-device)) |
40782
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
315 jka-compr-acceptable-retval-list) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
316 (jka-compr-error prog args infile message err-file)) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
317 (jka-compr-delete-temp-file err-file))) |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
318 ;; Run the uncompression program directly. |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
319 ;; We get the whole file and must delete what we don't want. |
3a4d800ced48
(jka-compr-partial-uncompress): Support an alternative of not using dd.
Richard M. Stallman <rms@gnu.org>
parents:
39829
diff
changeset
|
320 (jka-compr-call-process prog message infile t nil args)) |
6002 | 321 |
8065
31eb7a0e2763
(jka-compr-partial-uncompress): Handle the case where
Richard M. Stallman <rms@gnu.org>
parents:
7976
diff
changeset
|
322 ;; Delete the stuff after what we want, if there is any. |
6002 | 323 (and |
6041
649926e9c1a8
(jka-compr-partial-uncompress): Make dd give you
Richard M. Stallman <rms@gnu.org>
parents:
6002
diff
changeset
|
324 len |
8065
31eb7a0e2763
(jka-compr-partial-uncompress): Handle the case where
Richard M. Stallman <rms@gnu.org>
parents:
7976
diff
changeset
|
325 (< (+ start prefix len) (point)) |
6041
649926e9c1a8
(jka-compr-partial-uncompress): Make dd give you
Richard M. Stallman <rms@gnu.org>
parents:
6002
diff
changeset
|
326 (delete-region (+ start prefix len) (point))) |
6002 | 327 |
8065
31eb7a0e2763
(jka-compr-partial-uncompress): Handle the case where
Richard M. Stallman <rms@gnu.org>
parents:
7976
diff
changeset
|
328 ;; Delete the stuff before what we want. |
6002 | 329 (delete-region start (+ start prefix)))) |
330 | |
331 | |
332 (defun jka-compr-call-process (prog message infile output temp args) | |
333 (if jka-compr-use-shell | |
334 | |
18879
8b226efb9a8b
(jka-compr-insert-file-contents): Bind coding-system-for-read.
Richard M. Stallman <rms@gnu.org>
parents:
17976
diff
changeset
|
335 (let ((err-file (jka-compr-make-temp-name)) |
18906 | 336 (coding-system-for-read (or coding-system-for-read 'undecided)) |
22360
09dbe38a603f
(jka-compr-write-region): Ensure
Karl Heuer <kwzh@gnu.org>
parents:
22194
diff
changeset
|
337 (coding-system-for-write 'no-conversion)) |
18879
8b226efb9a8b
(jka-compr-insert-file-contents): Bind coding-system-for-read.
Richard M. Stallman <rms@gnu.org>
parents:
17976
diff
changeset
|
338 |
6002 | 339 (unwind-protect |
340 | |
341 (or (memq | |
342 (call-process jka-compr-shell infile | |
343 (if (stringp output) nil output) | |
344 nil | |
345 "-c" | |
346 (format "%s %s 2> %s %s" | |
347 prog | |
348 (mapconcat 'identity args " ") | |
349 err-file | |
350 (if (stringp output) | |
351 (concat "> " output) | |
352 ""))) | |
353 jka-compr-acceptable-retval-list) | |
354 | |
355 (jka-compr-error prog args infile message err-file)) | |
356 | |
357 (jka-compr-delete-temp-file err-file))) | |
358 | |
359 (or (zerop | |
360 (apply 'call-process | |
361 prog | |
362 infile | |
363 (if (stringp output) temp output) | |
364 nil | |
365 args)) | |
366 (jka-compr-error prog args infile message)) | |
367 | |
368 (and (stringp output) | |
16940
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
369 (with-current-buffer temp |
6002 | 370 (write-region (point-min) (point-max) output) |
16940
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
371 (erase-buffer))))) |
6002 | 372 |
373 | |
374 ;;; Support for temp files. Much of this was inspired if not lifted | |
375 ;;; from ange-ftp. | |
376 | |
17411
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
377 (defcustom jka-compr-temp-name-template |
22100
eb3f36cc775f
(jka-compr-temp-name-template): Use temporary-file-directory.
Richard M. Stallman <rms@gnu.org>
parents:
22090
diff
changeset
|
378 (expand-file-name "jka-com" temporary-file-directory) |
17441
41a10d128e3b
(jka-compr-temp-name-template): Fix editing error.
Richard M. Stallman <rms@gnu.org>
parents:
17411
diff
changeset
|
379 "Prefix added to all temp files created by jka-compr. |
17411
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
380 There should be no more than seven characters after the final `/'." |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
381 :type 'string |
f0ff96a35eb8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16940
diff
changeset
|
382 :group 'jka-compr) |
6002 | 383 |
384 (defun jka-compr-make-temp-name (&optional local-copy) | |
385 "This routine will return the name of a new file." | |
26039
fb6b9c37cdc4
Use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25285
diff
changeset
|
386 (make-temp-file jka-compr-temp-name-template)) |
6002 | 387 |
26039
fb6b9c37cdc4
Use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25285
diff
changeset
|
388 (defalias 'jka-compr-delete-temp-file 'delete-file) |
6002 | 389 |
390 | |
391 (defun jka-compr-write-region (start end file &optional append visit) | |
392 (let* ((filename (expand-file-name file)) | |
393 (visit-file (if (stringp visit) (expand-file-name visit) filename)) | |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
394 (info (jka-compr-get-compression-info visit-file)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
395 (magic (and info (jka-compr-info-file-magic-bytes info)))) |
6002 | 396 |
42461
c28b5df30ea0
(jka-compr-write-region): If START = nil, use whole buf.
Richard M. Stallman <rms@gnu.org>
parents:
42231
diff
changeset
|
397 ;; If START is nil, use the whole buffer. |
c28b5df30ea0
(jka-compr-write-region): If START = nil, use whole buf.
Richard M. Stallman <rms@gnu.org>
parents:
42231
diff
changeset
|
398 (if (null start) |
c28b5df30ea0
(jka-compr-write-region): If START = nil, use whole buf.
Richard M. Stallman <rms@gnu.org>
parents:
42231
diff
changeset
|
399 (setq start 1 end (1+ (buffer-size)))) |
c28b5df30ea0
(jka-compr-write-region): If START = nil, use whole buf.
Richard M. Stallman <rms@gnu.org>
parents:
42231
diff
changeset
|
400 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
401 ;; If we uncompressed this file when visiting it, |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
402 ;; then recompress it when writing it |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
403 ;; even if the contents look compressed already. |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
404 (if (and jka-compr-really-do-compress |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
405 (eq start 1) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
406 (eq end (1+ (buffer-size)))) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
407 (setq magic nil)) |
6002 | 408 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
409 (if (and info |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
410 ;; If the contents to be written out |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
411 ;; are properly compressed already, |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
412 ;; don't try to compress them over again. |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
413 (not (and magic |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
414 (equal (if (stringp start) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
415 (substring start 0 (min (length start) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
416 (length magic))) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
417 (buffer-substring start |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
418 (min end |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
419 (+ start (length magic))))) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
420 magic)))) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
421 (let ((can-append (jka-compr-info-can-append info)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
422 (compress-program (jka-compr-info-compress-program info)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
423 (compress-message (jka-compr-info-compress-message info)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
424 (uncompress-program (jka-compr-info-uncompress-program info)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
425 (uncompress-message (jka-compr-info-uncompress-message info)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
426 (compress-args (jka-compr-info-compress-args info)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
427 (uncompress-args (jka-compr-info-uncompress-args info)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
428 (base-name (file-name-nondirectory visit-file)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
429 temp-file temp-buffer |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
430 ;; we need to leave `last-coding-system-used' set to its |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
431 ;; value after calling write-region the first time, so |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
432 ;; that `basic-save-buffer' sees the right value. |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
433 (coding-system-used last-coding-system-used)) |
6002 | 434 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
435 (setq temp-buffer (get-buffer-create " *jka-compr-wr-temp*")) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
436 (with-current-buffer temp-buffer |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
437 (widen) (erase-buffer)) |
6002 | 438 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
439 (if (and append |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
440 (not can-append) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
441 (file-exists-p filename)) |
6002 | 442 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
443 (let* ((local-copy (file-local-copy filename)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
444 (local-file (or local-copy filename))) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
445 |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
446 (setq temp-file local-file)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
447 |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
448 (setq temp-file (jka-compr-make-temp-name))) |
6002 | 449 |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
450 (and |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
451 compress-message |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
452 (message "%s %s..." compress-message base-name)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
453 |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
454 (jka-compr-run-real-handler 'write-region |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
455 (list start end temp-file t 'dont)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
456 ;; save value used by the real write-region |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
457 (setq coding-system-used last-coding-system-used) |
6002 | 458 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
459 ;; Here we must read the output of compress program as is |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
460 ;; without any code conversion. |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
461 (let ((coding-system-for-read 'no-conversion)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
462 (jka-compr-call-process compress-program |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
463 (concat compress-message |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
464 " " base-name) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
465 temp-file |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
466 temp-buffer |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
467 nil |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
468 compress-args)) |
6002 | 469 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
470 (with-current-buffer temp-buffer |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
471 (let ((coding-system-for-write 'no-conversion)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
472 (if (memq system-type '(ms-dos windows-nt)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
473 (setq buffer-file-type t) ) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
474 (jka-compr-run-real-handler 'write-region |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
475 (list (point-min) (point-max) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
476 filename |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
477 (and append can-append) 'dont)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
478 (erase-buffer)) ) |
6002 | 479 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
480 (jka-compr-delete-temp-file temp-file) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
481 |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
482 (and |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
483 compress-message |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
484 (message "%s %s...done" compress-message base-name)) |
6002 | 485 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
486 (cond |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
487 ((eq visit t) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
488 (setq buffer-file-name filename) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
489 (setq jka-compr-really-do-compress t) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
490 (set-visited-file-modtime)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
491 ((stringp visit) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
492 (setq buffer-file-name visit) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
493 (let ((buffer-file-name filename)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
494 (set-visited-file-modtime)))) |
6002 | 495 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
496 (and (or (eq visit t) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
497 (eq visit nil) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
498 (stringp visit)) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
499 (message "Wrote %s" visit-file)) |
22360
09dbe38a603f
(jka-compr-write-region): Ensure
Karl Heuer <kwzh@gnu.org>
parents:
22194
diff
changeset
|
500 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
501 ;; ensure `last-coding-system-used' has an appropriate value |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
502 (setq last-coding-system-used coding-system-used) |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
503 |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
504 nil) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
505 |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
506 (jka-compr-run-real-handler 'write-region |
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
507 (list start end filename append visit))))) |
6002 | 508 |
509 | |
6218
f4d5338c2142
(jka-compr-insert-file-contents): Handle 5th arg.
Richard M. Stallman <rms@gnu.org>
parents:
6041
diff
changeset
|
510 (defun jka-compr-insert-file-contents (file &optional visit beg end replace) |
6002 | 511 (barf-if-buffer-read-only) |
512 | |
513 (and (or beg end) | |
514 visit | |
515 (error "Attempt to visit less than an entire file")) | |
516 | |
517 (let* ((filename (expand-file-name file)) | |
518 (info (jka-compr-get-compression-info filename))) | |
519 | |
520 (if info | |
521 | |
522 (let ((uncompress-message (jka-compr-info-uncompress-message info)) | |
523 (uncompress-program (jka-compr-info-uncompress-program info)) | |
524 (uncompress-args (jka-compr-info-uncompress-args info)) | |
525 (base-name (file-name-nondirectory filename)) | |
526 (notfound nil) | |
7976
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
527 (local-copy |
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
528 (jka-compr-run-real-handler 'file-local-copy (list filename))) |
6002 | 529 local-file |
49377
e5099d153f94
(jka-compr-insert-file-contents): Read a process
Kenichi Handa <handa@m17n.org>
parents:
47180
diff
changeset
|
530 size start) |
6002 | 531 |
532 (setq local-file (or local-copy filename)) | |
533 | |
534 (and | |
535 visit | |
536 (setq buffer-file-name filename)) | |
537 | |
538 (unwind-protect ; to make sure local-copy gets deleted | |
539 | |
540 (progn | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
541 |
6002 | 542 (and |
543 uncompress-message | |
544 (message "%s %s..." uncompress-message base-name)) | |
545 | |
546 (condition-case error-code | |
547 | |
49377
e5099d153f94
(jka-compr-insert-file-contents): Read a process
Kenichi Handa <handa@m17n.org>
parents:
47180
diff
changeset
|
548 (let ((coding-system-for-read 'no-conversion)) |
8774
ade4b542a74c
(jka-compr-compression-info-list): Expand regular
Richard M. Stallman <rms@gnu.org>
parents:
8593
diff
changeset
|
549 (if replace |
ade4b542a74c
(jka-compr-compression-info-list): Expand regular
Richard M. Stallman <rms@gnu.org>
parents:
8593
diff
changeset
|
550 (goto-char (point-min))) |
6002 | 551 (setq start (point)) |
552 (if (or beg end) | |
553 (jka-compr-partial-uncompress uncompress-program | |
554 (concat uncompress-message | |
555 " " base-name) | |
556 uncompress-args | |
557 local-file | |
558 (or beg 0) | |
559 (if (and beg end) | |
560 (- end beg) | |
561 end)) | |
11621
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
562 ;; If visiting, bind off buffer-file-name so that |
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
563 ;; file-locking will not ask whether we should |
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
564 ;; really edit the buffer. |
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
565 (let ((buffer-file-name |
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
566 (if visit nil buffer-file-name))) |
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
567 (jka-compr-call-process uncompress-program |
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
568 (concat uncompress-message |
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
569 " " base-name) |
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
570 local-file |
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
571 t |
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
572 nil |
710b5ce824c2
(jka-compr-insert-file-contents): When visiting,
Richard M. Stallman <rms@gnu.org>
parents:
11296
diff
changeset
|
573 uncompress-args))) |
6002 | 574 (setq size (- (point) start)) |
8774
ade4b542a74c
(jka-compr-compression-info-list): Expand regular
Richard M. Stallman <rms@gnu.org>
parents:
8593
diff
changeset
|
575 (if replace |
51284
55a88703765d
(jka-compr-insert-file-contents):
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
576 (delete-region (point) (point-max))) |
8774
ade4b542a74c
(jka-compr-compression-info-list): Expand regular
Richard M. Stallman <rms@gnu.org>
parents:
8593
diff
changeset
|
577 (goto-char start)) |
6002 | 578 (error |
579 (if (and (eq (car error-code) 'file-error) | |
580 (eq (nth 3 error-code) local-file)) | |
581 (if visit | |
582 (setq notfound error-code) | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
583 (signal 'file-error |
6002 | 584 (cons "Opening input file" |
585 (nthcdr 2 error-code)))) | |
586 (signal (car error-code) (cdr error-code)))))) | |
587 | |
588 (and | |
589 local-copy | |
590 (file-exists-p local-copy) | |
591 (delete-file local-copy))) | |
592 | |
53304
b9463f85fb04
(jka-compr-insert-file-contents): Avoid error when
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
593 (unless notfound |
b9463f85fb04
(jka-compr-insert-file-contents): Avoid error when
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
594 (decode-coding-inserted-region |
b9463f85fb04
(jka-compr-insert-file-contents): Avoid error when
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
595 (point) (+ (point) size) |
b9463f85fb04
(jka-compr-insert-file-contents): Avoid error when
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
596 (jka-compr-byte-compiler-base-file-name file) |
b9463f85fb04
(jka-compr-insert-file-contents): Avoid error when
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
597 visit beg end replace)) |
49377
e5099d153f94
(jka-compr-insert-file-contents): Read a process
Kenichi Handa <handa@m17n.org>
parents:
47180
diff
changeset
|
598 |
6002 | 599 (and |
600 visit | |
601 (progn | |
7976
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
602 (unlock-buffer) |
6002 | 603 (setq buffer-file-name filename) |
26987
af30e0897839
(jka-compr-info-file-magic-bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
26039
diff
changeset
|
604 (setq jka-compr-really-do-compress t) |
6002 | 605 (set-visited-file-modtime))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
606 |
6002 | 607 (and |
608 uncompress-message | |
609 (message "%s %s...done" uncompress-message base-name)) | |
610 | |
611 (and | |
612 visit | |
613 notfound | |
614 (signal 'file-error | |
615 (cons "Opening input file" (nth 2 notfound)))) | |
616 | |
22484
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
617 ;; This is done in insert-file-contents after we return. |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
618 ;; That is a little weird, but better to go along with it now |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
619 ;; than to change it now. |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
620 |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
621 ;;; ;; Run the functions that insert-file-contents would. |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
622 ;;; (let ((p after-insert-file-functions) |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
623 ;;; (insval size)) |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
624 ;;; (while p |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
625 ;;; (setq insval (funcall (car p) size)) |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
626 ;;; (if insval |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
627 ;;; (progn |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
628 ;;; (or (integerp insval) |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
629 ;;; (signal 'wrong-type-argument |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
630 ;;; (list 'integerp insval))) |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
631 ;;; (setq size insval))) |
661650f543ee
(jka-compr-insert-file-contents): Don't run
Richard M. Stallman <rms@gnu.org>
parents:
22360
diff
changeset
|
632 ;;; (setq p (cdr p)))) |
8774
ade4b542a74c
(jka-compr-compression-info-list): Expand regular
Richard M. Stallman <rms@gnu.org>
parents:
8593
diff
changeset
|
633 |
6002 | 634 (list filename size)) |
635 | |
7976
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
636 (jka-compr-run-real-handler 'insert-file-contents |
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
637 (list file visit beg end replace))))) |
6002 | 638 |
639 | |
640 (defun jka-compr-file-local-copy (file) | |
641 (let* ((filename (expand-file-name file)) | |
642 (info (jka-compr-get-compression-info filename))) | |
643 | |
644 (if info | |
645 | |
646 (let ((uncompress-message (jka-compr-info-uncompress-message info)) | |
647 (uncompress-program (jka-compr-info-uncompress-program info)) | |
648 (uncompress-args (jka-compr-info-uncompress-args info)) | |
649 (base-name (file-name-nondirectory filename)) | |
7976
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
650 (local-copy |
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
651 (jka-compr-run-real-handler 'file-local-copy (list filename))) |
6002 | 652 (temp-file (jka-compr-make-temp-name t)) |
11635
b56f6afa16ec
(jka-compr-write-region): Handle the append
Richard M. Stallman <rms@gnu.org>
parents:
11621
diff
changeset
|
653 (temp-buffer (get-buffer-create " *jka-compr-flc-temp*")) |
6002 | 654 (notfound nil) |
655 local-file) | |
656 | |
657 (setq local-file (or local-copy filename)) | |
658 | |
659 (unwind-protect | |
660 | |
16940
6d680b18a47b
(jka-compr-error): Use with-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16630
diff
changeset
|
661 (with-current-buffer temp-buffer |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
662 |
6002 | 663 (and |
664 uncompress-message | |
665 (message "%s %s..." uncompress-message base-name)) | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
666 |
18906 | 667 ;; Here we must read the output of uncompress program |
668 ;; and write it to TEMP-FILE without any code | |
669 ;; conversion. An appropriate code conversion (if | |
670 ;; necessary) is done by the later I/O operation | |
671 ;; (e.g. load). | |
672 (let ((coding-system-for-read 'no-conversion) | |
673 (coding-system-for-write 'no-conversion)) | |
6002 | 674 |
18906 | 675 (jka-compr-call-process uncompress-program |
676 (concat uncompress-message | |
677 " " base-name) | |
678 local-file | |
679 t | |
680 nil | |
681 uncompress-args) | |
6002 | 682 |
18906 | 683 (and |
684 uncompress-message | |
685 (message "%s %s...done" uncompress-message base-name)) | |
686 | |
687 (write-region | |
688 (point-min) (point-max) temp-file nil 'dont))) | |
6002 | 689 |
690 (and | |
691 local-copy | |
692 (file-exists-p local-copy) | |
693 (delete-file local-copy)) | |
694 | |
695 (kill-buffer temp-buffer)) | |
696 | |
697 temp-file) | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
698 |
7976
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
699 (jka-compr-run-real-handler 'file-local-copy (list filename))))) |
6002 | 700 |
701 | |
702 ;;; Support for loading compressed files. | |
703 (defun jka-compr-load (file &optional noerror nomessage nosuffix) | |
704 "Documented as original." | |
705 | |
706 (let* ((local-copy (jka-compr-file-local-copy file)) | |
707 (load-file (or local-copy file))) | |
708 | |
709 (unwind-protect | |
710 | |
7976
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
711 (let (inhibit-file-name-operation |
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
712 inhibit-file-name-handlers) |
6002 | 713 (or nomessage |
714 (message "Loading %s..." file)) | |
715 | |
12758
a285eaa710ac
(jka-compr-load): Bind load-force-doc-strings.
Richard M. Stallman <rms@gnu.org>
parents:
11635
diff
changeset
|
716 (let ((load-force-doc-strings t)) |
a285eaa710ac
(jka-compr-load): Bind load-force-doc-strings.
Richard M. Stallman <rms@gnu.org>
parents:
11635
diff
changeset
|
717 (load load-file noerror t t)) |
6002 | 718 (or nomessage |
27512
b7020186895e
(jka-compr-load): Fix up load-history.
Dave Love <fx@gnu.org>
parents:
26987
diff
changeset
|
719 (message "Loading %s...done." file)) |
b7020186895e
(jka-compr-load): Fix up load-history.
Dave Love <fx@gnu.org>
parents:
26987
diff
changeset
|
720 ;; Fix up the load history to point at the right library. |
b7020186895e
(jka-compr-load): Fix up load-history.
Dave Love <fx@gnu.org>
parents:
26987
diff
changeset
|
721 (let ((l (assoc load-file load-history))) |
b7020186895e
(jka-compr-load): Fix up load-history.
Dave Love <fx@gnu.org>
parents:
26987
diff
changeset
|
722 ;; Remove .gz and .elc?. |
b7020186895e
(jka-compr-load): Fix up load-history.
Dave Love <fx@gnu.org>
parents:
26987
diff
changeset
|
723 (while (file-name-extension file) |
b7020186895e
(jka-compr-load): Fix up load-history.
Dave Love <fx@gnu.org>
parents:
26987
diff
changeset
|
724 (setq file (file-name-sans-extension file))) |
b7020186895e
(jka-compr-load): Fix up load-history.
Dave Love <fx@gnu.org>
parents:
26987
diff
changeset
|
725 (setcar l file))) |
6002 | 726 |
727 (jka-compr-delete-temp-file local-copy)) | |
728 | |
729 t)) | |
12922
e171a85fd6b0
(jka-compr-byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12758
diff
changeset
|
730 |
e171a85fd6b0
(jka-compr-byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12758
diff
changeset
|
731 (defun jka-compr-byte-compiler-base-file-name (file) |
e171a85fd6b0
(jka-compr-byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12758
diff
changeset
|
732 (let ((info (jka-compr-get-compression-info file))) |
e171a85fd6b0
(jka-compr-byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12758
diff
changeset
|
733 (if (and info (jka-compr-info-strip-extension info)) |
e171a85fd6b0
(jka-compr-byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12758
diff
changeset
|
734 (save-match-data |
e171a85fd6b0
(jka-compr-byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12758
diff
changeset
|
735 (substring file 0 (string-match (jka-compr-info-regexp info) file))) |
e171a85fd6b0
(jka-compr-byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12758
diff
changeset
|
736 file))) |
7976
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
737 |
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
738 (put 'write-region 'jka-compr 'jka-compr-write-region) |
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
739 (put 'insert-file-contents 'jka-compr 'jka-compr-insert-file-contents) |
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
740 (put 'file-local-copy 'jka-compr 'jka-compr-file-local-copy) |
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
741 (put 'load 'jka-compr 'jka-compr-load) |
12922
e171a85fd6b0
(jka-compr-byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12758
diff
changeset
|
742 (put 'byte-compiler-base-file-name 'jka-compr |
e171a85fd6b0
(jka-compr-byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12758
diff
changeset
|
743 'jka-compr-byte-compiler-base-file-name) |
6002 | 744 |
20132
b691f68b0757
(jka-compr-inhibit): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
19004
diff
changeset
|
745 (defvar jka-compr-inhibit nil |
b691f68b0757
(jka-compr-inhibit): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
19004
diff
changeset
|
746 "Non-nil means inhibit automatic uncompression temporarily. |
b691f68b0757
(jka-compr-inhibit): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
19004
diff
changeset
|
747 Lisp programs can bind this to t to do that. |
b691f68b0757
(jka-compr-inhibit): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
19004
diff
changeset
|
748 It is not recommended to set this variable permanently to anything but nil.") |
b691f68b0757
(jka-compr-inhibit): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
19004
diff
changeset
|
749 |
47180
1161904f7cbb
(jka-compr-handler): Add safe-magic property.
Richard M. Stallman <rms@gnu.org>
parents:
45720
diff
changeset
|
750 (put 'jka-compr-handler 'safe-magic t) |
6002 | 751 (defun jka-compr-handler (operation &rest args) |
7976
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
752 (save-match-data |
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
753 (let ((jka-op (get operation 'jka-compr))) |
20132
b691f68b0757
(jka-compr-inhibit): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
19004
diff
changeset
|
754 (if (and jka-op (not jka-compr-inhibit)) |
7976
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
755 (apply jka-op args) |
b72b84744a85
Use plists to record handlers.
Richard M. Stallman <rms@gnu.org>
parents:
7617
diff
changeset
|
756 (jka-compr-run-real-handler operation args))))) |
6002 | 757 |
7066 | 758 ;; If we are given an operation that we don't handle, |
759 ;; call the Emacs primitive for that operation, | |
760 ;; and manipulate the inhibit variables | |
761 ;; to prevent the primitive from calling our handler again. | |
762 (defun jka-compr-run-real-handler (operation args) | |
763 (let ((inhibit-file-name-handlers | |
764 (cons 'jka-compr-handler | |
765 (and (eq inhibit-file-name-operation operation) | |
766 inhibit-file-name-handlers))) | |
767 (inhibit-file-name-operation operation)) | |
768 (apply operation args))) | |
769 | |
31747
cc2e3eead63c
(with-auto-compression-mode): New macro.
Miles Bader <miles@gnu.org>
parents:
28484
diff
changeset
|
770 |
6002 | 771 (defun jka-compr-build-file-regexp () |
31975
8325ae2bc1e4
(auto-compression-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31747
diff
changeset
|
772 (mapconcat |
8325ae2bc1e4
(auto-compression-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31747
diff
changeset
|
773 'jka-compr-info-regexp |
8325ae2bc1e4
(auto-compression-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31747
diff
changeset
|
774 jka-compr-compression-info-list |
8325ae2bc1e4
(auto-compression-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31747
diff
changeset
|
775 "\\|")) |
6002 | 776 |
777 | |
778 (defun jka-compr-install () | |
779 "Install jka-compr. | |
11296
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
780 This adds entries to `file-name-handler-alist' and `auto-mode-alist' |
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
781 and `inhibit-first-line-modes-suffixes'." |
6002 | 782 |
783 (setq jka-compr-file-name-handler-entry | |
784 (cons (jka-compr-build-file-regexp) 'jka-compr-handler)) | |
785 | |
786 (setq file-name-handler-alist (cons jka-compr-file-name-handler-entry | |
787 file-name-handler-alist)) | |
788 | |
19004
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
789 (setq jka-compr-added-to-file-coding-system-alist nil) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
790 |
6002 | 791 (mapcar |
792 (function (lambda (x) | |
19004
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
793 ;; Don't do multibyte encoding on the compressed files. |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
794 (let ((elt (cons (jka-compr-info-regexp x) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
795 '(no-conversion . no-conversion)))) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
796 (setq file-coding-system-alist |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
797 (cons elt file-coding-system-alist)) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
798 (setq jka-compr-added-to-file-coding-system-alist |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
799 (cons elt jka-compr-added-to-file-coding-system-alist))) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
800 |
11179
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
801 (and (jka-compr-info-strip-extension x) |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
802 ;; Make entries in auto-mode-alist so that modes |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
803 ;; are chosen right according to the file names |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
804 ;; sans `.gz'. |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
805 (setq auto-mode-alist |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
806 (cons (list (jka-compr-info-regexp x) |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
807 nil 'jka-compr) |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
808 auto-mode-alist)) |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
809 ;; Also add these regexps to |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
810 ;; inhibit-first-line-modes-suffixes, so that a |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
811 ;; -*- line in the first file of a compressed tar |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
812 ;; file doesn't override tar-mode. |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
813 (setq inhibit-first-line-modes-suffixes |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
814 (cons (jka-compr-info-regexp x) |
9ff0cfb97106
(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
9493
diff
changeset
|
815 inhibit-first-line-modes-suffixes))))) |
9493
0160fca3dee1
(jka-compr-mode-compression-info-list): Add .tgz extension.
Richard M. Stallman <rms@gnu.org>
parents:
9084
diff
changeset
|
816 jka-compr-compression-info-list) |
0160fca3dee1
(jka-compr-mode-compression-info-list): Add .tgz extension.
Richard M. Stallman <rms@gnu.org>
parents:
9084
diff
changeset
|
817 (setq auto-mode-alist |
39829
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
818 (append auto-mode-alist jka-compr-mode-alist-additions)) |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
819 |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
820 ;; Make sure that (load "foo") will find /bla/foo.el.gz. |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
821 (setq load-suffixes |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
822 (apply 'append |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
823 (mapcar (lambda (suffix) |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
824 (cons suffix |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
825 (mapcar (lambda (ext) (concat suffix ext)) |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
826 jka-compr-load-suffixes))) |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
827 load-suffixes)))) |
6002 | 828 |
829 | |
830 (defun jka-compr-uninstall () | |
831 "Uninstall jka-compr. | |
7066 | 832 This removes the entries in `file-name-handler-alist' and `auto-mode-alist' |
11296
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
833 and `inhibit-first-line-modes-suffixes' that were added |
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
834 by `jka-compr-installed'." |
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
835 ;; Delete from inhibit-first-line-modes-suffixes |
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
836 ;; what jka-compr-install added. |
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
837 (mapcar |
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
838 (function (lambda (x) |
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
839 (and (jka-compr-info-strip-extension x) |
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
840 (setq inhibit-first-line-modes-suffixes |
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
841 (delete (jka-compr-info-regexp x) |
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
842 inhibit-first-line-modes-suffixes))))) |
c271ed10f874
(jka-compr-install): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11179
diff
changeset
|
843 jka-compr-compression-info-list) |
6002 | 844 |
845 (let* ((fnha (cons nil file-name-handler-alist)) | |
846 (last fnha)) | |
847 | |
848 (while (cdr last) | |
849 (if (eq (cdr (car (cdr last))) 'jka-compr-handler) | |
850 (setcdr last (cdr (cdr last))) | |
851 (setq last (cdr last)))) | |
852 | |
853 (setq file-name-handler-alist (cdr fnha))) | |
854 | |
855 (let* ((ama (cons nil auto-mode-alist)) | |
856 (last ama) | |
857 entry) | |
858 | |
859 (while (cdr last) | |
860 (setq entry (car (cdr last))) | |
9493
0160fca3dee1
(jka-compr-mode-compression-info-list): Add .tgz extension.
Richard M. Stallman <rms@gnu.org>
parents:
9084
diff
changeset
|
861 (if (or (member entry jka-compr-mode-alist-additions) |
0160fca3dee1
(jka-compr-mode-compression-info-list): Add .tgz extension.
Richard M. Stallman <rms@gnu.org>
parents:
9084
diff
changeset
|
862 (and (consp (cdr entry)) |
0160fca3dee1
(jka-compr-mode-compression-info-list): Add .tgz extension.
Richard M. Stallman <rms@gnu.org>
parents:
9084
diff
changeset
|
863 (eq (nth 2 entry) 'jka-compr))) |
6002 | 864 (setcdr last (cdr (cdr last))) |
865 (setq last (cdr last)))) | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
866 |
19004
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
867 (setq auto-mode-alist (cdr ama))) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
868 |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
869 (let* ((ama (cons nil file-coding-system-alist)) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
870 (last ama) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
871 entry) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
872 |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
873 (while (cdr last) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
874 (setq entry (car (cdr last))) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
875 (if (member entry jka-compr-added-to-file-coding-system-alist) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
876 (setcdr last (cdr (cdr last))) |
f2ce7e947ec9
(jka-compr-added-to-file-coding-system-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents:
18906
diff
changeset
|
877 (setq last (cdr last)))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
878 |
39829
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
879 (setq file-coding-system-alist (cdr ama))) |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
880 |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
881 ;; Remove the suffixes that were added by jka-compr. |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
882 (let ((suffixes nil) |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
883 (re (jka-compr-build-file-regexp))) |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
884 (dolist (suffix load-suffixes) |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
885 (unless (string-match re suffix) |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
886 (push suffix suffixes))) |
79ed34b0c0df
(jka-compr-load-suffixes): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38412
diff
changeset
|
887 (setq load-suffixes (nreverse suffixes)))) |
6002 | 888 |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49418
diff
changeset
|
889 |
6002 | 890 (defun jka-compr-installed-p () |
891 "Return non-nil if jka-compr is installed. | |
7066 | 892 The return value is the entry in `file-name-handler-alist' for jka-compr." |
6002 | 893 |
894 (let ((fnha file-name-handler-alist) | |
895 (installed nil)) | |
896 | |
897 (while (and fnha (not installed)) | |
898 (and (eq (cdr (car fnha)) 'jka-compr-handler) | |
899 (setq installed (car fnha))) | |
900 (setq fnha (cdr fnha))) | |
901 | |
902 installed)) | |
903 | |
904 | |
32317
ffc41362f67e
Don't call `jka-compr-install' when loading (it will be done by the
Miles Bader <miles@gnu.org>
parents:
32262
diff
changeset
|
905 ;;; Add the file I/O hook if it does not already exist. |
ffc41362f67e
Don't call `jka-compr-install' when loading (it will be done by the
Miles Bader <miles@gnu.org>
parents:
32262
diff
changeset
|
906 ;;; Make sure that jka-compr-file-name-handler-entry is eq to the |
ffc41362f67e
Don't call `jka-compr-install' when loading (it will be done by the
Miles Bader <miles@gnu.org>
parents:
32262
diff
changeset
|
907 ;;; entry for jka-compr in file-name-handler-alist. |
ffc41362f67e
Don't call `jka-compr-install' when loading (it will be done by the
Miles Bader <miles@gnu.org>
parents:
32262
diff
changeset
|
908 (and (jka-compr-installed-p) |
ffc41362f67e
Don't call `jka-compr-install' when loading (it will be done by the
Miles Bader <miles@gnu.org>
parents:
32262
diff
changeset
|
909 (jka-compr-uninstall)) |
ffc41362f67e
Don't call `jka-compr-install' when loading (it will be done by the
Miles Bader <miles@gnu.org>
parents:
32262
diff
changeset
|
910 |
ffc41362f67e
Don't call `jka-compr-install' when loading (it will be done by the
Miles Bader <miles@gnu.org>
parents:
32262
diff
changeset
|
911 |
32262
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
912 ;;;###autoload |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
913 (define-minor-mode auto-compression-mode |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
914 "Toggle automatic file compression and uncompression. |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
915 With prefix argument ARG, turn auto compression on if positive, else off. |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
916 Returns the new status of auto compression (non-nil means on)." |
33190
c33775f5049b
(auto-compression-mode): Drop unneeded positional args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32497
diff
changeset
|
917 :global t :group 'jka-compr |
32262
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
918 (let* ((installed (jka-compr-installed-p)) |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
919 (flag auto-compression-mode)) |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
920 (cond |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
921 ((and flag installed) t) ; already installed |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
922 ((and (not flag) (not installed)) nil) ; already not installed |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
923 (flag (jka-compr-install)) |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
924 (t (jka-compr-uninstall))))) |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
925 |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
926 |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
927 ;;;###autoload |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
928 (defmacro with-auto-compression-mode (&rest body) |
32317
ffc41362f67e
Don't call `jka-compr-install' when loading (it will be done by the
Miles Bader <miles@gnu.org>
parents:
32262
diff
changeset
|
929 "Evalute BODY with automatic file compression and uncompression enabled." |
32262
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
930 (let ((already-installed (make-symbol "already-installed"))) |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
931 `(let ((,already-installed (jka-compr-installed-p))) |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
932 (unwind-protect |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
933 (progn |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
934 (unless ,already-installed |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
935 (jka-compr-install)) |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
936 ,@body) |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
937 (unless ,already-installed |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
938 (jka-compr-uninstall)))))) |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
939 (put 'with-auto-compression-mode 'lisp-indent-function 0) |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
940 |
44264092481b
(auto-compression-mode): Move to the end of the file, because
Miles Bader <miles@gnu.org>
parents:
31975
diff
changeset
|
941 |
6002 | 942 (provide 'jka-compr) |
943 | |
52401 | 944 ;;; arch-tag: 3f15b630-e9a7-46c4-a22a-94afdde86ebc |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
34732
diff
changeset
|
945 ;;; jka-compr.el ends here |