From 0c7cd527b49916f67a7e6e3b6248fcd40aa96460 Mon Sep 17 00:00:00 2001
From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Wed, 15 Jul 2015 08:02:40 +0200
Subject: [PATCH] new version of simple-httpd.

---
 .../simple-httpd-20140908.1908/simple-httpd-pkg.el |  1 -
 .../simple-httpd-autoloads.el                      | 13 +++----------
 .../simple-httpd-20150430.1755/simple-httpd-pkg.el |  1 +
 .../simple-httpd.el                                | 14 +++++++++-----
 4 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 elpa/simple-httpd-20140908.1908/simple-httpd-pkg.el
 rename elpa/{simple-httpd-20140908.1908 => simple-httpd-20150430.1755}/simple-httpd-autoloads.el (73%)
 create mode 100644 elpa/simple-httpd-20150430.1755/simple-httpd-pkg.el
 rename elpa/{simple-httpd-20140908.1908 => simple-httpd-20150430.1755}/simple-httpd.el (98%)

diff --git a/elpa/simple-httpd-20140908.1908/simple-httpd-pkg.el b/elpa/simple-httpd-20140908.1908/simple-httpd-pkg.el
deleted file mode 100644
index f3d31e66..00000000
--- a/elpa/simple-httpd-20140908.1908/simple-httpd-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "simple-httpd" "20140908.1908" "pure elisp HTTP server" (quote ((cl-lib "0.3"))))
diff --git a/elpa/simple-httpd-20140908.1908/simple-httpd-autoloads.el b/elpa/simple-httpd-20150430.1755/simple-httpd-autoloads.el
similarity index 73%
rename from elpa/simple-httpd-20140908.1908/simple-httpd-autoloads.el
rename to elpa/simple-httpd-20150430.1755/simple-httpd-autoloads.el
index c5f68a9d..1defc34f 100644
--- a/elpa/simple-httpd-20140908.1908/simple-httpd-autoloads.el
+++ b/elpa/simple-httpd-20150430.1755/simple-httpd-autoloads.el
@@ -1,10 +1,10 @@
 ;;; simple-httpd-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads (httpd-serve-directory httpd-stop httpd-start)
-;;;;;;  "simple-httpd" "simple-httpd.el" (21595 16734 0 0))
+;;;### (autoloads nil "simple-httpd" "simple-httpd.el" (21908 14190
+;;;;;;  0 0))
 ;;; Generated autoloads from simple-httpd.el
 
 (autoload 'httpd-start "simple-httpd" "\
@@ -26,16 +26,9 @@ Start the web server with given `directory' as `httpd-root'.
 
 ;;;***
 
-;;;### (autoloads nil nil ("simple-httpd-pkg.el") (21595 16734 18122
-;;;;;;  0))
-
-;;;***
-
-(provide 'simple-httpd-autoloads)
 ;; Local Variables:
 ;; version-control: never
 ;; no-byte-compile: t
 ;; no-update-autoloads: t
-;; coding: utf-8
 ;; End:
 ;;; simple-httpd-autoloads.el ends here
diff --git a/elpa/simple-httpd-20150430.1755/simple-httpd-pkg.el b/elpa/simple-httpd-20150430.1755/simple-httpd-pkg.el
new file mode 100644
index 00000000..70138c3b
--- /dev/null
+++ b/elpa/simple-httpd-20150430.1755/simple-httpd-pkg.el
@@ -0,0 +1 @@
+(define-package "simple-httpd" "20150430.1755" "pure elisp HTTP server" '((cl-lib "0.3")) :url "https://github.com/skeeto/emacs-http-server")
diff --git a/elpa/simple-httpd-20140908.1908/simple-httpd.el b/elpa/simple-httpd-20150430.1755/simple-httpd.el
similarity index 98%
rename from elpa/simple-httpd-20140908.1908/simple-httpd.el
rename to elpa/simple-httpd-20150430.1755/simple-httpd.el
index 3ba5b0ab..ffbc502c 100644
--- a/elpa/simple-httpd-20140908.1908/simple-httpd.el
+++ b/elpa/simple-httpd-20150430.1755/simple-httpd.el
@@ -4,8 +4,8 @@
 
 ;; Author: Christopher Wellons <wellons@nullprogram.com>
 ;; URL: https://github.com/skeeto/emacs-http-server
-;; Version: 20140908.1908
-;; X-Original-Version: 1.4.5
+;; Package-Version: 20150430.1755
+;; Version: 1.4.6
 ;; Package-Requires: ((cl-lib "0.3"))
 
 ;;; Commentary:
@@ -96,6 +96,9 @@
 
 ;;; History:
 
+;; Version 1.4.6: fixes
+;;   * Added httpd-serve-directory
+;;   * Fix some encoding issues
 ;; Version 1.4.5: fixes
 ;;   * Update to cl-lib from cl
 ;; Version 1.4.4: features
@@ -443,11 +446,12 @@ A servlet that says hello,
   "Parse an endpoint definition template for use with `defservlet*'."
   (cl-loop for item in (split-string (symbol-name symbol) "/")
            for n upfrom 0
-           when (eql (aref item 0) ?:)
+           when (and (> (length item) 0) (eql (aref item 0) ?:))
            collect (cons (intern (substring item 1)) n) into vars
            else collect item into path
-           finally (return
-                    (cl-values (intern (mapconcat #'identity path "/")) vars))))
+           finally
+           (cl-return
+            (cl-values (intern (mapconcat #'identity path "/")) vars))))
 
 (defvar httpd-path nil
   "Anaphoric variable for `defservlet*'.")
-- 
2.47.3