Commit ecb21060 authored by Miles Bader's avatar Miles Bader

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 866-879)

   - Merge multi-tty branch
   - Update from CVS
   - Merge from emacs--rel--22

parents 42af7493 58ade22b
This diff is collapsed.
Copyright (C) 2006, 2007 Free Software Foundation, Inc.
See end for license conditions.
Contributing to Emacs
Emacs is a collaborative project and we encourage contributions from
anyone and everyone. If you want to contribute in the way that will
help us most, we recommend (1) fixing reported bugs and (2)
implementing the feature ideas in etc/TODO. However, if you think of
new features to add, please suggest them too -- we might like your
idea. Porting to new platforms is also useful, when there is a new
platform, but that is not common nowadays.
For documentation on how to develop Emacs changes, refer to the Emacs
Manual and the Emacs Lisp Reference Manual (both included in the Emacs
distribution). The web pages in
contain additional information.
You may also want to submit your change so that can be considered for
inclusion in a future version of Emacs (see below).
If you don't feel up to hacking Emacs, there are many other ways to
help. You can answer questions on the mailing lists, write
documentation, find and report bugs, contribute to the Emacs web
pages, or develop a package that works with Emacs.
Here are some style and legal conventions for contributors to Emacs:
* Coding Standards
Contributed code should follow the GNU Coding Standard.
If it doesn't, we'll need to find someone to fix the code before we
can use it.
Emacs has certain additional style and coding conventions.
Ref: GNU Coding Standards Info Manual
Ref: The "Tips" Appendix in the Emacs Lisp Reference.
* Copyright Assignment
We can accept small changes without legal papers, and for medium-size
changes a copyright disclaimer is ok too. To accept substantial
contributions from you, we need a copyright assignment form filled out
and filed with the FSF.
Contact us at to obtain the relevant forms.
* Getting the Source Code
The latest version of Emacs can be downloaded using CVS or Arch from
the Savannah web site. It is important to write your patch based on
this version; if you start from an older version, your patch may be
outdated when you write it, and maintainers will have hard time
applying it.
After you have downloaded the CVS source, you should read the file
INSTALL.CVS for build instructions (they differ to some extent from a
normal build).
* Submitting Patches
Every patch must have several pieces of information before we
can properly evaluate it.
When you have all these pieces, bundle them up in a mail message and
send it to or
All subsequent discussion should also be sent to the mailing list.
** Description
For bug fixes, a description of the bug and how your patch fixes this
For new features, a description of the feature and your
** ChangeLog
A ChangeLog entry as plaintext (separate from the patch).
See the various ChangeLog files for format and content. Note that,
unlike some other projects, we do require ChangeLogs also for
documentation, i.e. Texinfo files.
Ref: "Change Log Concepts" node of the GNU Coding Standards Info
Manual, for how to write good log entries.
** The patch itself.
Please use "Context Diff" format.
If you are accessing the CVS repository use
cvs update; cvs diff -cp
else, use
diff -cp OLD NEW
If your version of diff does not support these options, then get the
latest version of GNU Diff.
** Mail format.
We prefer to get the patches as inline plain text.
Please be aware of line wrapping which will make the patch unreadable
and useless for us. To avoid that, you can use MIME attachments or,
as a last resort, uuencoded gzipped text.
** Please reread your patch before submitting it.
** Do not mix changes.
If you send several unrelated changes together, we will ask you to
separate them so we can consider each of the changes by itself.
* Coding style and conventions.
** Mandatory reading:
The "Tips and Conventions" Appendix of the Emacs Lisp Reference.
** Avoid using `defadvice' or `eval-after-load' for Lisp code to be
included in Emacs.
** Remove all trailing whitespace in all source and text files.
** Use ?\s instead of ? in Lisp code for a space character.
* Supplemental information for Emacs Developers.
** Write access to Emacs' CVS repository.
Once you become a frequent contributor to Emacs, we can consider
giving you write access to the CVS repository.
** Emacs Mailing lists.
Discussion about Emacs development takes place on
Bug reports for released versions are sent to
Bug reports for development versions are sent to
You can subscribe to the mailing lists at
You can find the mailing lists archives at or
** Document your changes.
Think carefully about whether your change requires updating the
documentation. If it does, you can either do this yourself or add an
item to the NEWS file.
If you document your change in NEWS, please mark the NEWS entry with
the documentation status of the change: if you submit the changes for
the manuals, mark it with "+++"; if it doesn't need to be documented,
mark it with "---"; if it needs to be documented, but you didn't
submit documentation changes, leave the NEWS entry unmarked. (These
marks are checked by the Emacs maintainers to make sure every change
was reflected in the manuals.)
** Understanding Emacs Internals.
The best way to understand Emacs Internals is to read the code,
but the nodes "Tips" and "GNU Emacs Internals" in the Appendix
of the Emacs Lisp Reference Manual may also help.
The file etc/DEBUG describes how to debug Emacs bugs.
* How to Maintain Copyright Years for GNU Emacs
See admin/notes/copyright.
** Our lawyer says it is ok if we add, to each file that has been in Emacs
since Emacs 21 came out in 2001, all the subsequent years. We don't
need to check whether *that file* was changed in those years.
It's sufficient that *Emacs* was changed in those years (and it was!).
** For those files that have been added since then, we should add
the year it was added to Emacs, and all subsequent years.
** For the refcards under etc/, it's ok to simply use the latest year
(typically in a `\def\year{YEAR}' expression) for the rendered copyright
notice, while maintaining the full list of years in the copyright notice
in the comments.
This file is part of GNU Emacs.
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
the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
Local variables:
mode: outline
paragraph-separate: "[ ]*$"
2007-10-05 Eli Zaretskii <>
* config.bat: Fix configuring `doc' due to changes in the
directory structure.
2007-09-16 Peter O'Gorman <> (tiny change)
* Don't use -lpthread on HP-UX.
2007-09-16 Glenn Morris <>
* make-dist: File gfdl.1 has been removed.
2007-09-15 Glenn Morris <>
* Fix makeinfo version regexp.
2007-09-12 Glenn Morris <>
* (AC_FUNC_ALLOCA): Throw an error if a system
implementation of alloca is not found.
* (SOURCES, unlock, relock): Delete.
(install-arch-indep): Do not exclude the etc/ Makefiles.
2007-09-09 Juri Linkov <>
* make-dist: Remove AUTHORS and CONTRIBUTE (moved to etc).
* README: Add doc/ to documentation directories.
2007-09-08 Michael Olson <>
* MAINTAINERS: Add myself for ERC and tq.el.
Update for new doc/ directory layout.
2007-09-06 Romain Francoise <>
* make-dist: Update for new doc/ directory layout.
2007-09-06 Glenn Morris <>
* (mansrcdir): New variable.
(SUBDIR_MAKEFILES): Update for new doc/ directory layout.
(man/Makefile, lispref/Makefile, lispintro/Makefile): Rename and
update these targets for new doc/ directory layout.
(doc/misc/Makefile): New target.
(install-arch-indep): Use mansrcdir for new location of manpages.
(mostlyclean, clean, distclean, maintainer-clean, unlock)
(relock, info, dvi): Update targets for new doc/ directory layout.
* (AC_OUTPUT): Update names of generated Makefiles
for new doc/ directory layout.
2007-09-02 Andreas Schwab <>
* Use AS_HELP_STRING throughout.
* configure: Regenerate.
2007-09-02 Jan Dj,Ad(Brv <>
* Require Gtk/Glib 2.6.
2007-09-02 Thien-Thi Nguyen <>
Use them throughout in place of AC_ARG_WITH calls.
* configure: Regenerate.
2007-09-01 Andreas Schwab <>
* Put quotes around nested macro calls.
2007-08-31 Ulrich Mueller <> (tiny change)
* Fix typo.
* configure: Regenerate.
2007-08-30 Glenn Morris <>
* (AH_BOTTOM): Copy some manual changes made to
src/ here so they are not lost when it regenerates.
* README.multi-tty: Move to admin/notes/multi-tty, with some edits.
2007-08-29 Karoly Lorentey <>
* README.multi-tty: New file.
2007-08-29 Glenn Morris <>
* README: Increase version to 23.0.50.
2007-08-29 Jan Dj,Ad(Brv <>
* New option: --without-xaw3d.
2007-08-24 Glenn Morris <>
* Check for a suitably recent makeinfo.
......@@ -39,7 +39,7 @@ Eli Zaretskii
Kenichi Handa
......@@ -69,7 +69,14 @@ Jay Belanger
Michael Olson
......@@ -79,7 +86,7 @@ Steven Tamm
Eli Zaretskii
......@@ -112,12 +119,6 @@ Miles Bader
Thien-Thi Nguyen
Juanma Barranquero
......@@ -158,6 +158,9 @@ bitmapdir=@bitmapdir@
# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
# Where the manpage source files are kept.
# Tell make where to find source files; this is needed for the makefiles.
......@@ -250,7 +253,7 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
SUBDIR = lib-src src
# The makefiles of the directories in $SUBDIR.
SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
# Subdirectories to install, and where they'll go.
# lib-src's makefile knows how to install it, so we don't do that here.
......@@ -336,13 +339,16 @@ src/config.stamp: $(srcdir)/src/ config.status
lib-src/Makefile: $(srcdir)/lib-src/ config.status
man/Makefile: $(srcdir)/man/ config.status
doc/emacs/Makefile: $(srcdir)/doc/emacs/ config.status
doc/misc/Makefile: $(srcdir)/doc/misc/ config.status
lispref/Makefile: $(srcdir)/lispref/ config.status
doc/lispref/Makefile: $(srcdir)/doc/lispref/ config.status
lispintro/Makefile: $(srcdir)/lispintro/ config.status
doc/lispintro/Makefile: $(srcdir)/doc/lispintro/ config.status
oldXMenu/Makefile: $(srcdir)/oldXMenu/ config.status
......@@ -414,6 +420,9 @@ install-arch-dep: mkdir
## If people complain about the h flag in tar command, take that out.
## That flag is also used in leim/
## Note that the Makefiles in the etc directory are potentially useful
## in an installed Emacs, so should not be excluded.
install-arch-indep: mkdir info
-set ${COPYDESTS} ; \
unset CDPATH; \
......@@ -446,7 +455,8 @@ install-arch-indep: mkdir info
rm -f $${subdir}/.\#* ; \
rm -f $${subdir}/*~ ; \
rm -f $${subdir}/*.orig ; \
rm -f $${subdir}/[mM]akefile* ; \
[ "$${dir}" != "${srcdir}/etc" ] && \
rm -f $${subdir}/[mM]akefile* ; \
rm -f $${subdir}/ChangeLog* ; \
rm -f $${subdir}/dired.todo ; \
done) ; \
......@@ -534,10 +544,10 @@ install-arch-indep: mkdir info
else true; fi
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
thisdir=`/bin/pwd`; \
cd ${srcdir}/etc; \
cd ${mansrcdir}; \
for page in emacs emacsclient etags ctags ; do \
(cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \
${INSTALL_DATA} ${mansrcdir}/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \
chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \
......@@ -620,9 +630,10 @@ mostlyclean: FRC
(cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean)
(cd lwlib; $(MAKE) $(MFLAGS) mostlyclean)
(cd lib-src; $(MAKE) $(MFLAGS) mostlyclean)
-(cd man && $(MAKE) $(MFLAGS) mostlyclean)
-(cd lispref && $(MAKE) $(MFLAGS) mostlyclean)
-(cd lispintro && $(MAKE) $(MFLAGS) mostlyclean)
-(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean)
-(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean)
-(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean)
-(cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean)
(cd leim; $(MAKE) $(MFLAGS) mostlyclean)
### `clean'
......@@ -638,9 +649,10 @@ clean: FRC
(cd oldXMenu; $(MAKE) $(MFLAGS) clean)
(cd lwlib; $(MAKE) $(MFLAGS) clean)
(cd lib-src; $(MAKE) $(MFLAGS) clean)
-(cd man && $(MAKE) $(MFLAGS) clean)
-(cd lispref && $(MAKE) $(MFLAGS) clean)
-(cd lispintro && $(MAKE) $(MFLAGS) clean)
-(cd doc/emacs && $(MAKE) $(MFLAGS) clean)
-(cd doc/misc && $(MAKE) $(MFLAGS) clean)
-(cd doc/lispref && $(MAKE) $(MFLAGS) clean)
-(cd doc/lispintro && $(MAKE) $(MFLAGS) clean)
(cd leim; $(MAKE) $(MFLAGS) clean)
### `distclean'
......@@ -658,9 +670,10 @@ distclean: FRC
(cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
(cd lwlib; $(MAKE) $(MFLAGS) distclean)
(cd lib-src; $(MAKE) $(MFLAGS) distclean)
(cd man && $(MAKE) $(MFLAGS) distclean)
(cd lispref && $(MAKE) $(MFLAGS) distclean)
(cd lispintro && $(MAKE) $(MFLAGS) distclean)
(cd doc/emacs && $(MAKE) $(MFLAGS) distclean)
(cd doc/misc && $(MAKE) $(MFLAGS) distclean)
(cd doc/lispref && $(MAKE) $(MFLAGS) distclean)
(cd doc/lispintro && $(MAKE) $(MFLAGS) distclean)
(cd leim; $(MAKE) $(MFLAGS) distclean)
(cd lisp; $(MAKE) $(MFLAGS) distclean)
......@@ -681,9 +694,10 @@ maintainer-clean: FRC
(cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean)
-(cd man && $(MAKE) $(MFLAGS) maintainer-clean)
-(cd lispref && $(MAKE) $(MFLAGS) maintainer-clean)
-(cd lispintro && $(MAKE) $(MFLAGS) maintainer-clean)
-(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean)
-(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean)
-(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean)
-(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean)
(cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lisp; $(MAKE) $(MFLAGS) maintainer-clean)
......@@ -698,49 +712,6 @@ extraclean:
-rm -f config-tmp-*
-rm -f *~ \#*
### Unlocking and relocking. The idea of these productions is to reduce
### hassles when installing an incremental tar of Emacs. Do `make unlock'
### before unlocking the file to take the write locks off all sources so
### that tar xvof will overwrite them without fuss. Then do `make relock'
### afterward so that VC mode will know which files should be checked in
### if you want to mung them.
### Note: it's no disaster if these productions miss a file or two; tar
### and VC will swiftly let you know if this happens, and it is easily
### corrected.
README configure make-dist move-if-change
.PHONY: unlock relock
chmod u+w $(SOURCES)
-(cd elisp; chmod u+w Makefile README *.texi)
(cd etc; $(MAKE) $(MFLAGS) unlock)
(cd lib-src; $(MAKE) $(MFLAGS) unlock)
(cd lisp; $(MAKE) $(MFLAGS) unlock)
(cd lisp/term; chmod u+w README *.el)
(cd man; chmod u+w *texi* ChangeLog split-man)
(cd lispref; chmod u+w *texi* ChangeLog)
(cd lispintro; chmod u+w *texi* ChangeLog)
(cd oldXMenu; chmod u+w *.[ch] Makefile README)
(cd lwlib; chmod u+w *.[ch] Makefile README)
(cd src; $(MAKE) $(MFLAGS) unlock)
chmod u-w $(SOURCES)
-(cd elisp; chmod u-w Makefile README *.texi)
(cd etc; $(MAKE) $(MFLAGS) relock)
(cd lib-src; $(MAKE) $(MFLAGS) relock)
(cd lisp; $(MAKE) $(MFLAGS) relock)
(cd lisp/term; chmod u+w README *.el)
(cd man; chmod u+w *texi* ChangeLog split-man)
(cd lispref; chmod u+w *texi* ChangeLog)
(cd lispintro; chmod u+w *texi* ChangeLog)
(cd oldXMenu; chmod u+w *.[ch] Makefile README)
(cd lwlib; chmod u+w *.[ch] Makefile README)
(cd src; $(MAKE) $(MFLAGS) relock)
# The src subdir knows how to do the right thing