HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use xmalloc_unsafe in current_minor_maps
[bpt/emacs.git]
/
lisp
/
jka-compr.el
diff --git
a/lisp/jka-compr.el
b/lisp/jka-compr.el
index
37c9d40
..
a689605
100644
(file)
--- a/
lisp/jka-compr.el
+++ b/
lisp/jka-compr.el
@@
-1,9
+1,9
@@
;;; jka-compr.el --- reading/writing/loading compressed files
;;; jka-compr.el --- reading/writing/loading compressed files
-;; Copyright (C) 1993-1995, 1997, 1999-201
1
Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1997, 1999-201
4
Free Software Foundation, Inc.
-;; Author:
jka@ece.cmu.edu (Jay K. Adams)
-;; Maintainer:
FSF
+;; Author:
Jay K. Adams <jka@ece.cmu.edu>
+;; Maintainer:
emacs-devel@gnu.org
;; Keywords: data
;; This file is part of GNU Emacs.
;; Keywords: data
;; This file is part of GNU Emacs.
@@
-108,8
+108,7
@@
data appears to be compressed already.")
(put 'jka-compr-really-do-compress 'permanent-local t)
\f
(put 'jka-compr-really-do-compress 'permanent-local t)
\f
-(put 'compression-error 'error-conditions '(compression-error file-error error))
-
+(define-error 'compression-error nil 'file-error)
(defvar jka-compr-acceptable-retval-list '(0 2 141))
(defvar jka-compr-acceptable-retval-list '(0 2 141))
@@
-203,6
+202,7
@@
to keep: LEN chars starting BEG chars from the beginning."
;; call-process barfs if default-directory is inaccessible.
(let ((default-directory
(if (and default-directory
;; call-process barfs if default-directory is inaccessible.
(let ((default-directory
(if (and default-directory
+ (not (file-remote-p default-directory))
(file-accessible-directory-p default-directory))
default-directory
(file-name-directory infile))))
(file-accessible-directory-p default-directory))
default-directory
(file-name-directory infile))))
@@
-309,6
+309,7
@@
There should be no more than seven characters after the final `/'."
(and
compress-message
(and
compress-message
+ jka-compr-verbose
(message "%s %s..." compress-message base-name))
(jka-compr-run-real-handler 'write-region
(message "%s %s..." compress-message base-name))
(jka-compr-run-real-handler 'write-region
@@
-329,8
+330,6
@@
There should be no more than seven characters after the final `/'."
(with-current-buffer temp-buffer
(let ((coding-system-for-write 'no-conversion))
(with-current-buffer temp-buffer
(let ((coding-system-for-write 'no-conversion))
- (if (memq system-type '(ms-dos windows-nt))
- (setq buffer-file-type t) )
(jka-compr-run-real-handler 'write-region
(list (point-min) (point-max)
filename
(jka-compr-run-real-handler 'write-region
(list (point-min) (point-max)
filename
@@
-341,6
+340,7
@@
There should be no more than seven characters after the final `/'."
(and
compress-message
(and
compress-message
+ jka-compr-verbose
(message "%s %s...done" compress-message base-name))
(cond
(message "%s %s...done" compress-message base-name))
(cond
@@
-404,6
+404,7
@@
There should be no more than seven characters after the final `/'."
(and
uncompress-message
(and
uncompress-message
+ jka-compr-verbose
(message "%s %s..." uncompress-message base-name))
(condition-case error-code
(message "%s %s..." uncompress-message base-name))
(condition-case error-code
@@
-479,6
+480,7
@@
There should be no more than seven characters after the final `/'."
(and
uncompress-message
(and
uncompress-message
+ jka-compr-verbose
(message "%s %s...done" uncompress-message base-name))
(and
(message "%s %s...done" uncompress-message base-name))
(and
@@
-534,6
+536,7
@@
There should be no more than seven characters after the final `/'."
(and
uncompress-message
(and
uncompress-message
+ jka-compr-verbose
(message "%s %s..." uncompress-message base-name))
;; Here we must read the output of uncompress program
(message "%s %s..." uncompress-message base-name))
;; Here we must read the output of uncompress program
@@
-554,6
+557,7
@@
There should be no more than seven characters after the final `/'."
(and
uncompress-message
(and
uncompress-message
+ jka-compr-verbose
(message "%s %s...done" uncompress-message base-name))
(write-region
(message "%s %s...done" uncompress-message base-name))
(write-region
@@
-651,16
+655,15
@@
It is not recommended to set this variable permanently to anything but nil.")
(defun jka-compr-uninstall ()
"Uninstall jka-compr.
This removes the entries in `file-name-handler-alist' and `auto-mode-alist'
(defun jka-compr-uninstall ()
"Uninstall jka-compr.
This removes the entries in `file-name-handler-alist' and `auto-mode-alist'
-and `inhibit-
first-line-mod
es-suffixes' that were added
+and `inhibit-
local-variabl
es-suffixes' that were added
by `jka-compr-installed'."
by `jka-compr-installed'."
- ;; Delete from inhibit-first-line-modes-suffixes
- ;; what jka-compr-install added.
+ ;; Delete from inhibit-local-variables-suffixes what jka-compr-install added.
(mapc
(function (lambda (x)
(and (jka-compr-info-strip-extension x)
(mapc
(function (lambda (x)
(and (jka-compr-info-strip-extension x)
- (setq inhibit-
first-line-mod
es-suffixes
+ (setq inhibit-
local-variabl
es-suffixes
(delete (jka-compr-info-regexp x)
(delete (jka-compr-info-regexp x)
- inhibit-
first-line-mod
es-suffixes)))))
+ inhibit-
local-variabl
es-suffixes)))))
jka-compr-compression-info-list--internal)
(let* ((fnha (cons nil file-name-handler-alist))
jka-compr-compression-info-list--internal)
(let* ((fnha (cons nil file-name-handler-alist))