[Emacs-diffs] xwidget fe27c32 12/13: a missing merge

[Joakim Verona]

branch: xwidget
commit fe27c32fac14ce321ef99c91cf9676a42b2966df
Author: jave <address@hidden>
Commit: jave <address@hidden>

    a missing merge
---
 test/automated/data/decompress/foo-gzipped         |  Bin 0 -> 30 bytes
 test/automated/data/package/multi-file-readme.txt  |    1 +
 .../data/package/newer-versions/archive-contents   |   13 +++++++
 .../data/package/newer-versions/new-pkg-1.0.el     |   18 ++++++++++
 .../package/newer-versions/simple-single-1.4.el    |   36 ++++++++++++++++++++
 test/automated/data/package/simple-depend-1.0.el   |   17 +++++++++
 .../data/package/simple-single-readme.txt          |    3 ++
 7 files changed, 88 insertions(+), 0 deletions(-)

diff --git a/test/automated/data/decompress/foo-gzipped 
b/test/automated/data/decompress/foo-gzipped
new file mode 100644
index 0000000..a68653f
Binary files /dev/null and b/test/automated/data/decompress/foo-gzipped differ
diff --git a/test/automated/data/package/multi-file-readme.txt 
b/test/automated/data/package/multi-file-readme.txt
new file mode 100644
index 0000000..affd2e9
--- /dev/null
+++ b/test/automated/data/package/multi-file-readme.txt
@@ -0,0 +1 @@
+This is a bare-bones readme file for the multi-file package.
diff --git a/test/automated/data/package/newer-versions/archive-contents 
b/test/automated/data/package/newer-versions/archive-contents
new file mode 100644
index 0000000..add5f29
--- /dev/null
+++ b/test/automated/data/package/newer-versions/archive-contents
@@ -0,0 +1,13 @@
+(1
+ (simple-single .
+                [(1 4)
+                 nil "A single-file package with no dependencies" single])
+ (simple-depend .
+                [(1 0)
+                 ((simple-single (1 3))) "A single-file package with a 
dependency." single])
+ (new-pkg .
+                [(1 0)
+                 nil "A package only seen after "updating" archive-contents" 
single])
+ (multi-file .
+             [(0 2 3)
+              nil "Example of a multi-file tar package" tar]))
diff --git a/test/automated/data/package/newer-versions/new-pkg-1.0.el 
b/test/automated/data/package/newer-versions/new-pkg-1.0.el
new file mode 100644
index 0000000..7251622
--- /dev/null
+++ b/test/automated/data/package/newer-versions/new-pkg-1.0.el
@@ -0,0 +1,18 @@
+;;; new-pkg.el --- A package only seen after "updating" archive-contents
+
+;; Author: J. R. Hacker <address@hidden>
+;; Version: 1.0
+
+;;; Commentary:
+
+;; This will only show up after updating "archive-contents".
+
+;;; Code:
+
+(defun new-pkg-frob ()
+  "Ignore me."
+  (ignore))
+
+(provide 'new-pkg)
+
+;;; new-pkg.el ends here
diff --git a/test/automated/data/package/newer-versions/simple-single-1.4.el 
b/test/automated/data/package/newer-versions/simple-single-1.4.el
new file mode 100644
index 0000000..7d8178c
--- /dev/null
+++ b/test/automated/data/package/newer-versions/simple-single-1.4.el
@@ -0,0 +1,36 @@
+;;; simple-single.el --- A single-file package with no dependencies
+
+;; Author: J. R. Hacker <address@hidden>
+;; Version: 1.4
+;; Keywords: frobnicate
+
+;;; Commentary:
+
+;; This package provides a minor mode to frobnicate and/or bifurcate
+;; any flanges you desire. To activate it, type "C-M-r M-3 butterfly"
+;; and all your dreams will come true.
+;;
+;; This is a new, updated version.
+
+;;; Code:
+
+(defgroup simple-single nil "Simply a file"
+  :group 'lisp)
+
+(defcustom simple-single-super-sunday nil
+  "How great is this?
+Default changed to `nil'."
+  :type 'boolean
+  :group 'simple-single
+  :package-version "1.4")
+
+(defvar simple-single-sudo-sandwich nil
+  "Make a sandwich?")
+
+;;;###autoload
+(define-minor-mode simple-single-mode
+  "It does good things to stuff")
+
+(provide 'simple-single)
+
+;;; simple-single.el ends here
diff --git a/test/automated/data/package/simple-depend-1.0.el 
b/test/automated/data/package/simple-depend-1.0.el
new file mode 100644
index 0000000..b58b658
--- /dev/null
+++ b/test/automated/data/package/simple-depend-1.0.el
@@ -0,0 +1,17 @@
+;;; simple-depend.el --- A single-file package with a dependency.
+
+;; Author: J. R. Hacker <address@hidden>
+;; Version: 1.0
+;; Keywords: frobnicate
+;; Package-Requires: ((simple-single "1.3"))
+
+;;; Commentary:
+
+;; Depends on another package.
+
+;;; Code:
+
+(defvar simple-depend "Value"
+  "Some trivial code")
+
+;;; simple-depend.el ends here
diff --git a/test/automated/data/package/simple-single-readme.txt 
b/test/automated/data/package/simple-single-readme.txt
new file mode 100644
index 0000000..25d3034
--- /dev/null
+++ b/test/automated/data/package/simple-single-readme.txt
@@ -0,0 +1,3 @@
+This package provides a minor mode to frobnicate and/or bifurcate
+any flanges you desire. To activate it, type "C-M-r M-3 butterfly"
+and all your dreams will come true.