Permalink
Browse files

Merge branch 'emacs' into 23.1.undone

Conflicts:
	INSTALL [moved to INSTALL.emacs]
	admin/nt/README-ftp-server
	configure
	configure.in
	doc/emacs/ChangeLog
	doc/lispref/ChangeLog
	doc/lispref/elisp.texi
	doc/lispref/vol1.texi
	doc/lispref/vol2.texi
	doc/misc/ChangeLog
	etc/NEWS
	leim/ChangeLog
	lisp/ChangeLog
	lisp/bindings.el
	lisp/emacs-lisp/cl-indent.el
	lisp/emacs-lisp/lisp-mode.el
	lisp/faces.el
	lisp/menu-bar.el
	lisp/mouse.el
	lisp/progmodes/gdb-mi.el
	lisp/progmodes/gud.el
	lisp/simple.el
	lisp/startup.el
	src/ChangeLog
	src/eval.c
	src/keymap.c
	src/nsmenu.m
	src/nsterm.m
  • Loading branch information...
davidswelt committed Sep 21, 2009
2 parents b16df03 + 2c6196c commit 0d4a52740b825129ac842a21ec9b79a7c85ff670
Showing 699 changed files with 84,006 additions and 46,892 deletions.
View
@@ -4,6 +4,7 @@
(change-log-mode . ((add-log-time-zone-rule . t)
(fill-column . 74)
(bug-reference-url-format
- . "http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=%s"))))
+ . "http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=%s")
+ (mode . bug-reference))))
;; arch-tag: fb93c160-e9fe-4184-aad1-e4f5daa11cbd
View
@@ -1,5 +1,6 @@
autom4te.cache
makefile
+*~
/bin/
/site-lisp/
View
@@ -1,3 +1,97 @@
+2009-09-17 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * config.guess, config.sub: Updated from master source.
+
+ * configure.in (OTHER_FILES): Define using autoconf not cpp.
+
+2009-09-14 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * .dir-locals.el (change-log-mode): Restore bug-reference-mode.
+
+2009-09-13 Chong Yidong <cyd@stupidchicken.com>
+
+ * INSTALL: Update URL for GNU FreeFont.
+
+2009-09-09 Glenn Morris <rgm@gnu.org>
+
+ * Makefile.in (install-arch-indep): Don't recursively change perms of
+ site-lisp and infodir. There may be non-Emacs files in here, and the
+ files supplied by Emacs are all handled explicitly already. (Bug#3800)
+ (mkdir): Set umask to world-readable before creating directories.
+ mkinstalldirs already checks if dirs exist, don't duplicate this test.
+
+2009-08-29 Glenn Morris <rgm@gnu.org>
+
+ * Makefile.in (info-real): Don't ignore errors from doc Makefiles.
+ (info): Don't give an error in the absence of makeinfo - let the doc
+ Makefiles do that, if the info files need rebuilding. (Bug#3982)
+
+2009-08-23 Ken Raeburn <raeburn@raeburn.org>
+
+ * Makefile.in (install-arch-indep): If the versioned DOC-####
+ generated during loadup+dump isn't found, install the plain DOC
+ file that always gets generated, in case CANNOT_DUMP is set.
+
+ * configure.in: Warn if package version specified here doesn't
+ match the version in version.el.
+ * configure: Regenerate.
+
+2009-08-22 Michael Albinus <michael.albinus@gmx.de>
+
+ * configure.in: AC_CHECK_FUNCS dbus_watch_get_unix_fd.
+
+ * configure: Regenerate.
+
+2009-08-19 Glenn Morris <rgm@gnu.org>
+
+ * INSTALL: Remove reference to cvtmail.
+
+2009-08-15 CHENG Gao <chenggao@gmail.com>
+
+ * Makefile.in (install-arch-indep): Remove .DS_Store files (MacOSX).
+
+2009-08-02 Kevin Ryde <user42@zip.com.au>
+
+ * INSTALL: Fix free fonts URL.
+
+2009-07-22 Glenn Morris <rgm@gnu.org>
+
+ * configure.in (AC_PREREQ): Require autoconf 2.62.
+
+2009-07-04 Andreas Schwab <schwab@linux-m68k.org>
+
+ * configure.in (--enable-checking, --enable-profiling): Use
+ AS_HELP_STRING.
+
+2009-07-03 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * configure.in (--enable-profiling): New option.
+ (mips-*-netbsd*, mipsel-*-netbsd*, mipseb-*-netbsd*): Use machine=mips.
+
+2009-06-27 Glenn Morris <rgm@gnu.org>
+
+ * configure.in: Restore netbsd on mips, mipsel, mipseb.
+
+2009-06-26 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * configure.in (--enable-checking): New option.
+
+2009-06-24 Glenn Morris <rgm@gnu.org>
+
+ * make-dist: Warn if subdir does not exist in source.
+ (nextstep/Cocoa/Emacs.base/Contents/Resources/preferences.nib)
+ (nextstep/GNUstep/Emacs.base/Resources/preferences.gorm):
+ No longer make links.
+
+2009-06-24 Yavor Doganov <yavor@gnu.org>
+
+ * make-dist (tempdir): Don't create directories preferences.gorm
+ and preferences.nib, they are no longer required.
+
+2009-06-21 Chong Yidong <cyd@stupidchicken.com>
+
+ * Branch for 23.1.
+
2009-06-12 Chong Yidong <cyd@stupidchicken.com>
* configure.in: Delete mac-fix-env target, which has been
View
@@ -44,13 +44,8 @@ To update loaddefs.el (and similar files), do:
$ make autoloads
If either of the above partial procedures fails, try "make bootstrap".
-
-Very occasionally changes in the source can introduce
-incompatibilities with previous builds. If a bootstrap fails, as a
-last resort try "make maintainer-clean" before configuring and
-bootstrapping again. If CPU time is not an issue, the most thorough
-way to rebuild, and avoid any spurious problems, is always to use this
-method.
+If CPU time is not an issue, the most thorough way to rebuild, and
+avoid any spurious problems, is always to use this method.
Users of non-Posix systems (MS-Windows etc.) should run the
platform-specific configuration scripts (nt/configure.bat, config.bat,
View
@@ -211,9 +211,8 @@ BDF Unicode fonts etl-unicode.tar.gz are available from
fonts can also be used by ps-print and ps-mule to print Unicode
characters.
-Finally, the Web pages <URL:http://www.nongnu.org/freefont/index.html>
-and <URL:http://www.nongnu.org/freefont/resources.html> list a large
-number of free Unicode fonts.
+Finally, the Web page <URL:http://www.gnu.org/software/freefont/>
+lists a large number of free Unicode fonts.
* GNU/Linux development packages
@@ -757,9 +756,8 @@ directory of the Emacs distribution.
in `./lib-src' to their final destinations, as selected in `./src/paths.h'.
Strictly speaking, not all of the executables in `./lib-src' need be copied.
-- The programs `cvtmail', `fakemail', `hexl',
- `movemail', `profile', `rcs2log', and `vcdiff' are used by Emacs;
- they do need to be copied.
+- The programs `fakemail', `hexl', `movemail', `profile', `rcs2log',
+ and `vcdiff' are used by Emacs; they do need to be copied.
- The programs `etags', `ctags', `emacsclient', `b2m', and `rcs-checkin'
are intended to be run by users; they are handled below.
- The programs `make-docfile' and `test-distrib' were
View
@@ -526,6 +526,7 @@ install-arch-indep: mkdir info install-etc
rm -f $${subdir}/.cvsignore ; \
rm -f $${subdir}/.gitignore ; \
rm -f $${subdir}/.arch-inventory ; \
+ rm -f $${subdir}/.DS_Store ; \
rm -f $${subdir}/\#* ; \
rm -f $${subdir}/.\#* ; \
rm -f $${subdir}/*~ ; \
@@ -562,7 +563,7 @@ install-arch-indep: mkdir info install-etc
then \
docfile="DOC-$${fullversion}"; \
else \
- docfile="DOC-${version}*"; \
+ docfile="DOC"; \
fi; \
echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \
(cd ./etc; tar -chf - $${docfile}) \
@@ -627,7 +628,7 @@ install-arch-indep: mkdir info install-etc
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
done; \
else true; fi
- -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
+ -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
thisdir=`/bin/pwd`; \
cd ${mansrcdir}; \
for page in ${MAN_PAGES}; do \
@@ -663,28 +664,28 @@ install-strip:
### we may be creating several layers of directories (for example,
### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
### instead of mkdir. Not all systems' mkdir programs have the `-p' flag.
+### We set the umask so that any created directories are world-readable.
+### FIXME it would be good to warn about non-standard permissions of
+### pre-existing directories, but that does not seem easy.
mkdir: FRC
- if [ -d $(DESTDIR)${datadir} ]; then true; else \
- $(srcdir)/mkinstalldirs $(DESTDIR)${datadir}; \
- chmod a+r $(DESTDIR)${datadir};\
- fi
icondirs= ; \
for dir in $(iconsrcdir)/*/*/apps $(iconsrcdir)/*/*/mimetypes; do \
if [ -d $${dir} ]; then \
icondirs="$${icondirs} $${dir}" ; \
fi ; \
done ; \
icondirs=`echo "$${icondirs}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \
- $(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
+ umask 022 ; \
+ $(srcdir)/mkinstalldirs $(DESTDIR)${datadir} ${COPYDESTS} \
+ $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
$(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
$(DESTDIR)${datadir}/emacs/site-lisp \
$(DESTDIR)${datadir}/emacs/${version}/site-lisp \
$(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` \
$(DESTDIR)${desktopdir} $${icondirs}
### Delete all the installed files that the `install' target would
-### create (but not the noninstalled files such as `make all' would
-### create).
+### create (but not the noninstalled files such as `make all' would create).
###
### Don't delete the lisp and etc directories if they're in the source tree.
uninstall:
@@ -847,21 +848,26 @@ dist:
.PHONY: info dvi dist check html
info-real:
- -(cd doc/emacs; $(MAKE) $(MFLAGS) info)
- -(cd doc/misc; $(MAKE) $(MFLAGS) info)
- -(cd doc/lispref; $(MAKE) $(MFLAGS) info)
- -(cd doc/lispintro; $(MAKE) $(MFLAGS) info)
+ (cd doc/emacs; $(MAKE) $(MFLAGS) info)
+ (cd doc/misc; $(MAKE) $(MFLAGS) info)
+ (cd doc/lispref; $(MAKE) $(MFLAGS) info)
+ (cd doc/lispintro; $(MAKE) $(MFLAGS) info)
force-info:
-# Note that man/Makefile knows how to
-# put the info files in $(srcdir),
+# Note that man/Makefile knows how to put the info files in $(srcdir),
# so we can do ok running make in the build dir.
+# This used to have a clause that exited with an error if MAKEINFO = no.
+# But it is inappropriate to do so without checking if makeinfo is
+# actually needed - it is not if the info files are up-to-date. (Bug#3982)
+# Only the doc/*/Makefiles can decide that, so we let those rules run
+# and give a standard error if makeinfo is needed but missing.
+# While it would be nice to give a more detailed error message, that
+# would require changing every rule in doc/ that builds an info file,
+# and it's not worth it. This case is only relevant if you download a
+# release, then change the .texi files.
info: force-info
@if test "$(MAKEINFO)" = "off"; then \
echo "Configured --without-makeinfo, not building manuals" ; \
- elif test "$(MAKEINFO)" = "no"; then \
- echo "makeinfo is missing - cannot build manuals" ; \
- exit 1 ; \
else \
$(MAKE) $(MFLAGS) info-real ; \
fi
View
@@ -1,3 +1,29 @@
+2009-09-07 Juanma Barranquero <lekktu@gmail.com>
+
+ * unidata/.gitignore: New file.
+
+2009-08-22 Eli Zaretskii <eliz@gnu.org>
+
+ * notes/bugtracker: How to reassign a bug to a list of packages.
+
+ * notes/newfile: Details of how to check for problems with DOS 8+3
+ file-name restrictions.
+
+2009-08-18 Glenn Morris <rgm@gnu.org>
+
+ * notes/newfile: New file.
+
+2009-07-11 Eli Zaretskii <eliz@gnu.org>
+
+ * make-tarball.txt: Add a note about bumping the value of
+ customize-changed-options-previous-release.
+
+2009-06-24 Kenichi Handa <handa@m17n.org>
+
+ * charsets/mapconv: For the UNICODE format files, do reverse sort
+ and don't compact the map. This is to prefer the first one in the
+ duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).
+
2009-06-12 Kenichi Handa <handa@m17n.org>
* charsets/Makefile (JISX213A.map): Make it depend on
@@ -42,7 +68,7 @@
a string with a composition property to disable combining
characters being composed.
-2009-03-11 Miles Bader <Miles Bader <miles@gnu.org>>
+2009-03-11 Miles Bader <miles@gnu.org>
* quick-install-emacs: Be more clever about locating info directory.
View
@@ -2,10 +2,43 @@ Tasks needed before the next release.
* TO BE DONE SHORTLY BEFORE RELEASE
-** Check for widow and orphan lines in manuals;
-make sure all the pages really look ok in the manual as formatted.
-
-** Regenerate the pdf versions of the reference cards in etc/refcards/.
+** Manuals
+Check cross-references between the manuals (eg from emacs to elisp)
+are correct. You can use something like the following in the info
+directory in the Emacs build tree:
+
+emacs -Q --eval "(setq Info-default-directory-list '(\".\"))" \
+ -f info-xref-check-all
+
+make emacs.dvi, elisp.dvi, and deal with any errors (undefined
+references etc) in the output. Break any overfull lines.
+Underfull hboxes are not serious, but it can be nice to get rid of
+them if a simple rephrasing or rearrangement will work.
+
+Update the master menu and detailed menu (eg the antinews version).
+The command texinfo-multiple-files-update can do this, but you
+probably want to apply the results selectively (eg the current master
+menu has better line-breaks than the automatic version). It includes
+the menu-entry name (if there is one) as well as the node name - using
+only the latter looks better. Also, it doesn't seem to handle nested
+includes, so will miss edebug.texi etc.
+
+Check for widow and orphan lines in the printed manual; make sure all
+the pages really look ok in the manual as formatted. Orphans/widows
+are cases where the first/last line of a paragraph is on its own at
+the end/start of a page, or where the last word in a paragraph is on
+its own at the start of a line. It looks better if you reword/respace
+things to avoid these. (AFAIK, there is no way to find these except
+paging through the whole manual.) This should be the very last thing
+you do, since any change can alter the layout.
+
+** Check the keybindings in the refcards are correct, and add any new ones.
+Regenerate the pdf versions in etc/refcards/.
+What paper size are the English versions supposed to be on?
+On Debian testing, the packages texlive-lang-czechslovak and
+texlive-lang-polish will let you generate the cs-* and sk-* pdfs.
+The Makefile rules did not work for me, I had to use something like:
+csplain -output-format=pdf cs-refcard
** Ask maintainers of refcard translations to update them.
@@ -24,6 +57,8 @@ sk Miroslav Vaško
** Try to reorder NEWS: most important things first, related items together.
+** Consider bumping customize-changed-options-previous-release.
+
* BUGS
** Does deleting frames run Lisp code? If so, can we get rid of that?
@@ -92,7 +127,7 @@ names of the people who have checked it.
SECTION READERS
----------------------------------
-etc/TUTORIAL
+etc/TUTORIAL rgm (but see Bug#3783)
etc/TUTORIAL.bg
etc/TUTORIAL.cn
etc/TUTORIAL.cs
View
@@ -30,7 +30,7 @@
# $1: source map file
# $2: address pattern for sed (optionally with substitution command)
# $3: format of source map file
-# GLIBC-1 GLIBC-2 GLIBC-2-7 CZYBORRA IANA UNICODE YASUOKA
+# GLIBC-1 GLIBC-2 GLIBC-2-7 CZYBORRA IANA UNICODE UNICODE2 YASUOKA
# $4: awk script
FILE="admin/charsets/$1"
@@ -115,9 +115,11 @@ elif [ "$3" = "IANA" ] ; then
elif [ "$3" = "UNICODE" ] ; then
# Source format is:
# YYYY XX
+ # We perform reverse sort to prefer the first one in the
+ # duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).
zcat $1 | sed -n -e "$2 p" \
| sed -e 's/\([0-9A-F]*\)[^0-9A-F]*\([0-9A-F]*\).*/0x\2 0x\1/' \
- | sort | ${AWKPROG}
+ | sort -r
elif [ "$3" = "UNICODE2" ] ; then
# Source format is:
# 0xXXXX 0xYYYY # ...
Oops, something went wrong.

0 comments on commit 0d4a527

Please sign in to comment.