upstream, doesn build yet

6 files changed, 60 insertions, 29 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 94bb94357b9..35de784f852 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -46,7 +46,7 @@ HAVE_PROCFS     The /proc filesystem is supported.
 REL_ALLOC       Compile in the relocatable memory allocator ralloc.c.
 SYSTEM_MALLOC   Use the system library's malloc.
 subprocesses    System can use subprocesses (for M-x shell for example).  Defined by default, only MSDOS undefines it.
-USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type instead of the default int.
+DEBUG_LISP_OBJECT_TYPE Define it in lisp.h enable compile time checks on Lisp_Object use.
 
 ** System specific macros, described in detail in src/s/template.h
 CLASH_DETECTION
@@ -156,7 +156,6 @@ HAVE_STRERROR
 HAVE_STRFTIME
 HAVE_STRING_H
 HAVE_STRUCT_UTIMBUF
-HAVE_SYSV_SIGPAUSE
 HAVE_SYS_SELECT_H
 HAVE_SYS_SYSTEMINFO_H
 HAVE_SYS_TIMEB_H
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 0c3bbf93873..e3b35906ace 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,19 @@
+2012-06-13  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * make-emacs: Rename --union-type to --check-lisp-type.  Define
+        CHECK_LISP_OBJECT_TYPE insted of USE_LISP_UNION_TYPE.
+        * CPP-DEFINES (DEBUG_LISP_OBJECT_TYPE): Renamed from
+        USE_LISP_UNION_TYPE.
+
+2012-06-03  Glenn Morris  <rgm@gnu.org>
+
+        * quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove rcs-checkin.
+
+2012-06-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove --disable-maintainer-mode option from 'configure'.  (Bug#11555)
+        * make-tarball.txt: Don't worry about maintainer mode.
+
 2012-05-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         * CPP-DEFINES: Remove HAVE_SYSINFO.
diff --git a/admin/admin.el b/admin/admin.el
index 27b2b3ab648..9fcc5795d21 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -240,7 +240,7 @@ Root must be the root of an Emacs source tree."
       (manual-txt texi (expand-file-name "emacs.txt" txt-dir))
       (manual-pdf texi (expand-file-name "emacs.pdf" dest))
       (manual-dvi texi (expand-file-name "emacs.dvi" dvi-dir)
-                  (expand-file-name "emacs.ps" ps-dir)))
+                  (expand-file-name "emacs.ps" ps-dir)))
     ;; Lisp manual
     (let ((texi (expand-file-name "doc/lispref/elisp.texi" root)))
       (manual-html-node texi (expand-file-name "elisp" html-node-dir))
@@ -248,7 +248,20 @@ Root must be the root of an Emacs source tree."
       (manual-txt texi (expand-file-name "elisp.txt" txt-dir))
       (manual-pdf texi (expand-file-name "elisp.pdf" dest))
       (manual-dvi texi (expand-file-name "elisp.dvi" dvi-dir)
-                  (expand-file-name "elisp.ps" ps-dir)))
+                  (expand-file-name "elisp.ps" ps-dir)))
+    ;; Misc manuals
+    (let ((manuals '("ada-mode" "auth" "autotype" "calc" "cc-mode"
+                     "cl" "dbus" "dired-x" "ebrowse" "ede" "ediff"
+                     "edt" "eieio" "emacs-mime" "epa" "erc" "ert"
+                     "eshell" "eudc" "faq" "flymake" "forms"
+                     "gnus" "emacs-gnutls" "idlwave" "info"
+                     "mairix-el" "message" "mh-e" "newsticker"
+                     "nxml-mode" "org" "pcl-cvs" "pgg" "rcirc"
+                     "remember" "reftex" "sasl" "sc" "semantic"
+                     "ses" "sieve" "smtpmail" "speedbar" "tramp"
+                     "url" "vip" "viper" "widget" "woman")))
+      (dolist (manual manuals)
+        (manual-misc-html manual root html-node-dir html-mono-dir)))
     (message "Manuals created in %s" dest)))
 
 (defconst manual-doctype-string
@@ -265,6 +278,12 @@ Root must be the root of an Emacs source tree."
 (defconst manual-style-string "<style type=\"text/css\">
 @import url('/style.css');\n</style>\n")
 
+(defun manual-misc-html (name root html-node-dir html-mono-dir)
+  (let ((texi (expand-file-name (format "doc/misc/%s.texi" name) root)))
+    (manual-html-node texi (expand-file-name name html-node-dir))
+    (manual-html-mono texi (expand-file-name (concat name ".html")
+                                             html-mono-dir))))
+
 (defun manual-html-mono (texi-file dest)
   "Run Makeinfo on TEXI-FILE, emitting mono HTML output to DEST.
 This function also edits the HTML files so that they validate as
@@ -307,13 +326,15 @@ the @import directive."
               (let (copyright-text)
                 (manual-html-fix-index-1)
                 ;; Move copyright notice to the end.
-                (re-search-forward "[ \t]*<p>Copyright &copy;")
-                (setq opoint (match-beginning 0))
-                (re-search-forward "</blockquote>")
-                (setq copyright-text (buffer-substring opoint (point)))
-                (delete-region opoint (point))
+                (when (re-search-forward "[ \t]*<p>Copyright &copy;" nil t)
+                  (setq opoint (match-beginning 0))
+                  (re-search-forward "</blockquote>")
+                  (setq copyright-text (buffer-substring opoint (point)))
+                  (delete-region opoint (point)))
                 (manual-html-fix-index-2)
-                (insert copyright-text "\n</div>\n"))
+                (if copyright-text
+                    (insert copyright-text))
+                (insert "\n</div>\n"))
             ;; For normal nodes, give the header div a blue bg.
             (manual-html-fix-node-div))
           (save-buffer))))))
