Merge from trunk.

4 files changed, 48 insertions, 25 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ac2323c77d0..a3a756bde64 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-10  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
+
+        * unidata/Makefile.in: Add FSF copyright.
+        Make it use autoconf features, and work for out-of-tree builds.
+
 2012-04-07  Eli Zaretskii  <eliz@gnu.org>
 
         * unidata/README:
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index f1bfa35a2b8..ad427397524 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -53,12 +53,17 @@ pt-br	Rodrigo Real
 ru      Alex Ott              
 sk      Miroslav Vaško        
 
+** For a major release, add a "New in Emacs XX" section to faq.texi.
+
 ** Remove temporary +++/--- lines in NEWS.
 
 ** Try to reorder NEWS: most important things first, related items together.
 
 ** Consider bumping customize-changed-options-previous-release.
 
+** cusver-check from admin.el cam help find new defcustoms missing
+:version tags.
+
 * BUGS
 
 ** Check for modes which bind M-s that conflicts with a new global binding M-s
@@ -155,13 +160,8 @@ mini.texi         rgm
 misc.texi         cyd
 modes.texi        cyd
 msdog.texi        rgm  (can't actually test any of it though)
-  It was not obvious to me that the following is true (it could well be though):
-
-   Emacs on Windows automatically determines your default printer and
-   sets the variable `printer-name' to that printer's name.
-
 msdog-xtra.texi   rgm  (can't actually test any of it though)
-mule.texi         
+mule.texi         rgm  (not 100% sure about "Fontsets")
 m-x.texi          cyd
 package.texi      cyd
 picture-xtra.texi rgm
@@ -182,7 +182,7 @@ xresources.texi   cyd
 
 abbrevs.texi      rgm
 advice.texi       cyd
-anti.texi         
+anti.texi         rgm
 back.texi         rgm
 backups.texi      cyd
 buffers.texi      cyd
@@ -211,7 +211,7 @@ loading.texi      cyd
 macros.texi       cyd
 maps.texi         rgm
 markers.texi      rgm
-minibuf.texi      
+minibuf.texi      rgm
 modes.texi        cyd
 nonascii.texi     cyd
 numbers.texi      cyd
@@ -219,7 +219,7 @@ objects.texi      cyd
 os.texi           cyd
 package.texi      rgm
 positions.texi    cyd
-processes.texi
+processes.texi    rgm
 searching.texi    rgm
 sequences.texi    cyd
 streams.texi      cyd
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index cb63d5b16ba..0c72c8b5c93 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -1,9 +1,9 @@
 ;;; bzrmerge.el --- help merge one Emacs bzr branch to another
 
-;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: 
+;; Keywords: maint
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
   (require 'cl))                        ; assert
 
 (defvar bzrmerge-skip-regexp
-  "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version"
+  "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk"
   "Regexp matching logs of revisions that might be skipped.
 `bzrmerge-missing' will ask you if it should skip any matches.")
 
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index c890dad8903..ecbd0490246 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -1,4 +1,7 @@
 # Makefile -- Makefile to generate character property tables.
+
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
 # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
@@ -18,25 +21,33 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+abs_builddir = @abs_builddir@
+top_srcdir = @top_srcdir@
+abs_top_builddir = @abs_top_builddir@
 
-EMACS = ../../src/emacs
-DSTDIR = ../../lisp/international
-RUNEMACS = ${EMACS} -Q -batch
+EMACS = ${abs_top_builddir}/src/emacs
+DSTDIR = ${top_srcdir}/lisp/international
+emacs = ${EMACS} -batch --no-site-file --no-site-lisp
 
 all: ${DSTDIR}/charprop.el
 
 .el.elc:
-        ${RUNEMACS} -batch -f batch-byte-compile $<
+        ${emacs} -f batch-byte-compile $<
 
-unidata.txt: UnicodeData.txt
-        sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < UnicodeData.txt > $@
+unidata.txt: ${srcdir}/UnicodeData.txt
+        sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < ${srcdir}/UnicodeData.txt > $@
 
-${DSTDIR}/charprop.el: unidata-gen.elc unidata.txt
-        ELC=`/bin/pwd`/unidata-gen.elc; \
-        DATADIR=`/bin/pwd`; \
-        DATA=unidata.txt; \
-        cd ${DSTDIR}; \
-        ${RUNEMACS} -batch --load $${ELC} -f unidata-gen-files $${DATADIR} $${DATA}
+${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
+        cd ${DSTDIR} && ${emacs} -l ${srcdir}/unidata-gen \
+          -f unidata-gen-files ${srcdir} ${abs_builddir}/unidata.txt
+
+## Like the above, but generate in PWD rather than lisp/international.
+charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
+        ${emacs} -l ${srcdir}/unidata-gen \
+          -f unidata-gen-files ${srcdir} unidata.txt
 
 install: charprop.el
         cp charprop.el ${DSTDIR}
@@ -46,4 +57,9 @@ clean:
         if test -f charprop.el; then \
           rm -f `sed -n 's/^;; FILE: //p' < charprop.el`; \
         fi
-        rm -f charprop.el unidata-gen.elc unidata.txt
+        rm -f charprop.el ${srcdir}/unidata-gen.elc unidata.txt
+
+distclean: clean
+        -rm -f ./Makefile
+
+maintainer-clean: distclean