Commit 42b2a986 authored by Paul Eggert's avatar Paul Eggert

Merge from trunk.

parents e4d81efc a8d3cbf7
......@@ -5,7 +5,8 @@
;; You must set bugtracker_debbugs_url in your bazaar.conf for this to work.
;; See admin/notes/bugtracker.
(log-edit-mode . ((log-edit-rewrite-fixes
"[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1")))
"[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1")
(log-edit-font-lock-gnu-style . t)))
(change-log-mode . ((add-log-time-zone-rule . t)
(fill-column . 74)
(bug-reference-url-format . "")
......@@ -4,10 +4,13 @@ Bugs section of the Emacs manual for advice on
(1) how to tell when to report a bug, and
(2) how to write a useful bug report and what information it needs to have.
You can read the read the Bugs section of the manual from inside Emacs.
Start Emacs, do C-h i to enter Info, then m Emacs RET to get to the
Emacs manual, then m Bugs RET to get to the section on bugs.
Or you can use the standalone Info program in a like manner.
You can read the Bugs section of the manual from inside Emacs.
Start Emacs, and press
C-h r (to view the Emacs manual)
m Bugs RET (to go to the section on Bugs)
Or you can use the standalone Info program:
info emacs
m Bugs RET
(Standalone Info is part of the Texinfo distribution, not part of the
Emacs distribution.)
......@@ -16,7 +19,7 @@ Software Foundation's online store at <>.
If necessary, you can read the manual without an info program:
cat info/emacs* | more "+/^File: emacs, Node: Bugs,"
cat info/emacs* | more "+/^File: emacs.*, Node: Bugs,"
Please first check the file etc/PROBLEMS (e.g. with C-h C-p in Emacs) to
2012-05-22 Paul Eggert <>
Remove src/m/*.
* Remove all mention of src/m/*.
(machine, machfile, M_FILE, config_machfile, and_machfile): Remove.
All uses removed.
(BITS_PER_LONG_LONG): Move to src/lisp.h.
* lib/makefile.w32-in: Remove dependencies on
* make-dist: Don't make links to src/m.
2012-05-22 Paul Eggert <>
* (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529)
Without this further fix, aclocal was being invoked unnecessarily.
2012-05-22 Glenn Morris <>
* (blessmail, install-arch-dep, uninstall):
Check cd lib-src works.
(install-arch-dep, uninstall): Remove unneeded subshells.
2012-05-21 Glenn Morris <>
* update-subdirs: Move to build-aux/.
* make-dist, (install-arch-indep): Update for this change.
* (leimdir): New, set by configure.
(COPYDIR, COPYDESTS): Add leim directories.
(install-leim): Remove.
(install-arch-indep): Handle leim installation directly.
* vpath.sed: Remove unused file.
* make-dist: No more vpath.sed.
2012-05-21 Paul Eggert <>
Use full name for m4/gnulib-comp.m4. (Bug#11529)
Previously the file was named m4/gl-comp.m4 due to DOS 8+3 restrictions,
even though the file's name in gnulib is m4/gnulib-comp.m4.
This had a problem when merging from gnulib, as the code temporarily
renamed it to the full name, causing problems when interrupted.
Now the file has its full name, with the idea that we will find
a solution for MS-DOS that does not affect the rest of Emacs.
* m4/gnulib-comp.m4: Rename from m4/gl-comp.m4.
Assume C89 or later.
Make merging from gnulib a script, not a makefile action.
Putting it in a makefile has some problems with reflection, as
merging from gnulib updates 'configure', which can update the makefile.
Putting it in a standalone script breaks this loop.
* (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
Remove, moving the actions to the script admin/merge-gnulib.
2012-05-21 Glenn Morris <>
Rename to leimdir, treat like lispdir.
2012-05-21 Glenn Morris <>
* (install-arch-indep, install-doc, install-info)
(uninstall): Scrap superfluous subshells.
2012-05-19 Ulrich Mueller <>
* (install-etc): Respect DESTDIR. (Bug#11518)
2012-05-19 Paul Eggert <>
* (AC_CHECK_FUNCS): Remove XSetWMProtocols,
getdomainname, mblen (twice), mbrlen (twice), mbsinit, ualarm,
getsockopt, setsockopt, mremap, mempcpy.
* (machine): Do not set to 'vax', since src/m/vax.h
is being removed.
(AC_CHECK_FUNCS): Remove ftime.
2012-05-19 Glenn Morris <>
* (install-arch-indep): Remove unneeded subshell.
* (install-arch-indep): Remove unneeded chmod.
Set permissions of lisp/subdirs.el.
* (SUBDIR): Add leim. Update users.
* (lib, lib-src, lisp): Check cd return value.
* (leim): No need to set PARALLEL.
2012-05-18 Glenn Morris <>
* (install-arch-indep, install-info, install-man):
Simplify some one-sided ifs.
* Install only the relevant DOC file.
(install-arch-indep): Delete etc/DOC*.
(install-doc): No more need to delete etc/DOC.
* (install-arch-indep): Split into several rules.
(install-doc, innstall-info, install-man): New rules.
* (mandir): May as well include it in the NS app bundle.
* (INSTALL_ARCH_INDEP_EXTRA): New output variable.
* (INSTALL_ARCH_INDEP_EXTRA): New, set by configure.
(install-arch-indep): Don't install-etc for self-contained ns builds.
No longer unconditonally add /sw directories. (Bug#2280)
* (install-arch-dep): Depend on install-arch-indep.
(install-arch-indep): Depend on install-leim.
(install): Remove explicit install-leim dependence.
* (install-arch-indep):
Move last element of mkdir rule here.
(mkdir): Remove rule.
* (install-arch-indep): Remove unneeded chmods.
INSTALL_DATA does this for us.
* (install-arch-dep): Ensure bindir exists.
Drop mkdir dependency.
(install-arch-indep): Ensure docdir, infodir, mandir exist.
(install-leim): Drop mkdir dependency.
(mkdir): Remove most directories, now made in relevant rules.
* (install-arch-indep): Combine adjacent loops.
2012-05-17 Glenn Morris <>
* (install-etc, mkdir):
Make relevant directories in install-etc rather than mkdir.
* (write_subdir): Create the directory if needed.
(install-arch-dep, mkdir): No need to make site-lisp directories.
* (write_subdir): New.
(install-arch-indep, install-arch-dep): Use $write_subdir.
* (docdir, etcdir, infodir, lispdir):
For a self-contained ns build, set these to the appropriate values.
* (install-arch-dep): No need to move info/ any more.
* (ns_self_contained): New output variable.
* (ns_self_contained): New, set by configure.
(install-arch-dep): For a self-contained ns build,
don't bother installing binaries then immediately deleting them.
* (ns_appbindir, ns_appresdir):
Move them before things that may refer to them.
(install-arch-dep): No need to relocate self-contained ns libexec.
* (archlibdir): Set it for self-contained ns builds.
(libexecdir): Don't expand it now (this is mainly cosmetic).
2012-05-16 Paul Eggert <>
* Simplify by removing CPP etc.
(SPECIFED_CPP, CPP, NON_GNU_CC, AC_PROG_CPP): Remove; not needed.
In particular we no longer need to fiddle with CPP, since we don't
use CPP specially any more.
(gl_EARLY): Invoke this after adjusting CC, so that it uses the
adjusted compiler.
since gl_EARLY and/or Autoconf already does these.
2012-05-16 Glenn Morris <>
* Try to fix building with gcc >= 4.6 on Darwin.
(CPP): Do not unconditionally set it on Darwin.
Instead, try to test if -no-cpp-precomp is accepted.
2012-05-15 Glenn Morris <>
* (install-arch-dep): Replace use of MV_DIRS.
* (install-arch-dep): Do not hard-code version number.
* (install-arch-dep): NS install no longer needs to
symlink libexec/* into bin/, since 2012-05-14 ns_init_paths change.
2012-05-12 Glenn Morris <>
* (ns_appbindir): Remove trailing "/".
* (AC_PROG_MKDIR_P): Call it, to set MKDIR_P.
* (MKDIR_P): New, set by configure.
(mkdir): Use $MKDIR_P.
2012-05-11 Glenn Morris <>
* (install-arch-indep): There are no more Makefile.c files.
Use INSTALL_DATA for the DOC file.
Remove dead code for ./lisp that never executes.
2012-05-10 Glenn Morris <>
* (LEIM_INSTALLDIR): New output variable.
2012-05-08 Stefan Monnier <>
* .dir-locals.el (log-edit-mode): Enable gnu-style checks.
2012-05-08 Glenn Morris <>
* make-dist: No more doc/lispref/*.el.
2012-05-05 Andreas Schwab <>
* Fix quoting bugs.
2012-05-04 Glenn Morris <>
* (INFO_EXT, INFO_OPTS): New output variables.
2012-05-02 Glenn Morris <>
* (LD_SWITCH_SYSTEM): Don't try to defeat
the choices made by FreeBSD and NetBSD. (Bug#10313)
* (INFO_FILES): Remove variable.
(INFO_NONMISC): New variable.
(install-arch-indep, uninstall): Don't use $INFO_FILES.
* (uninstall): Remove useless-use-of-for; that for
some reason caused problems on an old Solaris.
* (install-arch-indep, uninstall):
Ensure that INSTALL-type commands are run from top-level.
* info/dir: Make some entries consistent with the source texi files.
* (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04.
2012-05-02 Glenn Morris <>
* (install-arch-indep):
Combine adjacent install-data and install-info loops.
2012-05-01 Glenn Morris <>
* (MAN_PAGES): Remove.
(install-arch-indep, uninstall): Don't use $MAN_PAGES.
* Try libtinfo for tputs.
(LIBS_TERMCAP) [gnu*]: Use libtinfo if it was found. (Bug#9741)
* Combine adjacent $opsys case blocks.
* (LIBS_TERMCAP): Remove unreachable branch for sol2.
* Invert the TERMINFO logic,
since "yes" is far more common than "no".
* (HAVE_LIBNCURSES): Remove; it is required to be true.
* (LD_SWITCH_X_SITE_AUX): Remove; no longer used.
2012-04-26 Glenn Morris <>
* make-dist: No more doc/lispref/
2012-04-22 Michael Albinus <>
* (dbus_validate_bus_name, dbus_validate_path)
(dbus_validate_interface, dbus_validate_member): Check also for
these library functions
2012-04-22 Paul Eggert <>
* (doug_lea_malloc): Check for __malloc_initialize_hook.
With glibc 2.14 or later, when compiled with GCC 4.7.0's
-Werror=deprecated-declarations flag, use of hooks like
__malloc_initialize_hook causes compilation to fail because these
hooks are deprecated. Modify 'configure' to check for these hooks too.
Simplify the 'configure' code to test for all the hooks at once.
(emacs_cv_var___after_morecore_hook): Remove, replacing with ...
(emacs_cv_var_doug_lea_malloc): ... this new var.
2012-04-21 Paul Eggert <>
Sync from gnulib version 4f11d6bebc3098c64ffde27079ab0d0cecfd0cdc
This diff is collapsed.
......@@ -63,16 +63,11 @@ USER_FULL_NAME If defined, overrides the default pw->pw_gecos for getting at t
** Replace, the definition is trivial: SWITCH_ENUM_CAST
** Defines from src/m/*.h and src/s/*.h. Some of these might not be used in the code anymore, so they can be removed. The HAVE_* definitions are probably handled by autoconf, so it might be possible to just remove them from src/[sm]/*.h.
** Defines from src/s/*.h. Some of these might not be used in the code anymore, so they can be removed. The HAVE_* definitions are probably handled by autoconf, so it might be possible to just remove them from src/s/*.h.
......@@ -120,9 +115,7 @@ HAVE_FMOD
......@@ -203,7 +196,6 @@ NO_MATHERR
......@@ -274,7 +266,6 @@ chdir
2012-05-22 Paul Eggert <>
Remove src/m/*.
* CPP-DEFINES: Do not mention src/m/*.h.
* MAINTAINERS: Remove src/m/.
2012-05-21 Paul Eggert <>
Use full name for m4/gnulib-comp.m4. (Bug#11529)
* merge-gnulib: Leave m4/gnulib-comp.m4's name alone.
Assume C89 or later.
* CPP-DEFINES: Remove NULL, const.
Make merging from gnulib a script, not a makefile action.
* merge-gnulib: New script, with actions moved here from
2012-05-19 Paul Eggert <>
2012-05-02 Glenn Morris <>
* bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".
2012-04-10 Glenn Morris <>
* bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
......@@ -1262,7 +1292,7 @@
;; coding: utf-8
;; End:
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
......@@ -31,12 +31,22 @@ 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.
(Actually, there is probably little point in trying to do this.
It's only really relevant if printed versions of the manuals are going
to be published. End-users are not likely to print out all 1000+
pages of the manuals, and even if they do, the resulting page breaks
depend on what paper and font size they use. This also means that if
you _are_ going to do this, it should be done with the paper and font
size that the GNU Press are going to use when they print the manuals.
I think this is different to what you get if you just use eg `make
emacs.pdf' (e.g., enable "smallbook").
** 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.
(You may need texlive-lang-cyrillic, texlive-lang-german for others.)
The Makefile rules did not work for me, I had to use something like:
csplain -output-format=pdf cs-refcard
......@@ -61,7 +71,7 @@ sk Miroslav Vaško
** Consider bumping customize-changed-options-previous-release.
** cusver-check from admin.el cam help find new defcustoms missing
** cusver-check from admin.el can help find new defcustoms missing