@@ -369,9 +390,9 @@ Also generate PostScript output in PS-DEST."
 
 (defun manual-html-fix-index-1 ()
   (let (opoint)
-    (re-search-forward "<body>\n\\(<h1 class=\"settitle\\)")
-    (setq opoint (match-beginning 1))
-    (search-forward "<h2 class=\"unnumbered")
+    (re-search-forward "<body>\n")
+    (setq opoint (match-end 0))
+    (search-forward "<h2 class=\"")
     (goto-char (match-beginning 0))
     (delete-region opoint (point))
     (insert "<div id=\"content\" class=\"inner\">\n\n")))
@@ -380,7 +401,8 @@ Also generate PostScript output in PS-DEST."
   "Replace the index list in the current buffer with a HTML table."
   (let (done open-td tag desc)
     ;; Convert the list that Makeinfo made into a table.
-    (search-forward "<ul class=\"menu\">")
+    (or (search-forward "<ul class=\"menu\">" nil t)
+        (search-forward "<ul>"))
     (replace-match "<table style=\"float:left\" width=\"100%\">")
     (forward-line 1)
     (while (not done)
@@ -413,7 +435,7 @@ Also generate PostScript output in PS-DEST."
         (replace-match "  </td></tr></table>\n
 <h3>Detailed Node Listing</h3>\n\n" t t)
         (search-forward "<p>")
-        (search-forward "<p>")
+        (search-forward "<p>" nil t)
         (goto-char (match-beginning 0))
         (skip-chars-backward "\n ")
         (setq open-td nil)
@@ -427,8 +449,8 @@ Also generate PostScript output in PS-DEST."
           (setq open-td nil))
         (insert "  <tr>
     <th colspan=\"2\" align=\"left\" style=\"text-align:left\">")
-        (re-search-forward "</p>[ \t\n]*<ul class=\"menu\">")
-        (replace-match "  </th></tr>"))
+        (if (re-search-forward "</p>[ \t\n]*<ul class=\"menu\">" nil t)
+            (replace-match "  </th></tr>")))
        ((looking-at "[ \t]*</ul>[ \t]*$")
         (replace-match
          (if open-td
diff --git a/admin/make-emacs b/admin/make-emacs
index f64d51b0c41..688f5c196bf 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -42,7 +42,7 @@ $rc = GetOptions ("help" => \$help,
                   "check-marked" => \$check_marked,
                   "all" => \$all,
                   "no-optim" => \$no_optim,
-                  "union-type" => \$union_type,
+                  "check-lisp-type" => \$check_lisp_type,
                   "gprof" => \$profile,
                   "malloc-check" => \$malloc_check,
                   "no-mcheck" => \$no_mcheck,
@@ -70,7 +70,7 @@ Build Emacs.
  --check-marked         GC_CHECK_MARKED_OBJECTS=1
  --optim                no debug defines
  --gprof                make Emacs for profiling
- --union-type           define USE_LISP_UNION_TYPE (bad for GDB)
+ --check-lisp-type      define CHECK_LISP_OBJECT_TYPE
  --malloc-check         define GC_MALLOC_CHECK
  --no-mcheck            don't define GC_MCHECK
  --wall                 compile with -Wall
@@ -140,7 +140,7 @@ else
       }
   }
 
-$defs = "$defs -DUSE_LISP_UNION_TYPE" if $union_type;
+$defs = "$defs -DCHECK_LISP_OBJECT_TYPE" if $check_lisp_type;
 $defs = "$defs -DGC_MALLOC_CHECK=1 -DGC_PROTECT_MALLOC_STATE=1" if $malloc_check;
 $defs = "$defs -DGC_MCHECK=1" unless $no_mcheck;
 
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 0acd29bbc13..ea9c4a3c2d1 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -28,13 +28,7 @@ For each step, check for possible errors.
     refer to a newer release of Emacs.  (This is probably needed only
     when preparing a major Emacs release, or branching for it.)
 
-5.  Edit configure.in so that maintainer-mode is off by default.
-    (FIXME - need to find a better way of dealing with this.
-     Or maybe it's fine and indeed correct to leave it on?
-     See http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg00859.html
-     and subsequent.)
-
-     autoreconf -i -I m4 --force
+5.   autoreconf -i -I m4 --force
      make bootstrap
 
 6.  Commit etc/AUTHORS, all the files changed by M-x set-version, and
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 06cd2d40901..7004e8f1b27 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -1,7 +1,7 @@
 #!/bin/sh
 ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
 
-## Copyright (C) 2001-2012  Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 ## Author: Miles Bader <miles@gnu.org>
 
@@ -28,7 +28,7 @@
 
 
 PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse'
-PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin'
+PUBLIC_LIBSRC_SCRIPTS='grep-changelog'
 
 AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"