Minor fixes for MSDOS build to track latest changes.

 msdos/sed6.inp (INFO_EXT): Edit to .info.
 (INFO_OPTS): Edit to --no-split.
 lisp/cus-start.el <vertical-centering-font-regexp>: Avoid warning on
 platforms that don't link in fontset.c.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 53950bc..40295f6 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-25  Leo Liu  <sdl.web@gmail.com>
+
+       * url-http.el (url-http-codes): Fix mal-formed defconst.
+
 2012-05-15  Ian Eure  <ian@simplegeo.com>
 
        * url-util.el (url-build-query-string): New function (Bug#8706).

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index ff026da..fbefdbb 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -110,8 +110,8 @@ request.")
     (503 service-unavailable             "Service unavailable")
     (504 gateway-timeout                 "Gateway time-out")
     (505 http-version-not-supported      "HTTP version not supported")
-    (507 insufficient-storage            "Insufficient storage")
-"The HTTP return codes and their text."))
+    (507 insufficient-storage            "Insufficient storage"))
+  "The HTTP return codes and their text.")
 
 ;(eval-when-compile
 ;; These are all macros so that they are hidden from external sight