HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
[bpt/emacs.git]
/
lisp
/
jka-compr.el
diff --git
a/lisp/jka-compr.el
b/lisp/jka-compr.el
index
6fb3ffd
..
ac81cf0
100644
(file)
--- a/
lisp/jka-compr.el
+++ b/
lisp/jka-compr.el
@@
-1,6
+1,7
@@
;;; jka-compr.el --- reading/writing/loading compressed files
;;; jka-compr.el --- reading/writing/loading compressed files
-;; Copyright (C) 1993-1995, 1997, 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1997, 1999-2013 Free Software Foundation,
+;; Inc.
;; Author: jka@ece.cmu.edu (Jay K. Adams)
;; Maintainer: FSF
;; Author: jka@ece.cmu.edu (Jay K. Adams)
;; Maintainer: FSF
@@
-203,6
+204,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))))
@@
-247,7
+249,7
@@
There should be no more than seven characters after the final `/'."
:type 'string
:group 'jka-compr)
:type 'string
:group 'jka-compr)
-(defun jka-compr-make-temp-name (&optional local-copy)
+(defun jka-compr-make-temp-name (&optional
_
local-copy)
"This routine will return the name of a new file."
(make-temp-file jka-compr-temp-name-template))
"This routine will return the name of a new file."
(make-temp-file jka-compr-temp-name-template))
@@
-309,6
+311,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
@@
-341,6
+344,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
+408,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
+484,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
+540,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
+561,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
@@
-572,7
+580,7
@@
There should be no more than seven characters after the final `/'."
;; Support for loading compressed files.
;; Support for loading compressed files.
-(defun jka-compr-load (file &optional noerror nomessage nosuffix)
+(defun jka-compr-load (file &optional noerror nomessage
_
nosuffix)
"Documented as original."
(let* ((local-copy (jka-compr-file-local-copy file))
"Documented as original."
(let* ((local-copy (jka-compr-file-local-copy file))
@@
-651,16
+659,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))