12 files changed, 359 insertions, 86 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index bffe85e6a7a..5f3006ec7bf 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,57 @@
+2013-08-14  Daniel Hackney  <dan@haxney.org>
+
+        * package-test.el: Remove tar-package-building functions.  Tar file
+        used for testing is included in the repository.
+        (package-test-install-texinfo, package-test-cleanup-built-files):
+        Remove.
+
+2013-08-13  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * automated/python-tests.el (python-imenu-create-index-4)
+        (python-imenu-create-flat-index-2): New tests.
+
+2013-08-05  Glenn Morris  <rgm@gnu.org>
+
+        * automated/mule-util.el: New file, with tests extracted from
+        lisp/international/mule-util.el.
+
+2013-08-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/advice-tests.el (advice-tests-nadvice): Test removal
+        before definition.
+        (advice-tests-macroaliases): New test.
+
+2013-08-04  Glenn Morris  <rgm@gnu.org>
+
+        * automated/ert-tests.el: Disable failing test that no-one seems
+        to know how to fix.  (Bug#13064)
+
+        * automated/icalendar-tests.el (icalendar-tests--test-export)
+        (icalendar-tests--test-import): Try more precise TZ specification.
+        Remove debug messages.
+
+2013-08-03  Glenn Morris  <rgm@gnu.org>
+
+        * automated/core-elisp-tests.el (core-elisp-tests): Fix defcustom.
+
+        * automated/icalendar-tests.el (icalendar-tests--test-export)
+        (icalendar-tests--test-import):
+        Use getenv/setenv rather than set-time-zone-rule.  Add debug messages.
+        (icalendar-tests--test-import): Reset zone even if error occurred.
+
+2013-08-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/core-elisp-tests.el: New file.
+
+2013-08-01  Glenn Morris  <rgm@gnu.org>
+
+        * automated/file-notify-tests.el (file-notify--test-remote-enabled):
+        Try to check that the remote system has a notification program.
+
+2013-07-31  Glenn Morris  <rgm@gnu.org>
+
+        * automated/undo-tests.el (undo-test2, undo-test5): Be quieter.
+
 2013-07-24  Michael Albinus  <michael.albinus@gmx.de>
 
         * automated/file-notify-tests.el
diff --git a/test/automated/advice-tests.el b/test/automated/advice-tests.el
index 69c15e34ed0..424f447ae4b 100644
--- a/test/automated/advice-tests.el
+++ b/test/automated/advice-tests.el
@@ -25,7 +25,12 @@
 
 (ert-deftest advice-tests-nadvice ()
   "Test nadvice code."
+  (advice-add 'sm-test1 :around (lambda (f y) (* (funcall f y) 5)))
+  (advice-add 'sm-test1 :around (lambda (f y) (* (funcall f y) 2)))
+  (advice-remove 'sm-test1 (lambda (f y) (* (funcall f y) 5)))
   (defun sm-test1 (x) (+ x 4))
+  (should (equal (sm-test1 6) 20))
+  (advice-remove 'sm-test1 (lambda (f y) (* (funcall f y) 2)))
   (should (equal (sm-test1 6) 10))
   (advice-add 'sm-test1 :around (lambda (f y) (* (funcall f y) 5)))
   (should (equal (sm-test1 6) 50))
@@ -42,6 +47,18 @@
   (defmacro sm-test3 (x) `(call-test3 ,x))
   (should (equal (macroexpand '(sm-test3 56)) '(toto (call-test3 56)))))
 
+(ert-deftest advice-tests-macroaliases ()
+  "Test nadvice code on aliases to macros."
+  (defmacro sm-test1 (a) `(list ',a))
+  (defalias 'sm-test1-alias 'sm-test1)
+  (should (equal (macroexpand '(sm-test1-alias 5)) '(list '5)))
+  (advice-add 'sm-test1-alias :around
+              (lambda (f &rest args) `(cons 1 ,(apply f args))))
+  (should (equal (macroexpand '(sm-test1-alias 5)) '(cons 1 (list '5))))
+  (defmacro sm-test1 (a) `(list 0 ',a))
+  (should (equal (macroexpand '(sm-test1-alias 5)) '(cons 1 (list 0 '5)))))
+
+
 (ert-deftest advice-tests-advice ()
   "Test advice code."
   (defun sm-test2 (x) (+ x 4))
diff --git a/test/automated/core-elisp-tests.el b/test/automated/core-elisp-tests.el
new file mode 100644
index 00000000000..40169b836d5
--- /dev/null
+++ b/test/automated/core-elisp-tests.el
@@ -0,0 +1,40 @@
+;;; core-elisp-tests.el --- Testing some core Elisp rules
+
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
+;; Keywords:
+
+;; This program 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 of the License, or
+;; (at your option) any later version.
+
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(ert-deftest core-elisp-tests ()
+  "Test some core Elisp rules."
+  (with-temp-buffer
+    ;; Check that when defvar is run within a let-binding, the toplevel default
+    ;; is properly initialized.
+    (should (equal (list (let ((c-e-x 1)) (defvar c-e-x 2) c-e-x) c-e-x)
+                   '(1 2)))
+    (should (equal (list (let ((c-e-x 1))
+                           (defcustom c-e-x 2 "doc" :group 'blah) c-e-x)
+                         c-e-x)
+                   '(1 2)))))
+
+(provide 'core-elisp-tests)
+;;; core-elisp-tests.el ends here
diff --git a/test/automated/data/decompress/foo-gzipped b/test/automated/data/decompress/foo-gzipped
new file mode 100644
index 00000000000..a68653fcbb9
--- /dev/null
+++ b/test/automated/data/decompress/foo-gzipped
diff --git a/test/automated/ert-tests.el b/test/automated/ert-tests.el
index 36864377ec9..a2be534c25c 100644
--- a/test/automated/ert-tests.el
+++ b/test/automated/ert-tests.el
@@ -353,16 +353,18 @@ This macro is used to test if macroexpansion in `should' works."
   (should-error (macroexpand '(ert-deftest ghi ()
                                 :documentation "foo"))))
 
-(ert-deftest ert-test-record-backtrace ()
-  (let ((test (make-ert-test :body (lambda () (ert-fail "foo")))))
-    (let ((result (ert-run-test test)))
-      (should (ert-test-failed-p result))
-      (with-temp-buffer
-        (ert--print-backtrace (ert-test-failed-backtrace result))
-        (goto-char (point-min))
-        (end-of-line)
-        (let ((first-line (buffer-substring-no-properties (point-min) (point))))
-          (should (equal first-line "  signal(ert-test-failed (\"foo\"))")))))))
+;; FIXME Test disabled due to persistent failure owing to lexical binding.
+;; http://debbugs.gnu.org/13064
+;;; (ert-deftest ert-test-record-backtrace ()
+;;;   (let ((test (make-ert-test :body (lambda () (ert-fail "foo")))))
+;;;     (let ((result (ert-run-test test)))
+;;;       (should (ert-test-failed-p result))
+;;;       (with-temp-buffer
+;;;         (ert--print-backtrace (ert-test-failed-backtrace result))
+;;;         (goto-char (point-min))
+;;;         (end-of-line)
+;;;         (let ((first-line (buffer-substring-no-properties (point-min) (point))))
+;;;           (should (equal first-line "  signal(ert-test-failed (\"foo\"))")))))))
 
 (ert-deftest ert-test-messages ()
   :tags '(:causes-redisplay)
diff --git a/test/automated/file-notify-tests.el b/test/automated/file-notify-tests.el
index 8bd4f258b1c..9f552ee7ab1 100644
--- a/test/automated/file-notify-tests.el
+++ b/test/automated/file-notify-tests.el
@@ -43,6 +43,7 @@
 (defvar file-notify--test-event nil)
 
 (require 'tramp)
+(require 'tramp-sh)
 (setq tramp-verbose 0
       tramp-message-show-message nil)
 (when noninteractive (defalias 'tramp-read-passwd 'ignore))
@@ -57,7 +58,18 @@
   (ignore-errors
     (and (file-remote-p file-notify-test-remote-temporary-file-directory)
          (file-directory-p file-notify-test-remote-temporary-file-directory)
-         (file-writable-p file-notify-test-remote-temporary-file-directory))))
+         (file-writable-p file-notify-test-remote-temporary-file-directory)
+         ;; Extracted from tramp-sh-handle-file-notify-add-watch.
+         ;; Even though the "remote" system is just ssh@localhost,
+         ;; the PATH might not be the same as the "local" PATH.
+         ;; Eg this seems to be the case on hydra.nixos.org.
+         ;; Without this, tests fail with:
+         ;; "No file notification program found on /ssh:localhost:"
+         ;; Try to fix PATH instead?
+         (with-parsed-tramp-file-name
+             file-notify-test-remote-temporary-file-directory nil
+             (or (tramp-get-remote-gvfs-monitor-dir v)
+                 (tramp-get-remote-inotifywait v))))))
 
 (defmacro file-notify--deftest-remote (test docstring)
   "Define ert `TEST-remote' for remote files."
diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el
index 28fa47630a8..f83052f5ea1 100644
--- a/test/automated/icalendar-tests.el
+++ b/test/automated/icalendar-tests.el
@@ -428,12 +428,16 @@ Argument EXPECTED-OUTPUT expected iCalendar result string.
 
 European style input data must use german month names.  American
 and ISO style input data must use english month names."
-  (let ((tz (cadr (current-time-zone)))
+  (let ((tz (getenv "TZ"))
         (calendar-date-style 'iso)
         (icalendar-recurring-start-year 2000))
     (unwind-protect
         (progn
-          (set-time-zone-rule "CET")
+;;;       (message "Current time zone: %s" (current-time-zone))
+          ;; Use this form so as not to rely on system tz database.
+          ;; Eg hydra.nixos.org.
+          (setenv "TZ" "CET-1CEST,M3.5.0/2,M10.5.0/3")
+;;;       (message "Current time zone: %s" (current-time-zone))
           (when input-iso
             (let ((calendar-month-name-array
                    ["January" "February" "March" "April" "May" "June" "July" "August"
@@ -461,8 +465,8 @@ and ISO style input data must use english month names."
                     "Saturday"]))
               (setq calendar-date-style 'american)
               (icalendar-tests--do-test-export input-american expected-output))))
-      ;; restore time-zone if something went terribly wrong
-      (set-time-zone-rule tz))))
+      ;; restore time-zone even if something went terribly wrong
+      (setenv "TZ" tz))))
 
 (defun icalendar-tests--do-test-export (input expected-output)
   "Actually perform export test.
@@ -671,37 +675,43 @@ Argument INPUT icalendar event string.
 Argument EXPECTED-ISO expected iso style diary string.
 Argument EXPECTED-EUROPEAN expected european style diary string.
 Argument EXPECTED-AMERICAN expected american style diary string."
-  (let ((timezone (cadr (current-time-zone))))
-    (set-time-zone-rule "CET")
-    (with-temp-buffer
-      (if (string-match "^BEGIN:VCALENDAR" input)
-          (insert input)
-        (insert "BEGIN:VCALENDAR\nPRODID:-//Emacs//NONSGML icalendar.el//EN\n")
-        (insert "VERSION:2.0\nBEGIN:VEVENT\n")
-        (insert input)
-        (unless (eq (char-before) ?\n)
-          (insert "\n"))
-        (insert "END:VEVENT\nEND:VCALENDAR\n"))
-      (let ((icalendar-import-format "%s%d%l%o%t%u%c%U")
-            (icalendar-import-format-summary "%s")
-            (icalendar-import-format-location "\n Location: %s")
-            (icalendar-import-format-description "\n Desc: %s")
-            (icalendar-import-format-organizer "\n Organizer: %s")
-            (icalendar-import-format-status "\n Status: %s")
-            (icalendar-import-format-url "\n URL: %s")
-            (icalendar-import-format-class "\n Class: %s")
-            (icalendar-import-format-uid "\n UID: %s")
-            calendar-date-style)
-        (when expected-iso
-          (setq calendar-date-style 'iso)
-          (icalendar-tests--do-test-import input expected-iso))
-        (when expected-european
-          (setq calendar-date-style 'european)
-          (icalendar-tests--do-test-import input expected-european))
-        (when expected-american
-          (setq calendar-date-style 'american)
-          (icalendar-tests--do-test-import input expected-american))))
-    (set-time-zone-rule timezone)))
+  (let ((timezone (getenv "TZ")))
+    (unwind-protect
+        (progn
+;;;       (message "Current time zone: %s" (current-time-zone))
+          ;; Use this form so as not to rely on system tz database.
+          ;; Eg hydra.nixos.org.
+          (setenv "TZ" "CET-1CEST,M3.5.0/2,M10.5.0/3")
+;;;       (message "Current time zone: %s" (current-time-zone))
+          (with-temp-buffer
+            (if (string-match "^BEGIN:VCALENDAR" input)
+                (insert input)
+              (insert "BEGIN:VCALENDAR\nPRODID:-//Emacs//NONSGML icalendar.el//EN\n")
+              (insert "VERSION:2.0\nBEGIN:VEVENT\n")
+              (insert input)
+              (unless (eq (char-before) ?\n)
+                (insert "\n"))
+              (insert "END:VEVENT\nEND:VCALENDAR\n"))
+            (let ((icalendar-import-format "%s%d%l%o%t%u%c%U")
+                  (icalendar-import-format-summary "%s")
+                  (icalendar-import-format-location "\n Location: %s")
+                  (icalendar-import-format-description "\n Desc: %s")
+                  (icalendar-import-format-organizer "\n Organizer: %s")
+                  (icalendar-import-format-status "\n Status: %s")
+                  (icalendar-import-format-url "\n URL: %s")
+                  (icalendar-import-format-class "\n Class: %s")
+                  (icalendar-import-format-uid "\n UID: %s")
+                  calendar-date-style)
+              (when expected-iso
+                (setq calendar-date-style 'iso)
+                (icalendar-tests--do-test-import input expected-iso))
+              (when expected-european
+                (setq calendar-date-style 'european)
+                (icalendar-tests--do-test-import input expected-european))
+              (when expected-american
+                (setq calendar-date-style 'american)
+                (icalendar-tests--do-test-import input expected-american)))))
+      (setenv "TZ" timezone))))
 
 (defun icalendar-tests--do-test-import (input expected-output)
   "Actually perform import test.
diff --git a/test/automated/mule-util.el b/test/automated/mule-util.el
new file mode 100644
index 00000000000..3e269faad75
--- /dev/null
+++ b/test/automated/mule-util.el
@@ -0,0 +1,84 @@
+;;; mule-util --- tests for international/mule-util.el -*- coding: utf-8; -*-
+
+;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; 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 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
+;; 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert)
+(require 'mule-util)
+
+(defconst mule-util-test-truncate-data
+  '((("" 0) . "")
+    (("x" 1) . "x")
+    (("xy" 1) . "x")
+    (("xy" 2 1) . "y")
+    (("xy" 0) . "")
+    (("xy" 3) . "xy")
+    (("中" 0) . "")
+    (("中" 1) . "")
+    (("中" 2) . "中")
+    (("中" 1 nil ? ) . " ")
+    (("中文" 3 1 ? ) . "  ")
+    (("x中x" 2) . "x")
+    (("x中x" 3) . "x中")
+    (("x中x" 3) . "x中")
+    (("x中x" 4 1) . "中x")
+    (("kor한e글an" 8 1 ? ) . "or한e글")
+    (("kor한e글an" 7 2 ? ) . "r한e ")
+    (("" 0 nil nil "...") . "")
+    (("x" 3 nil nil "...") . "x")
+    (("中" 3 nil nil "...") . "中")
+    (("foo" 3 nil nil "...") . "foo")
+    (("foo" 2 nil nil "...") . "fo") ;; XEmacs failure?
+    (("foobar" 6 0 nil "...") . "foobar")
+    (("foobarbaz" 6 nil nil "...") . "foo...")
+    (("foobarbaz" 7 2 nil "...") . "ob...")
+    (("foobarbaz" 9 3 nil "...") . "barbaz")
+    (("こhんeにlちlはo" 15 1 ?  t) . " hんeにlちlはo")
+    (("こhんeにlちlはo" 14 1 ?  t) . " hんeにlち...")
+    (("x" 3 nil nil "粵語") . "x")
+    (("中" 2 nil nil "粵語") . "中")
+    (("中" 1 nil ?x "粵語") . "x") ;; XEmacs error
+    (("中文" 3 nil ?  "粵語") . "中 ") ;; XEmacs error
+    (("foobarbaz" 4 nil nil  "粵語") . "粵語")
+    (("foobarbaz" 5 nil nil  "粵語") . "f粵語")
+    (("foobarbaz" 6 nil nil  "粵語") . "fo粵語")
+    (("foobarbaz" 8 3 nil "粵語") . "b粵語")
+    (("こhんeにlちlはo" 14 4 ?x "日本語") . "xeに日本語")
+    (("こhんeにlちlはo" 13 4 ?x "日本語") . "xex日本語")
+    )
+  "Test data for `truncate-string-to-width'.")
+
+(defun mule-util-test-truncate-create (n)
+  "Create a test for element N of the `mule-util-test-truncate-data' constant."
+  (let ((testname (intern (format "mule-util-test-truncate-%.2d" n)))
+        (testdoc (format "Test element %d of `mule-util-test-truncate-data'."
+                         n))
+        (testdata (nth n mule-util-test-truncate-data)))
+    (eval
+     `(ert-deftest ,testname ()
+        ,testdoc
+        (should (equal (apply 'truncate-string-to-width ',(car testdata))
+                              ,(cdr testdata)))))))
+
+(dotimes (i (length mule-util-test-truncate-data))
+  (mule-util-test-truncate-create i))
+
+;;; mule-util.el ends here
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index a5f0ebb1f94..799009063e1 100755
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
@@ -85,9 +85,6 @@
   (expand-file-name "archive-contents" package-test-data-dir)
   "Path to a static copy of \"archive-contents\".")
 
-(defvar package-test-built-file-suffixes '(".tar" "/dir" "/*.info")
-  "Remove these files when cleaning up a built package.")
-
 (cl-defmacro with-package-test ((&optional &key file
                                            basedir
                                            install
@@ -142,33 +139,6 @@
     (let ((help-xref-following t))
       ,@body)))
 
-(autoload 'makeinfo-buffer "makeinfo")
-(defvar compilation-in-progress)
-
-(defun package-test-install-texinfo (file)
-  "Install from texinfo FILE.
-
-FILE should be a .texinfo file relative to the current
-`default-directory'"
-  (require 'info)
-  (let* ((full-file (expand-file-name file))
-         (info-file (replace-regexp-in-string "\\.texi\\'" ".info" full-file))
-         (old-info-defn (symbol-function 'Info-revert-find-node)))
-    (require 'info)
-    (setf (symbol-function 'Info-revert-find-node) #'ignore)
-    (with-current-buffer (find-file-literally full-file)
-      (unwind-protect
-          (progn
-            (makeinfo-buffer)
-            ;; Give `makeinfo-buffer' a chance to finish
-            (while compilation-in-progress
-              (sit-for 0.1))
-            (call-process "ginstall-info" nil nil nil
-                          (format "--info-dir=%s" default-directory)
-                          (format "%s" info-file)))
-        (kill-buffer)
-        (setf (symbol-function 'Info-revert-find-node) old-info-defn)))))
-
 (defun package-test-strip-version (dir)
   (replace-regexp-in-string "-pkg\\.el\\'" "" (package--description-file dir)))
 
@@ -178,14 +148,6 @@ FILE should be a .texinfo file relative to the current
    '(lambda (item) (file-expand-wildcards (concat base item)))
    suffix-list))
 
-(defun package-test-cleanup-built-files (dir)
-  "Remove files which were the result of creating a tar archive.
-
-DIR is the base name of the package directory, without the trailing slash"
-  (let* ((pkg-dirname (file-name-nondirectory dir)))
-    (dolist (file (package-test-suffix-matches dir package-test-built-file-suffixes))
-      (delete-file file))))
-
 (defvar tar-parse-info)
 (declare-function tar-header-name "tar-mode" (cl-x) t) ; defstruct
 
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index fdae235ad38..ef1c0155ab5 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -1792,6 +1792,34 @@ class Foo(object):
                (cons "foo2 (def)" (copy-marker 77)))))
             (python-imenu-create-index)))))
 
+(ert-deftest python-imenu-create-index-4 ()
+  (python-tests-with-temp-buffer
+   "
+class Foo(object):
+    class Bar(object):
+        def __init__(self):
+            pass
+
+        def __str__(self):
+            pass
+
+    def __init__(self):
+            pass
+"
+   (goto-char (point-max))
+   (should (equal
+            (list
+             (list
+              "Foo (class)"
+              (cons "*class definition*" (copy-marker 2))
+              (list
+               "Bar (class)"
+               (cons "*class definition*" (copy-marker 21))
+               (cons "__init__ (def)" (copy-marker 44))
+               (cons "__str__ (def)" (copy-marker 90)))
+              (cons "__init__ (def)" (copy-marker 135))))
+            (python-imenu-create-index)))))
+
 (ert-deftest python-imenu-create-flat-index-1 ()
   (python-tests-with-temp-buffer
    "
@@ -1851,6 +1879,30 @@ class Baz(object):
                   (cons "Baz.Frob.c" (copy-marker 626)))
             (python-imenu-create-flat-index)))))
 
+(ert-deftest python-imenu-create-flat-index-2 ()
+  (python-tests-with-temp-buffer
+   "
+class Foo(object):
+    class Bar(object):
+        def __init__(self):
+            pass
+
+        def __str__(self):
+            pass
+
+    def __init__(self):
+            pass
+"
+   (goto-char (point-max))
+   (should (equal
+            (list
+             (cons "Foo" (copy-marker 2))
+             (cons "Foo.Bar" (copy-marker 21))
+             (cons "Foo.Bar.__init__" (copy-marker 44))
+             (cons "Foo.Bar.__str__" (copy-marker 90))
+             (cons "Foo.__init__"  (copy-marker 135)))
+            (python-imenu-create-flat-index)))))
+
 
 ;;; Misc helpers
 
diff --git a/test/automated/undo-tests.el b/test/automated/undo-tests.el
index 87c55c5d374..7b6989a5ef0 100644
--- a/test/automated/undo-tests.el
+++ b/test/automated/undo-tests.el
@@ -124,7 +124,7 @@
     (undo-boundary)
     (insert " Zero")
     (undo-boundary)
-    (push-mark)
+    (push-mark nil t)
     (delete-region (save-excursion
                      (forward-word -1)
                      (point)) (point))
@@ -172,7 +172,7 @@
     (insert " BEE")
     (undo-boundary)
     (setq buffer-undo-list (cons '(0.0 bogus) buffer-undo-list))
-    (push-mark)
+    (push-mark nil t)
     (delete-region (save-excursion
                      (forward-word -1)
                      (point)) (point))
diff --git a/test/automated/zlib-tests.el b/test/automated/zlib-tests.el
new file mode 100644
index 00000000000..d03d4c981b8
--- /dev/null
+++ b/test/automated/zlib-tests.el
@@ -0,0 +1,40 @@
+;;; zlib-tests.el --- Test suite for zlib.
+
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
+;; Author: Lars Ingebrigtsen <larsi@gnus.org>
+
+;; This file is part of GNU Emacs.
+
+;; 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 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
+;; 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'ert)
+
+(ert-deftest zlib--decompress ()
+  "Test decompressing a gzipped file."
+  (when (and (fboundp 'zlib-available-p)
+             (zlib-available-p))
+    (should (string=
+             (with-temp-buffer
+               (set-buffer-multibyte nil)
+               (insert-file-contents-literally "data/decompress/foo-gzipped")
+               (zlib-decompress-region (point-min) (point-max))
+               (buffer-string))
+             "foo\n"))))
+
+(provide 'zlib-tests)
+
+;;; zlib-tests.el ends here.