Merged from mwolson@gnu.org--2006 (patch 72)

Patches applied:

 * mwolson@gnu.org--2006/muse--main--1.0--patch-72
   httpd.el: Update to work with newer versions of Emacs.
git-archimport-id: mwolson@gnu.org--2006-muse-el/muse-el--devel--0--patch-30

ChangeLog.2006

@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2006/muse--main--1.0
 #
 
+2006-03-25 05:57:36 GMT	Michael Olson <mwolson@gnu.org>	patch-72
+
+    Summary:
+      httpd.el: Update to work with newer versions of Emacs.
+    Revision:
+      muse--main--1.0--patch-72
+
+    * contrib/httpd.el (httpd-start): Update this to work with newer versions
+      of Emacs.
+
+    modified files:
+     ChangeLog.2006 contrib/httpd.el
+
+
 2006-03-25 05:27:46 GMT	Michael Olson <mwolson@gnu.org>	patch-71
 
     Summary:

contrib/httpd.el

@@ -2,9 +2,10 @@
 ;;;
 ;;; Author: Eric Marsden <emarsden@laas.fr>
 ;;;         John Wiegley <johnw@gnu.org>
-;;; Version: 1.0
+;;; Version: 1.1
 ;;; Keywords: games
 ;;; Copyright (C) 2001, 2003 Eric Marsden
+;;; Parts copyright (C) 2006 Free Software Foundation, Inc.
 ;;
 ;;     This program is free software; you can redistribute it and/or
 ;;     modify it under the terms of the GNU General Public License as
@@ -35,6 +36,8 @@
 ;; I have only tested this code with Emacs; it may need modifications
 ;; to work with XEmacs.
 ;;
+;; This version has been modified to work with GNU Emacs 21 and 22.
+;;
 ;;; Acknowledgements:
 ;;
 ;; httpd.el was inspired by pshttpd, an HTTP server written in
@@ -258,8 +261,14 @@ content.")
   (if httpd-process
       (delete-process httpd-process))
   (setq httpd-process
-	(open-network-stream-server "httpd" (generate-new-buffer "httpd")
-				    port nil 'httpd-serve))
+	(if (fboundp 'make-network-process)
+	    (make-network-process :name "httpd"
+				  :buffer (generate-new-buffer "httpd")
+				  :host 'local :service port
+				  :server t :noquery t
+				  :filter 'httpd-serve)
+	  (open-network-stream-server "httpd" (generate-new-buffer "httpd")
+				      port nil 'httpd-serve)))
   (if (eq (process-status httpd-process) 'listen)
       (message "httpd.el is listening on port %d" port)))