Use just DOC instead of DOC-nn.mm.

* lisp/loadup.el: Just use unversioned DOC.
* Makefile.in (install-doc): DOC file is not version specific any more.
* .bzrignore: Don't ignore DOC-* any more.
* admin/quick-install-emacs: Don't prune DOC-* files a any more.
* doc/lispref/loading.texi (Autoload):
* doc/lispref/help.texi (Documentation Basics, Accessing Documentation)
(Accessing Documentation, Accessing Documentation): DOC-* is now DOC.
* etc/.gitignore: Don't ignore DOC-* any more.
* lib-src/makefile.w32-in ($(DOC)): Use DOC rather than DOC-X.
* msdos/sed1x.inp: Don't rewrite DOC any more.
* nt/makefile.w32-in (clean, top-distclean): DOC-X doesn't exist any more.
* src/Makefile.in (bootstrap-clean): DOC-* doesn't exist any more.
* src/makefile.w32-in (DOC): Use just "DOC".

2 files changed, 6 insertions, 16 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f620dfb00a..b96d830e807 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * loadup.el: Just use unversioned DOC.
+
         * nxml/nxml-mode.el: Treat unclosed <[[, <?, comment, and other
         literals as extending to EOB.
         (nxml-last-fontify-end): Remove unused variable.
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 00c52341058..a2e0d8ecec5 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -305,22 +305,10 @@
 (message "Finding pointers to doc strings...")
 (if (or (equal (nth 3 command-line-args) "dump")
         (equal (nth 4 command-line-args) "dump"))
-    (let ((name emacs-version))
-      (while (string-match "[^-+_.a-zA-Z0-9]+" name)
-        (setq name (concat (downcase (substring name 0 (match-beginning 0)))
-                           "-"
-                           (substring name (match-end 0)))))
-      (if (memq system-type '(ms-dos windows-nt))
-          (setq name (expand-file-name
-                      (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc"))
-        (setq name (concat (expand-file-name "../etc/DOC-") name))
-        (if (file-exists-p name)
-            (delete-file name))
-        (copy-file (expand-file-name "../etc/DOC") name t))
-      (Snarf-documentation (file-name-nondirectory name)))
-    (condition-case nil
-        (Snarf-documentation "DOC")
-      (error nil)))
+    (Snarf-documentation "DOC")
+  (condition-case nil
+      (Snarf-documentation "DOC")
+    (error nil)))
 (message "Finding pointers to doc strings...done")
 
 ;; Note: You can cause additional libraries to be preloaded