Fix arg usage of format-decode-run-method (Bug#7488).

[bpt/emacs.git] / lisp / jka-compr.el

diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index c528e05..34ffcc9 100644 (file)
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -1,7 +1,7 @@
 ;;; jka-compr.el --- reading/writing/loading compressed files
 
 ;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: jka@ece.cmu.edu (Jay K. Adams)
 ;; Maintainer: FSF
@@ -9,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -95,7 +93,7 @@
 (require 'jka-cmpr-hook)
 
 (defcustom jka-compr-shell "sh"
-  "*Shell to be used for calling compression programs.
+  "Shell to be used for calling compression programs.
 NOTE: Not used in MS-DOS and Windows systems."
   :type 'string
   :group 'jka-compr)
@@ -259,16 +257,12 @@ There should be no more than seven characters after the final `/'."
         (info (jka-compr-get-compression-info visit-file))
         (magic (and info (jka-compr-info-file-magic-bytes info))))
 
-    ;; If START is nil, use the whole buffer.
-    (if (null start)
-       (setq start 1 end (1+ (buffer-size))))
-
     ;; If we uncompressed this file when visiting it,
     ;; then recompress it when writing it
     ;; even if the contents look compressed already.
     (if (and jka-compr-really-do-compress
-            (eq start 1)
-            (eq end (1+ (buffer-size))))
+             (or (null start)
+                 (= (- end start) (buffer-size))))
        (setq magic nil))
 
     (if (and info
@@ -279,9 +273,10 @@ There should be no more than seven characters after the final `/'."
                       (equal (if (stringp start)
                                  (substring start 0 (min (length start)
                                                          (length magic)))
-                               (buffer-substring start
-                                                 (min end
-                                                      (+ start (length magic)))))
+                                (let* ((from (or start (point-min)))
+                                       (to (min (or end (point-max))
+                                                (+ from (length magic)))))
+                                  (buffer-substring from to)))
                              magic))))
        (let ((can-append (jka-compr-info-can-append info))
              (compress-program (jka-compr-info-compress-program info))
@@ -595,7 +590,14 @@ There should be no more than seven characters after the final `/'."
          (or nomessage
              (message "Loading %s...done." file))
          ;; Fix up the load history to point at the right library.
-         (let ((l (assoc load-file load-history)))
+         (let ((l (or (assoc load-file load-history)
+                      ;; On MS-Windows, if load-file is in
+                      ;; temporary-file-directory, it will look like
+                      ;; "c:/DOCUME~1/USER/LOCALS~1/foo", whereas
+                      ;; readevalloop will record its truename in
+                      ;; load-history.  Therefore try truename if the
+                      ;; original name is not in load-history.
+                      (assoc (file-truename load-file) load-history))))
            ;; Remove .gz and .elc?.
            (while (file-name-extension file)
              (setq file (file-name-sans-extension file)))