--- a/lisp/packages/uncompress.el	Mon Aug 13 08:45:53 2007 +0200
+++ b/lisp/packages/uncompress.el	Mon Aug 13 08:46:35 2007 +0200
@@ -1,42 +1,73 @@
-;;; Synched up with: Not synched with FSF.  Close though.
-;;; #### This loser doesn't even provide .gz support here!
-;;; FSF's version does.
+;;; uncompress.el --- auto-decompression hook for visiting .Z files
 
-;;; uncompress.el --- auto-decompression hook for visiting .Z files
+;; Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+
+;; Maintainer: FSF
 ;; Keywords: unix extensions
 
+;; This file is part of XEmacs.
 
-;; ============================================================
-;; NOTE: crypt.el is a much more complete version of this hack.
-;; ============================================================
+;; XEmacs 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 2, or (at your option)
+;; any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
 
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs; see the file COPYING.  If not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;; 02111-1307, USA.
 
+;;; Synched up with: 19.34.
+
+;;; Commentary:
+
+;; This package can be used to arrange for automatic uncompress of
+;; files packed with the UNIX compress(1) utility when they are visited.
+;; All that's necessary is to load it.  This can conveniently be done from
+;; your .emacs file.
+
+;;; Code:
 
 ;; When we are about to make a backup file,
 ;; uncompress the file we visited
 ;; so that making the backup can work properly.
 ;; This is used as a write-file-hook.
 
+(defvar uncompress-program "gunzip"
+  "Program to use for uncompression.")
+
 (defun uncompress-backup-file ()
   (and buffer-file-name make-backup-files (not buffer-backed-up)
        (not (file-exists-p buffer-file-name))
-       (call-process "uncompress" nil nil nil buffer-file-name))
+       (call-process uncompress-program nil nil nil buffer-file-name))
   nil)
 
 (or (assoc "\\.Z$" auto-mode-alist)
     (setq auto-mode-alist
 	  (cons '("\\.Z$" . uncompress-while-visiting) auto-mode-alist)))
+(or (assoc "\\.gz$" auto-mode-alist)
+    (setq auto-mode-alist
+	  (cons '("\\.gz$" . uncompress-while-visiting) auto-mode-alist)))
 
 (defun uncompress-while-visiting ()
-  "Temporary \"major mode\" used for .Z files, to uncompress the contents.
+  "Temporary \"major mode\" used for .Z and .gz files, to uncompress them.
 It then selects a major mode from the uncompressed file name and contents."
   (if (and (not (null buffer-file-name))
 	   (string-match "\\.Z$" buffer-file-name))
       (set-visited-file-name
-       (substring buffer-file-name 0 (match-beginning 0))))
+       (substring buffer-file-name 0 (match-beginning 0)))
+    (if (and (not (null buffer-file-name))
+	     (string-match "\\.gz$" buffer-file-name))
+	(set-visited-file-name
+	 (substring buffer-file-name 0 (match-beginning 0)))))
   (message "Uncompressing...")
   (let ((buffer-read-only nil))
-    (shell-command-on-region (point-min) (point-max) "uncompress" t))
+    (shell-command-on-region (point-min) (point-max) uncompress-program t))
   (message "Uncompressing...done")
   (set-buffer-modified-p nil)
   (make-local-variable 'write-file-hooks)
@@ -52,10 +83,18 @@
   "Hook to read and uncompress the compressed version of a file."
   ;; Just pretend we had visited the compressed file,
   ;; and uncompress-while-visiting will do the rest.
-  (if (file-exists-p (concat buffer-file-name ".Z"))
-      (progn
-	(setq buffer-file-name (concat buffer-file-name ".Z"))
-	(insert-file-contents buffer-file-name t)
-	(goto-char (point-min))
-	(setq error nil)
-	t)))
+  (let (name)
+    (if (file-exists-p (setq name (concat buffer-file-name ".Z")))
+	(setq buffer-file-name name)
+      (if (file-exists-p (setq name (concat buffer-file-name ".gz")))
+	  (setq buffer-file-name name)))
+    (if (eq name buffer-file-name)
+	(progn
+	  (insert-file-contents buffer-file-name t)
+	  (goto-char (point-min))
+	  (setq error nil)
+	  t))))
+
+(provide 'uncompress)
+
+;;; uncompress.el ends here