procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Tom Tromey 2013-01-05 19:36:45 -07:00
commit e078a23feb
2340 changed files with 11779 additions and 7663 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
ChangeLog
View file

@ -1,3 +1,66 @@
2013-01-04 Glenn Morris <rgm@gnu.org>
* info/dir: Add htmlfontify.
2013-01-04 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-01-04 stdio: remove now-unnecessary stdio.c
2013-01-04 fprintftime: depend on stdio, not ignore-value
2013-01-04 fwrite: silence __wur only for older glibc versions
2013-01-04 fwrite: silence __wur without using inline
* lib/stdio.c: Remove.
* lib/stdio.in.h, lib/strftime.c: Update from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
2013-01-02 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating copyright-date changes and:
2012-12-31 dup2: work around cygwin bug
2012-12-30 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac: Check for GtkHandlebox.
Check for GtkTearoffMenuItem.
New enable: --enable-gtk-deprecation-warnings, default off.
(HAVE_GTK3): If above enable is off, add
-DGDK_DISABLE_DEPRECATION_WARNINGS to GTK_CFLAGS.
2012-12-30 Andreas Schwab <schwab@linux-m68k.org>
* configure.ac (TEMACS_LDFLAGS2): Don't define.
(LIBS_GNUSTEP): Set for GNUstep and substitute.
(LD_SWITCH_SYSTEM_TEMACS): Don't set for GNUstep.
2012-12-27 Glenn Morris <rgm@gnu.org>
* configure.ac (emacs_config_options): New.
Use $@ rather than undocumented $ac_configure_args.
Replace any embedded double quotes. (Bug#13274)
2012-12-27 Andreas Schwab <schwab@linux-m68k.org>
* configure.ac (SIGNALS_VIA_CHARACTERS): Also define for darwin.
(Bug#13222)
2012-12-26 Paul Eggert <eggert@cs.ucla.edu>
Revert static checking of stack smashing.
* configure.ac (WARN_CFLAGS): Omit -Wstack-protector when
configured with --enable-gcc-warnings. -Wstack-protector causes
diagnostics to be issued on Ubuntu 12.10 x86-64.
2012-12-24 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2012-12-21 AC_PROG_MKDIR_P: port workaround to pre-2.62 Autoconf
2012-12-20 AC_PROG_MKDIR_P: don't workaround if not buggy
2012-12-17 filemode, sys_stat: Handle MPX files a la AIX.
2012-12-21 Akinori MUSHA <knu@iDaemons.org> (tiny change)
* Makefile.in (install-arch-dep): Ignore chmod errors. (Bug#13233)
2012-12-16 Romain Francoise <romain@orebokech.com>
* configure.ac (acl): New option.
@ -11824,7 +11887,7 @@
;; coding: utf-8
;; End:
Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.

2
GNUmakefile
View file

@ -1,6 +1,6 @@
# Build Emacs from a fresh tarball or version-control checkout.
# Copyright (C) 2011-2012 Free Software Foundation, Inc.
# Copyright (C) 2011-2013 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#

2
INSTALL
View file

@ -1,5 +1,5 @@
GNU Emacs Installation Guide
Copyright (C) 1992, 1994, 1996-1997, 2000-2012
Copyright (C) 1992, 1994, 1996-1997, 2000-2013
Free Software Foundation, Inc.
See the end of the file for license conditions.

2
INSTALL.BZR
View file

@ -1,4 +1,4 @@
Copyright (C) 2002-2012 Free Software Foundation, Inc.
Copyright (C) 2002-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.

4
Makefile.in
View file

@ -2,7 +2,7 @@
# DIST: make most of the changes to this file you might want, so try
# DIST: that first.
# Copyright (C) 1992-2012 Free Software Foundation, Inc.
# Copyright (C) 1992-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
@ -445,7 +445,7 @@ install-arch-dep: src install-arch-indep install-doc
INSTALL_STRIP=${INSTALL_STRIP}
if test "${ns_self_contained}" = "no"; then \
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \
chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \
if test "x${NO_BIN_LINK}" = x; then \
rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \

2
README
View file

@ -1,4 +1,4 @@
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.

9
admin/ChangeLog
View file

@ -1,3 +1,10 @@
2013-01-03 Glenn Morris <rgm@gnu.org>
* check-doc-strings: Update for CVS->bzr, moved lispref/ directory.
* emacs-pretesters, make-announcement, make-changelog-diff:
Remove files.
2012-12-14 Paul Eggert <eggert@cs.ucla.edu>
Fix permissions bugs with setgid directories etc. (Bug#13125)
@ -1665,7 +1672,7 @@
;; coding: utf-8
;; End:
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.

6
admin/README
View file

@ -1,4 +1,4 @@
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
@ -24,10 +24,6 @@ Instructions to create pretest or release tarballs, announcements, etc.
Utilities for setting version numbers and alike.
** make-announcement, make-changelog-diff
Scripts used to prepare release announcements.
* Scripts that can be used to build and test Emacs.

2
admin/admin.el
View file

@ -1,6 +1,6 @@
;;; admin.el --- utilities for Emacs administration
;; Copyright (C) 2001-2012 Free Software Foundation, Inc.
;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.

2
admin/alloc-colors.c
View file

@ -1,6 +1,6 @@
/* Allocate X colors. Used for testing with dense colormaps.
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.

2
admin/build-configs
View file

@ -1,7 +1,7 @@
#! /usr/bin/perl
# Build Emacs in several different configurations.
# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

2
admin/bzrmerge.el
View file

@ -1,6 +1,6 @@
;;; bzrmerge.el --- help merge one Emacs bzr branch to another
;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: maint

2
admin/charsets/mapfiles/README
View file

@ -1,4 +1,4 @@
Copyright (C) 2009-2012 Free Software Foundation, Inc.
Copyright (C) 2009-2013 Free Software Foundation, Inc.
Copyright (C) 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H13PRO009

8
admin/check-doc-strings
View file

@ -17,7 +17,7 @@ formal parameters, docstrings, and lispref texi.
This program is in the public domain.\n";
die $usage if @ARGV;
die $usage unless -r "src/alloc.c" && -d "CVS" && -d "lisp";
die $usage unless -r "src/alloc.c" && -d ".bzr" && -d "lisp";
my %texi_funtype;
my %texi_arglist;
@ -197,10 +197,8 @@ sub Check_function {
Show_details $show_details, $function, "@parms", $docstring;
}
my $lisprefdir;
if (-d "man/lispref") { $lisprefdir = "man/lispref"; }
elsif (-d "lispref") { $lisprefdir = "lispref"; }
else { die "Can't find lispref texi directory.\n"; }
my $lisprefdir = "doc/lispref";
die "Can't find lispref texi directory.\n" unless -d $lisprefdir;
open (FIND, "find $lisprefdir -name '*.texi' -print |") or die;
while (my $file = <FIND>) {

2
admin/cus-test.el
View file

@ -1,6 +1,6 @@
;;; cus-test.el --- tests for custom types and load problems
;; Copyright (C) 1998, 2000, 2002-2012 Free Software Foundation, Inc.
;; Copyright (C) 1998, 2000, 2002-2013 Free Software Foundation, Inc.
;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
;; Maintainer: Markus Rost <rost@math.ohio-state.edu>

2
admin/diff-tar-files
View file

@ -1,6 +1,6 @@
#! /bin/sh
# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

217
admin/emacs-pretesters
View file

@ -1,217 +0,0 @@
Here are the guidelines for being an Emacs pretester.
If you would like to do this, say so, and I'll add you to
the pretest list.
Information for Emacs Pretesters
The purpose of Emacs pretesting is to verify that the new Emacs
distribution, about to be released, works properly on your system *with
no change whatever*, when installed following the precise
recommendations that come with the Emacs distribution.
Here are some guidelines on how to do pretesting so as to make it
helpful. All of them follow from common sense together with the
nature of the purpose and the situation.
Please save this file, and reread it when a new series of pretests
starts.
* Get the pretest from gnu/emacs/pretest/emacs-MM.0.NN.tar.gz
on alpha.gnu.org.
* After a few days of testing, if there are no problems, please report
that Emacs works for you and what configuration you are testing it on.
* If you want to communicate with other pretesters, send mail to
emacs-pretesters@gnu.org. I don't use that mailing list when I send
to you because I've found that mailing lists tend to amplify random
noise into long discussions or even arguments, and that can waste a
lot of time. But when you have a reason to ask other pretesters for
help, you can do it that way.
* It is absolutely vital that you report even the smallest change or
departure from the standard sources and procedure.
Otherwise, you are not testing the same program that we asked you to
test. Testing a different program is usually of no use whatever. It
can even cause trouble, if you fail to tell us that you tested some
other program instead of what we are about to release. We might think
that Emacs works, when in fact it has not even been tried, and might
have a glaring fault.
* Don't use a site-load.el file or a site-init.el file when you pretest.
Using either of those files means you are not testing Emacs as a typical
site would use it.
Actually, it does no harm to test Emacs with such customizations *as
well as* testing it "out of the box". Anything you do that could find
a bug is useful, as long as you make sure we know exactly what you
did. The important point is that testing with local changes is no
substitute for testing Emacs exactly as it is distributed.
* Even changing the compilation options counts as a change in the
program. The Emacs sources specify which compilation options to use.
Some of them are specified in makefiles, and some in machine-specific
configuration files. They also give you ways to override this--but if
you do, then you are not testing what ordinary users will do.
Therefore, when pretesting, it is vital to test with the default
compilation options.
(Testing with a different set of options can be useful *in addition*,
but not *instead of* the default options.)
* The machine and system configuration files of Emacs are parts of
Emacs. So when you test Emacs, you need to do it with the
configuration files that come with Emacs.
If Emacs does not come with configuration files for a certain machine,
and you test it with configuration files that don't come with Emacs,
this is effectively changing Emacs. Because the crucial fact about
the planned release is that, without changes, it doesn't work on that
machine.
To make Emacs work on that machine, we would need to install new
configuration files. That is not out of the question, since it is
safe--it certainly won't break any other machines that already work.
But you will have to rush in the legal papers to give the FSF
permission to use such a large piece of text.
* Look in the etc/MACHINES file.
The etc/MACHINES file says which configuration files to use for your
machine, so use the ones that are recommended. If you guess, you might
guess wrong and encounter spurious difficulties. What's more, if you
don't follow etc/MACHINES then you aren't helping to test that its
recommendations are valid.
The etc/MACHINES file may describe other things that you need to do
to make Emacs work on your machine. If so, you should follow these
recommendations also, for the same reason.
* Send your problem reports to bug-gnu-emacs@gnu.org.
Sometimes we won't know what to do about a system-dependent issue, and
we may need people to say what happens if you try a certain thing on a
certain system. When this happens, we'll send out a query.
* Don't delay sending information.
When you test on a system and encounter no problems, please report it
right away. That way, we will know that someone has tested Emacs on
that kind of system.
Please don't wait for several days "to see if it really works before
you say anything." Tell us right away that Emacs seems basically to
work; then, if you notice a problem a few days later, tell us
immediately about that when you see it.
It is okay if you double check things before reporting a problem, such
as to see if you can easily fix it. But don't wait very long. A good
rule to use in pretesting is always to report every problem on the
same day you encounter it, even if that means you can't find a
solution before you report the problem.
I'd much rather hear about a problem today and a solution tomorrow
than get both of them tomorrow at the same time.
* Make each bug report self-contained.
If you refer back to another message, whether from you or from someone
else, then it will be necessary for anyone who wants to investigate
the bug to find the other message. This may be difficult, it is
probably time-consuming.
To help save our time, simply copy the relevant parts of any previous
messages into your own bug report.
In particular, if we ask you for more information because a bug report
was incomplete, it is best to send me the *entire* collection of
relevant information, all together. If you send just the additional
information, that makes extra work for us. There is even a risk that
we won't remember what question you are sending the answer to.
* When you encounter a bug that manifests itself as a Lisp error,
try setting debug-on-error to t and making the bug happen again.
Then you will get a Lisp backtrace. Including that in your bug report
is very useful.
* For advice on debugging, see etc/DEBUG.
* Debugging optimized code is possible, if you compile with GCC, but
in some cases the optimized code can be confusing. If you are not
accustomed to that, recompile Emacs without -O. One way to do this is
make clean
make CFLAGS=-g
* Configure tries to figure out what kind of system you have by
compiling and linking programs which calls various functions and looks
at whether that succeeds. The file config.log contains any messages
produced by compilers while running configure, to aid debugging if
configure makes a mistake. But note that config.cache reads:
# Giving --cache-file=/dev/null disables caching, for debugging configure.
or more simply,
rm config.cache
./configure
* Don't try changing Emacs *in any way* during pretest unless it fails
to work unchanged.
* Always be precise when talking about changes you have made. Show
things rather than describing them. Use exact filenames (relative to
the main directory of the distribution), not partial ones. For
example, say "I changed Makefile" rather than "I changed the
makefile". Instead of saying "I defined the MUMBLE macro", send a
diff.
* Always use `diff -c' to make diffs. If you don't include context, it
may be hard for us to figure out where you propose to make the
changes. So we might ignore your patch.
* When you write a fix, keep in mind that we can't install a change
that *might* break other systems without the risk that it will fail to
work and therefore require an additional cycle of pretesting.
People often suggest fixing a problem by changing config.h or
src/Makefile to do something special that a particular system needs.
Sometimes it is totally obvious that such changes would break Emacs
for almost all users. We can't possibly make a change like that. All
we can do is ask you to find a fix that is safe to install.
Sometimes people send fixes that *might* be an improvement in
general--but it is hard to be sure of this. I can install such
changes some of the time, but not during pretest, when I am trying to
get a new version to work reliably as quickly as possible.
The safest changes for us to install are changes to the s- and m-
files. At least those can't break other systems.
Another safe kind of change is one that uses a conditional to make
sure it will apply only to a particular kind of system. Ordinarily,
that is a bad way to solve a problem, and I would want to find a
cleaner alternative. But the virtue of safety can make it superior at
pretest time.
* Don't suggest changes during pretest to add features or make
something cleaner. Every change risks introducing a bug, so I won't
install a change during pretest unless it is *necessary*.
* If you would like to suggest changes for purposes other than fixing
user-visible bugs, don't wait till pretest time. Instead, send them
after we have made a release that proves to be stable. That is the
easiest time to consider such suggestions. If you send them at
pretest time, we will have to defer them till later, and that might
mean we forget all about them.
* In some cases, if you don't follow these guidelines, your
information might still be useful, but we would have to do more work
to make use of it. That might cause it to fall by the wayside.
Local Variables:
mode: text
End:

2
admin/grammars/c.by
View file

@ -1,5 +1,5 @@
;;; c.by -- LL grammar for C/C++ language specification
;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
;;
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; David Ponce <david@dponce.com>

2
admin/grammars/grammar.wy
View file

@ -1,6 +1,6 @@
;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
;;
;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
;;
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>

2
admin/grammars/java-tags.wy
View file

@ -1,6 +1,6 @@
;;; java-tags.wy -- Semantic LALR grammar for Java
;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
;;
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>

2
admin/grammars/js.wy
View file

@ -1,6 +1,6 @@
;;; javascript-jv.wy -- LALR grammar for Javascript
;; Copyright (C) 2005-2012 Free Software Foundation, Inc.
;; Copyright (C) 2005-2013 Free Software Foundation, Inc.
;; Copyright (C) 1998-2011 Ecma International.
;; Author: Joakim Verona

2
admin/grammars/make.by
View file

@ -1,6 +1,6 @@
;;; make.by -- BY notation for Makefiles.
;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
;;
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; David Ponce <david@dponce.com>

2
admin/grammars/python.wy
View file

@ -1,6 +1,6 @@
;;; python.wy -- LALR grammar for Python
;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
;; 2009, 2010 Python Software Foundation; All Rights Reserved

2
admin/grammars/scheme.by
View file

@ -1,6 +1,6 @@
;;; scheme.by -- Scheme BNF language specification
;; Copyright (C) 2001-2012 Free Software Foundation, Inc.
;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.

2
admin/grammars/srecode-template.wy
View file

@ -1,6 +1,6 @@
;;; srecode-template.wy --- Semantic Recoder Template parser
;; Copyright (C) 2005-2012 Free Software Foundation, Inc.
;; Copyright (C) 2005-2013 Free Software Foundation, Inc.
;; Author: Eric Ludlam <zappo@gnu.org>
;; Keywords: syntax

87
admin/make-announcement
View file

@ -1,87 +0,0 @@
#! /bin/bash
## Copyright (C) 2002-2012 Free Software Foundation, Inc.
## Author: Francesco Potorti` <pot@gnu.org>
## 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 of the License, 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
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
## along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
### Code:
if [ $# -ne 2 ]; then
echo "usage: $0 <old version number> <new version number>" >&2
exit 1
fi
if [ ! -f INSTALL -o ! -f configure -o ! -d lib-src ]; then
echo "this script should be run in the emacs root directory" >&2
exit 2
fi
OLD=$1
NEW=$2
outfile=emacs-$NEW.announce
oldtag=EMACS_PRETEST_$(echo $OLD|tr . _)
newtag=EMACS_PRETEST_$(echo $NEW|tr . _)
if [ -f $outfile ]; then
echo "$outfile exists"
echo -n "interrupt to abort, ENTER to overwrite "; read answer
fi
echo -n "tag name for OLD emacs version $OLD [$oldtag]: "; read answer
if [ "$answer" ]; then oldtag=$answer; fi
echo -n "tag name for NEW emacs version $NEW [$newtag]: "; read answer
if [ "$answer" ]; then newtag=$answer; fi
exec > $outfile
cat <<EOF
There is a new pretest available in
<ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$NEW.tar.gz>
Please report results from compiling and running the pretest to
<bug-gnu-emacs@gnu.org>. Your feedback is necessary for us
to know on which platforms the pretest has been tried.
If you have the tars from the previous pretest, and you have the
\`xdelta' utility, you can instead download the much smaller
<ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$OLD-$NEW.xdelta>
You can use a command like
$ xdelta patch XDELTA PREVIOUS-TAR CURRENT-TAR
to generate the new tar from the old one, where XDELTA is the xdelta
file you downloaded, PREVIOUS-TAR is the tar file from the previous
pretest, and CURRENT-TAR is the name of the tar file you downloaded.
Information about xdelta can be found on the GNU ftp site, in
/non-gnu/xdelta.README.
Changes since $OLD
EOF
make-changelog-diff $oldtag $newtag
echo " announcement created in $outfile" >&2

29
admin/make-changelog-diff
View file

@ -1,29 +0,0 @@
#! /bin/bash
## Author: Francesco Potorti` <pot@gnu.org>
if [ $# -ne 2 ]; then
echo "usage: $0 TAG1 TAG2" >&2
exit 1
fi
if [ ! -f INSTALL -o ! -f configure -o ! -d lib-src ]; then
echo "this script should be run in the emacs root directory" >&2
exit 2
fi
cvs -q diff -b -r $1 -r $2 $(find -name ChangeLog|sort) |
sed -n -e 's/^=\+/======/p' -e 's/^> //p' -e 's/^diff.*//p' \
-e 's/^RCS file: .cvsroot.emacs.emacs.\(.*\),v/\1/p' |
sed -n -e "/^======$/ {
N
N
h
d
}
H
s/.*//
x
s/^\n//
p"

2
admin/make-emacs
View file

@ -2,7 +2,7 @@
# Build Emacs with various options for profiling, debugging,
# with and without warnings enabled etc.
# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

41
admin/make-tarball.txt
View file

@ -4,6 +4,9 @@ Instructions to create pretest or release tarballs.
For each step, check for possible errors.
0. Decide on versions of automake and autoconf, and ensure you will
have them available for the duration of the release process.
1. `bzr update' (for a bound branch), or `bzr pull'.
bzr status # check for locally modified files
@ -11,13 +14,13 @@ For each step, check for possible errors.
make sure that the later tagged version will bootstrap, should it be
necessary to check it out.
3. Regenerate Emacs' etc/AUTHORS file (M-x load-file RET
lisp/emacs-lisp/authors.el RET, then M-x authors RET, then save
the *Authors* buffer). This may require fixing syntactically
incorrect ChangeLog entries beforehand.
3. Regenerate the etc/AUTHORS file:
M-: (require 'authors) RET, M-x authors RET, save the *Authors* buffer.
If there are errors that relate to syntactically incorrect
ChangeLog entries, consider fixing them and repeating.
4. Set the version number (M-x load-file RET admin/admin.el RET, then
M-x set-version RET). For a release, add released change log
M-x set-version RET). For a release, add released ChangeLog
entries (M-x add-release-logs RET).
For a pretest, start at version .90. After .99, use .990 (so that
@ -46,9 +49,7 @@ For each step, check for possible errors.
something like `find . | sort' in a clean bzr tree, and compare the
results against the new tar contents.
8. xdelta delta emacs-OLD.tar.gz emacs-NEW.tar.gz emacs-OLD-NEW.xdelta
9. tar -zxf emacs-NEW.tar.gz; cd emacs-NEW
8. tar -zxf emacs-NEW.tar.gz; cd emacs-NEW
./configure && make && make -n install
Use `script' or M-x compile to save the compilation log in
compile-NEW.log and compare it against an old one. The easiest way
@ -56,7 +57,7 @@ For each step, check for possible errors.
number of the old Emacs to __, do the same with the new log and do
M-x ediff. Especially check that Info files aren't built.
10. cd EMACS_ROOT_DIR; bzr tag TAG
9. cd EMACS_ROOT_DIR; bzr tag TAG
TAG is emacs-XX.Y.ZZ for a pretest, emacs-XX.Y for a release.
Shortly before the release, cut the version branch also, and open
@ -64,12 +65,11 @@ For each step, check for possible errors.
be sent to the emacs-diffs mailing list (by default, the list
normally only gets commits to the trunk).
11. Now you should upload the files to the GNU ftp server. In order to
10. Now you should upload the files to the GNU ftp server. In order to
do that, you must be registered as an Emacs maintainer and have your
GPG key acknowledged by the ftp people. Mail <ftp-upload@gnu.org>
for instructions.
You can use the gnupload script to upload each FILE, like this:
GPG key acknowledged by the ftp people. For instructions, see
http://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html
You can use the gnulib script "gnupload" to upload each FILE, like this:
gnupload --to alpha.gnu.org:emacs/pretest FILE (for a pretest)
gnupload --to ftp.gnu.org:emacs FILE (for a release)
@ -85,16 +85,17 @@ For each step, check for possible errors.
For a pretest, place the files in /incoming/alpha instead, so that
they appear on ftp://alpha.gnu.org/.
For a release, upload a bz2 tarfile as well; this can save a lot
For a release, upload xz and bz2 tarfiles as well; this can save a lot
of bandwidth.
12. After five minutes, verify that the files are visible at
11. After five minutes, verify that the files are visible at
ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at
ftp://ftp.gnu.org/gnu/emacs/ for a release.
13. For a pretest, announce it on emacs-devel and BCC the pretesters.
For a release, announce it on info-gnu@gnu.org,
info-gnu-emacs@gnu.org, and emacs-devel.
12. For a pretest, announce it on emacs-devel and info-gnu-emacs@gnu.org.
For a release, also announce it on info-gnu@gnu.org. (Probably
bcc the info- addresses to make it less likely that people will
followup on those lists.)
14. For a release, update the Emacs homepage in the web repository.
13. For a release, update the Emacs homepage in the web repository.
Also add the new NEWS file as NEWS.xx.y.

2
admin/merge-gnulib
View file

@ -4,7 +4,7 @@
#
# admin/merge-gnulib
# Copyright 2012 Free Software Foundation, Inc.
# Copyright 2012-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

65
admin/notes/bzr
View file

@ -182,6 +182,71 @@ where revision N+1 is the one where file was removed.
You could also try `bzr add --file-ids-from', if you have a copy of
another branch where file still exists.
* Undoing a commit (uncommitting)
It is possible to undo/remove a bzr commit (ie, to uncommit).
Only do this if you really, really, need to. For example, if you
somehow made a commit that triggers a bug in bzr itself.
Don't do it because you made a typo in a commit or the log.
If you do need to do this, do it as soon as possible, because the
longer you leave it, the more work is involved.
0. First, tell emacs-devel that you are going to do this, and suggest
people not commit anything to the affected branch for the duration.
In the following, replace USER with your Savannah username, and
BRANCH with the name of the branch.
Let's assume that revno 100 is the bad commit, and that there have
been two more commits after that (because nothing is ever easy).
1. Ensure your copy of the branch is up-to-date (for a bound
branch, bzr up; for an unbound branch, bzr pull) and has no local
changes (bzr st).
2. Make a record of the commits you are going to undo:
bzr diff -c 102 > /tmp/102.diff
etc
Also record the commit message, author, and any --fixes information.
3. Most Emacs branches are set up to prevent just this kind of thing.
So we need to disable that protection:
bzr config append_revisions_only=False \
-d bzr+ssh://USER@bzr.savannah.gnu.org/emacs/BRANCH/
4. Undo the commits:
bzr uncommit -r -4
This will show the commits it is going to undo, and prompt you to confirm.
5. If using an unbound branch:
bzr push --overwrite
6. Now, replay the commits you just undid (obviously, fix whatever it
was in the bad commit that caused the problem):
patch -p0 < /tmp/100.diff
bzr commit --author ... --fixes ... -F /tmp/100.log
etc
7. If using an unbound branch:
bzr push
8. Finally, re-enable the branch protection:
bzr config append_revisions_only=True \
-d bzr+ssh://USER@bzr.savannah.gnu.org/emacs/BRANCH/
9. Tell emacs-devel that it is ok to use the branch again.
Anyone with local changes should back them up before doing anything.
For a bound branch, bzr up will convert any of the undone commits to a
pending merge. Just bzr revert these away.
For an unbound branch, bzr pull will complain about diverged branches
and refuse to do anything. Use bzr pull --overwrite.
* Loggerhead
Loggerhead is the bzr tool for viewing a repository over http (similar

2
admin/notes/copyright
View file

@ -1,4 +1,4 @@
Copyright (C) 2007-2012 Free Software Foundation, Inc.
Copyright (C) 2007-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.

2
admin/notes/font-backend
View file

@ -1,4 +1,4 @@
Copyright (C) 2002-2012 Free Software Foundation, Inc.
Copyright (C) 2002-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.

2
admin/notes/lel-TODO
View file

@ -1,6 +1,6 @@
Some lisp/emacs-lisp/ Features and Where They Are Documented
Copyright (C) 2007-2012 Free Software Foundation, Inc.
Copyright (C) 2007-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.

2
admin/notes/multi-tty
View file

@ -1,6 +1,6 @@
-*- coding: utf-8; mode: text; -*-
Copyright (C) 2007-2012 Free Software Foundation, Inc.
Copyright (C) 2007-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
From README.multi-tty in the multi-tty branch.

2
admin/notes/unicode
View file

@ -1,6 +1,6 @@
-*-mode: text; coding: latin-1;-*-
Copyright (C) 2002-2012 Free Software Foundation, Inc.
Copyright (C) 2002-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
Problems, fixmes and other unicode-related issues

2
admin/nt/README-UNDUMP.W32
View file

@ -1,4 +1,4 @@
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
Emacs for Windows

2
admin/nt/README-ftp-server
View file

@ -1,4 +1,4 @@
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
Precompiled Distributions of

2
admin/quick-install-emacs
View file

@ -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-2013 Free Software Foundation, Inc.
## Author: Miles Bader <miles@gnu.org>

2
admin/unidata/Makefile.in
View file

@ -1,6 +1,6 @@
# Makefile -- Makefile to generate character property tables.
# Copyright (C) 2012 Free Software Foundation, Inc.
# Copyright (C) 2012-2013 Free Software Foundation, Inc.
# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
# National Institute of Advanced Industrial Science and Technology (AIST)

2
autogen.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
### autogen.sh - tool to help build Emacs from a bzr checkout
## Copyright (C) 2011-2012 Free Software Foundation, Inc.
## Copyright (C) 2011-2013 Free Software Foundation, Inc.
## Author: Glenn Morris <rgm@gnu.org>

22
autogen/Makefile.in
View file

@ -15,7 +15,7 @@
@SET_MAKE@
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -119,8 +119,8 @@ am__libgnu_a_SOURCES_DIST = allocator.c c-ctype.h c-ctype.c \
c-strcase.h c-strcasecmp.c c-strncasecmp.c careadlinkat.c \
close-stream.c md5.c sha1.c sha256.c sha512.c dtoastr.c \
dtotimespec.c filemode.c gettext.h gettime.c stat-time.c \
stdio.c strftime.c timespec.c timespec-add.c timespec-sub.c \
u64.c unistd.c utimens.c
strftime.c timespec.c timespec-add.c timespec-sub.c u64.c \
unistd.c utimens.c
am__objects_1 =
am_libgnu_a_OBJECTS = allocator.$(OBJEXT) c-ctype.$(OBJEXT) \
c-strcasecmp.$(OBJEXT) c-strncasecmp.$(OBJEXT) \
@ -128,9 +128,9 @@ am_libgnu_a_OBJECTS = allocator.$(OBJEXT) c-ctype.$(OBJEXT) \
sha1.$(OBJEXT) sha256.$(OBJEXT) sha512.$(OBJEXT) \
dtoastr.$(OBJEXT) dtotimespec.$(OBJEXT) filemode.$(OBJEXT) \
$(am__objects_1) gettime.$(OBJEXT) stat-time.$(OBJEXT) \
stdio.$(OBJEXT) strftime.$(OBJEXT) timespec.$(OBJEXT) \
timespec-add.$(OBJEXT) timespec-sub.$(OBJEXT) u64.$(OBJEXT) \
unistd.$(OBJEXT) utimens.$(OBJEXT)
strftime.$(OBJEXT) timespec.$(OBJEXT) timespec-add.$(OBJEXT) \
timespec-sub.$(OBJEXT) u64.$(OBJEXT) unistd.$(OBJEXT) \
utimens.$(OBJEXT)
libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
@ -543,6 +543,7 @@ LD_SWITCH_SYSTEM = @LD_SWITCH_SYSTEM@
LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@
LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@
LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@
LIBACL_LIBS = @LIBACL_LIBS@
LIBGIF = @LIBGIF@
LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
@ -560,6 +561,7 @@ LIBRESOLV = @LIBRESOLV@
LIBS = @LIBS@
LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
LIBSOUND = @LIBSOUND@
LIBS_GNUSTEP = @LIBS_GNUSTEP@
LIBS_MAIL = @LIBS_MAIL@
LIBS_SYSTEM = @LIBS_SYSTEM@
LIBS_TERMCAP = @LIBS_TERMCAP@
@ -762,7 +764,6 @@ STDINT_H = @STDINT_H@
STRIP = @STRIP@
SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
TERMCAP_OBJ = @TERMCAP_OBJ@
TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
TOOLKIT_LIBW = @TOOLKIT_LIBW@
@ -919,9 +920,9 @@ DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src
libgnu_a_SOURCES = allocator.c c-ctype.h c-ctype.c c-strcase.h \
c-strcasecmp.c c-strncasecmp.c careadlinkat.c close-stream.c \
md5.c sha1.c sha256.c sha512.c dtoastr.c dtotimespec.c \
filemode.c $(am__append_1) gettime.c stat-time.c stdio.c \
strftime.c timespec.c timespec-add.c timespec-sub.c u64.c \
unistd.c utimens.c
filemode.c $(am__append_1) gettime.c stat-time.c strftime.c \
timespec.c timespec-add.c timespec-sub.c u64.c unistd.c \
utimens.c
libgnu_a_LIBADD = $(gl_LIBOBJS)
libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
EXTRA_libgnu_a_SOURCES = ftoastr.c dup2.c euidaccess.c execinfo.c \
@ -1024,7 +1025,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig2str.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-time.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strftime.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoimax.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtol.Po@am__quote@

11
autogen/config.in
View file

@ -2,7 +2,7 @@
/* GNU Emacs site configuration template file.
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2012
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2013
Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -479,12 +479,18 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `gtk_file_selection_new' function. */
#undef HAVE_GTK_FILE_SELECTION_NEW
/* Define to 1 if you have the `gtk_handle_box_new' function. */
#undef HAVE_GTK_HANDLE_BOX_NEW
/* Define to 1 if you have the `gtk_main' function. */
#undef HAVE_GTK_MAIN
/* Define to 1 if you have the `gtk_orientable_set_orientation' function. */
#undef HAVE_GTK_ORIENTABLE_SET_ORIENTATION
/* Define to 1 if you have the `gtk_tearoff_menu_item_new' function. */
#undef HAVE_GTK_TEAROFF_MENU_ITEM_NEW
/* Define to 1 if you have the `gtk_widget_get_mapped' function. */
#undef HAVE_GTK_WIDGET_GET_MAPPED
@ -716,6 +722,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <png.h> header file. */
#undef HAVE_PNG_H
/* Define to 1 if using POSIX ACL support. */
#undef HAVE_POSIX_ACL
/* Define to 1 if you have the `posix_memalign' function. */
#undef HAVE_POSIX_MEMALIGN

191
autogen/configure vendored
View file

@ -1201,6 +1201,7 @@ FONTCONFIG_LIBS
FONTCONFIG_CFLAGS
LIBXMU
LIBXTR6
LIBACL_LIBS
LIBGNUTLS_LIBS
LIBGNUTLS_CFLAGS
LIBSELINUX_LIBS
@ -1236,7 +1237,7 @@ NS_OBJC_OBJ
NS_OBJ
ns_self_contained
INSTALL_ARCH_INDEP_EXTRA
TEMACS_LDFLAGS2
LIBS_GNUSTEP
LD_SWITCH_X_SITE_RPATH
XMKMF
DEPFLAGS
@ -1395,6 +1396,7 @@ with_dbus
with_gconf
with_gsettings
with_selinux
with_acl
with_gnutls
with_inotify
with_makeinfo
@ -1409,6 +1411,7 @@ enable_checking
enable_check_lisp_object_type
enable_profiling
enable_autodepend
enable_gtk_deprecation_warnings
enable_dependency_tracking
enable_largefile
enable_gcc_warnings
@ -2068,6 +2071,8 @@ Optional Features:
--enable-autodepend automatically generate dependencies to .h-files.
Requires GNU Make and Gcc. Enabled if GNU Make and
Gcc is found
--enable-gtk-deprecation-warnings
Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-largefile omit support for large files
@ -2118,6 +2123,7 @@ Optional Packages:
--without-gconf don't compile with GConf support
--without-gsettings don't compile with GSettings support
--without-selinux don't compile with SELinux support
--without-acl don't compile with ACL support
--without-gnutls don't use -lgnutls for SSL/TLS support
--without-inotify don't compile with inotify (file-watch) support
--without-makeinfo don't require makeinfo for building manuals
@ -3327,6 +3333,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
emacs_config_options="$@"
ac_config_headers="$ac_config_headers src/config.h:src/config.in"
@ -3681,7 +3688,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
case $mkdir_p in
[\\/$]* | ?:[\\/]*) ;;
@ -4174,6 +4180,14 @@ else
fi
# Check whether --with-acl was given.
if test "${with_acl+set}" = set; then :
withval=$with_acl;
else
with_acl=$with_features
fi
# Check whether --with-gnutls was given.
if test "${with_gnutls+set}" = set; then :
withval=$with_gnutls;
@ -4385,6 +4399,12 @@ else
fi
# Check whether --enable-gtk-deprecation-warnings was given.
if test "${enable_gtk_deprecation_warnings+set}" = set; then :
enableval=$enable_gtk_deprecation_warnings; ac_enable_gtk_deprecation_warnings="${enableval}"
fi
#### Make srcdir absolute, if it isn't already. It's important to
#### avoid running the file name through pwd unnecessarily, since pwd can
#### give you automounter prefixes, which can go away. We do all this
@ -7282,38 +7302,12 @@ fi
# <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
nw="$nw -Wshadow"
# Emacs's use of alloca inhibits protecting the stack.
nw="$nw -Wstack-protector"
# The following line should be removable at some point.
nw="$nw -Wsuggest-attribute=pure"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use -Wstack-protector" >&5
$as_echo_n "checking whether to use -Wstack-protector... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if (1 <= __LONG_MAX__ >> 31 >> 31 \
&& 4 < __GNUC__ + (7 < __GNUC_MINOR__ + (2 <= __GNUC_PATCHLEVEL__)))
/* OK */
#else
#error "Not GCC, or GCC before 4.7.2, or 'long int' has < 64 bits."
#endif
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
nw="$nw -Wstack-protector"
fi
rm -f conftest.err conftest.$ac_ext
if test -n "$GCC"; then
@ -9526,8 +9520,8 @@ tmp_CPPFLAGS="$CPPFLAGS"
tmp_CFLAGS="$CFLAGS"
CPPFLAGS="$CPPFLAGS -x objective-c"
CFLAGS="$CFLAGS -x objective-c"
TEMACS_LDFLAGS2="\${LDFLAGS}"
GNU_OBJC_CFLAGS=
LIBS_GNUSTEP=
if test "${with_ns}" != no; then
if test "${opsys}" = darwin; then
NS_IMPL_COCOA=yes
@ -9552,9 +9546,9 @@ if test "${with_ns}" != no; then
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}"
LIBS_GNUSTEP="-lgnustep-gui -lgnustep-base -lobjc -lpthread"
LIB_STANDARD=
START_FILES=
TEMACS_LDFLAGS2=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS" >&5
$as_echo_n "checking if GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS... " >&6; }
if test "${emacs_cv_objc_exceptions+set}" = set; then :
@ -10869,6 +10863,9 @@ $as_echo "#define HAVE_GTK3 1" >>confdefs.h
GTK_OBJ=emacsgtkfixed.o
term_header=gtkutil.h
USE_GTK_TOOLKIT="GTK3"
if test "x$ac_enable_gtk_deprecation_warnings" = x; then
GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS"
fi
else
check_gtk2=yes
gtk3_pkg_errors="$GTK_PKG_ERRORS "
@ -11018,6 +11015,53 @@ done
fi
HAVE_GTK_HANDLE_BOX=no
ac_fn_c_check_decl "$LINENO" "GTK_TYPE_HANDLE_BOX" "ac_cv_have_decl_GTK_TYPE_HANDLE_BOX" "$ac_includes_default
#include <gtk/gtk.h>
"
if test "x$ac_cv_have_decl_GTK_TYPE_HANDLE_BOX" = x""yes; then :
HAVE_GTK_HANDLE_BOX=yes
else
HAVE_GTK_HANDLE_BOX=no
fi
if test "$HAVE_GTK_HANDLE_BOX" = yes; then
for ac_func in gtk_handle_box_new
do :
ac_fn_c_check_func "$LINENO" "gtk_handle_box_new" "ac_cv_func_gtk_handle_box_new"
if test "x$ac_cv_func_gtk_handle_box_new" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GTK_HANDLE_BOX_NEW 1
_ACEOF
fi
done
fi
HAVE_GTK_TEAROFF_MENU_ITEM=no
ac_fn_c_check_decl "$LINENO" "GTK_TYPE_TEAROFF_MENU_ITEM" "ac_cv_have_decl_GTK_TYPE_TEAROFF_MENU_ITEM" "$ac_includes_default
#include <gtk/gtk.h>
"
if test "x$ac_cv_have_decl_GTK_TYPE_TEAROFF_MENU_ITEM" = x""yes; then :
HAVE_GTK_TEAROFF_MENU_ITEM=yes
else
HAVE_GTK_TEAROFF_MENU_ITEM=no
fi
if test "$HAVE_GTK_TEAROFF_MENU_ITEM" = yes; then
for ac_func in gtk_tearoff_menu_item_new
do :
ac_fn_c_check_func "$LINENO" "gtk_tearoff_menu_item_new" "ac_cv_func_gtk_tearoff_menu_item_new"
if test "x$ac_cv_func_gtk_tearoff_menu_item_new" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GTK_TEAROFF_MENU_ITEM_NEW 1
_ACEOF
fi
done
fi
for ac_func in gtk_widget_get_window gtk_widget_set_has_window \
gtk_dialog_get_action_area gtk_widget_get_sensitive \
@ -11489,6 +11533,73 @@ $as_echo "#define HAVE_INOTIFY 1" >>confdefs.h
fi
HAVE_POSIX_ACL=no
LIBACL_LIBS=
if test "${with_acl}" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_set_file in -lacl" >&5
$as_echo_n "checking for acl_set_file in -lacl... " >&6; }
if test "${ac_cv_lib_acl_acl_set_file+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lacl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char acl_set_file ();
int
main ()
{
return acl_set_file ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_acl_acl_set_file=yes
else
ac_cv_lib_acl_acl_set_file=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_set_file" >&5
$as_echo "$ac_cv_lib_acl_acl_set_file" >&6; }
if test "x$ac_cv_lib_acl_acl_set_file" = x""yes; then :
HAVE_POSIX_ACL=yes
else
HAVE_POSIX_ACL=no
fi
if test "$HAVE_POSIX_ACL" = yes; then
$as_echo "#define HAVE_POSIX_ACL 1" >>confdefs.h
LIBACL_LIBS=-lacl
else
ac_fn_c_check_func "$LINENO" "acl_set_file" "ac_cv_func_acl_set_file"
if test "x$ac_cv_func_acl_set_file" = x""yes; then :
HAVE_POSIX_ACL=yes
else
HAVE_POSIX_ACL=no
fi
if test "$HAVE_POSIX_ACL" = yes; then
$as_echo "#define HAVE_POSIX_ACL 1" >>confdefs.h
fi
fi
fi
HAVE_XAW3D=no
LUCID_LIBW=
if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
@ -15483,7 +15594,7 @@ esac
case $opsys in
aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd )
aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin )
$as_echo "#define SIGNALS_VIA_CHARACTERS 1" >>confdefs.h
;;
@ -15991,7 +16102,7 @@ fi
version=$PACKAGE_VERSION
copyright="Copyright (C) 2012 Free Software Foundation, Inc."
copyright="Copyright (C) 2013 Free Software Foundation, Inc."
cat >>confdefs.h <<_ACEOF
#define COPYRIGHT "$copyright"
@ -16055,9 +16166,10 @@ cat >>confdefs.h <<_ACEOF
#define EMACS_CONFIGURATION "${canonical}"
_ACEOF
emacs_config_options=`echo "$emacs_config_options" | sed -e "s/\"/'/g"`
cat >>confdefs.h <<_ACEOF
#define EMACS_CONFIG_OPTIONS "${ac_configure_args}"
#define EMACS_CONFIG_OPTIONS "${emacs_config_options}"
_ACEOF
@ -20558,6 +20670,9 @@ int result = 0;
/* Many gnulib modules require POSIX conformance of EBADF. */
if (dup2 (2, 1000000) == -1 && errno != EBADF)
result |= 16;
/* Flush out a cygwin core dump. */
if (dup2 (2, -1) != -1 || errno != EBADF)
result |= 32;
return result;
;
@ -25733,10 +25848,6 @@ case "$opsys" in
*) LD_SWITCH_SYSTEM_TEMACS= ;;
esac
if test "$NS_IMPL_GNUSTEP" = "yes"; then
LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
fi

2
autogen/update_autogen
View file

@ -1,7 +1,7 @@
#!/bin/bash
### update_autogen - update the generated files in Emacs autogen/ directory
## Copyright (C) 2011-2012 Free Software Foundation, Inc.
## Copyright (C) 2011-2013 Free Software Foundation, Inc.
## Author: Glenn Morris <rgm@gnu.org>

2
build-aux/move-if-change
View file

@ -8,7 +8,7 @@ VERSION='2012-01-06 07:23'; # UTC
# If you change this file with Emacs, please let the write hook
# do its job. Otherwise, update this string manually.
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
build-aux/snippet/arg-nonnull.h
View file

@ -1,5 +1,5 @@
/* A C macro for declaring that specific arguments must not be NULL.
Copyright (C) 2009-2012 Free Software Foundation, Inc.
Copyright (C) 2009-2013 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published

2
build-aux/snippet/c++defs.h
View file

@ -1,5 +1,5 @@
/* C++ compatible function declaration macros.
Copyright (C) 2010-2012 Free Software Foundation, Inc.
Copyright (C) 2010-2013 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published

2
build-aux/snippet/warn-on-use.h
View file

@ -1,5 +1,5 @@
/* A C macro for emitting warnings if a function is used.
Copyright (C) 2010-2012 Free Software Foundation, Inc.
Copyright (C) 2010-2013 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published

4
build-aux/update-subdirs
View file

@ -1,8 +1,8 @@
#!/bin/sh
# Write into $1/subdirs.el a list of subdirs of directory $1.
# Copyright (C) 1994-1995, 1997, 1999, 2001-2012
# Free Software Foundation, Inc.
# Copyright (C) 1994-1995, 1997, 1999, 2001-2013 Free Software
# Foundation, Inc.
# This file is part of GNU Emacs.

2
config.bat
View file

@ -1,7 +1,7 @@
@echo off
rem ----------------------------------------------------------------------
rem Configuration script for MSDOS
rem Copyright (C) 1994-1999, 2001-2012 Free Software Foundation, Inc.
rem Copyright (C) 1994-1999, 2001-2013 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.

67
configure.ac
View file

@ -4,7 +4,7 @@ dnl autoconf
dnl in the directory containing this script.
dnl If you changed any AC_DEFINES, also run autoheader.
dnl
dnl Copyright (C) 1994-1996, 1999-2012 Free Software Foundation, Inc.
dnl Copyright (C) 1994-1996, 1999-2013 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Emacs.
dnl
@ -23,6 +23,9 @@ dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.65)
AC_INIT(emacs, 24.3.50)
dnl This is the documented way to record the args passed to configure,
dnl rather than $ac_configure_args.
emacs_config_options="$@"
AC_CONFIG_HEADER(src/config.h:src/config.in)
AC_CONFIG_SRCDIR(src/lisp.h)
AC_CONFIG_AUX_DIR(build-aux)
@ -356,6 +359,11 @@ AC_ARG_ENABLE(autodepend,
found])],
[ac_enable_autodepend="${enableval}"],[ac_enable_autodepend=yes])
AC_ARG_ENABLE(gtk-deprecation-warnings,
[AS_HELP_STRING([--enable-gtk-deprecation-warnings],
[Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])],
[ac_enable_gtk_deprecation_warnings="${enableval}"],[])
#### Make srcdir absolute, if it isn't already. It's important to
#### avoid running the file name through pwd unnecessarily, since pwd can
#### give you automounter prefixes, which can go away. We do all this
@ -727,23 +735,12 @@ else
# <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
nw="$nw -Wshadow"
# Emacs's use of alloca inhibits protecting the stack.
nw="$nw -Wstack-protector"
# The following line should be removable at some point.
nw="$nw -Wsuggest-attribute=pure"
AC_MSG_CHECKING([whether to use -Wstack-protector])
AC_PREPROC_IFELSE(
[AC_LANG_PROGRAM(
[[#if (1 <= __LONG_MAX__ >> 31 >> 31 \
&& 4 < __GNUC__ + (7 < __GNUC_MINOR__ + (2 <= __GNUC_PATCHLEVEL__)))
/* OK */
#else
#error "Not GCC, or GCC before 4.7.2, or 'long int' has < 64 bits."
#endif
]])],
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)
nw="$nw -Wstack-protector"])
gl_MANYWARN_ALL_GCC([ws])
gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])
for w in $ws; do
@ -1483,8 +1480,8 @@ tmp_CPPFLAGS="$CPPFLAGS"
tmp_CFLAGS="$CFLAGS"
CPPFLAGS="$CPPFLAGS -x objective-c"
CFLAGS="$CFLAGS -x objective-c"
TEMACS_LDFLAGS2="\${LDFLAGS}"
GNU_OBJC_CFLAGS=
LIBS_GNUSTEP=
if test "${with_ns}" != no; then
if test "${opsys}" = darwin; then
NS_IMPL_COCOA=yes
@ -1511,9 +1508,9 @@ if test "${with_ns}" != no; then
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}"
LIBS_GNUSTEP="-lgnustep-gui -lgnustep-base -lobjc -lpthread"
LIB_STANDARD=
START_FILES=
TEMACS_LDFLAGS2=
dnl GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS to 0 or 1.
dnl If they had chosen to either define it or not, we could have
dnl just used AC_CHECK_DECL here.
@ -1564,7 +1561,7 @@ fail;
fi
fi
AC_SUBST(TEMACS_LDFLAGS2)
AC_SUBST(LIBS_GNUSTEP)
INSTALL_ARCH_INDEP_EXTRA=install-etc
ns_self_contained=no
@ -2004,6 +2001,9 @@ if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOO
GTK_OBJ=emacsgtkfixed.o
term_header=gtkutil.h
USE_GTK_TOOLKIT="GTK3"
if test "x$ac_enable_gtk_deprecation_warnings" = x; then
GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS"
fi
else
check_gtk2=yes
gtk3_pkg_errors="$GTK_PKG_ERRORS "
@ -2079,6 +2079,23 @@ if test "${HAVE_GTK}" = "yes"; then
AC_CHECK_FUNCS(gtk_file_selection_new)
fi
dnl Same as above for gtk_handle_box.
HAVE_GTK_HANDLE_BOX=no
AC_CHECK_DECL(GTK_TYPE_HANDLE_BOX, HAVE_GTK_HANDLE_BOX=yes,
HAVE_GTK_HANDLE_BOX=no, [AC_INCLUDES_DEFAULT
#include <gtk/gtk.h>])
if test "$HAVE_GTK_HANDLE_BOX" = yes; then
AC_CHECK_FUNCS(gtk_handle_box_new)
fi
dnl Same as above for gtk_tearoff_menu_item.
HAVE_GTK_TEAROFF_MENU_ITEM=no
AC_CHECK_DECL(GTK_TYPE_TEAROFF_MENU_ITEM, HAVE_GTK_TEAROFF_MENU_ITEM=yes,
HAVE_GTK_TEAROFF_MENU_ITEM=no, [AC_INCLUDES_DEFAULT
#include <gtk/gtk.h>])
if test "$HAVE_GTK_TEAROFF_MENU_ITEM" = yes; then
AC_CHECK_FUNCS(gtk_tearoff_menu_item_new)
fi
dnl Check for functions introduced in 2.14 and later.
AC_CHECK_FUNCS(gtk_widget_get_window gtk_widget_set_has_window \
@ -3684,7 +3701,7 @@ AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Make process_send_signal work by
case $opsys in
dnl Perry Smith <pedz@ddivt1.austin.ibm.com> says this is correct for AIX.
dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX.
aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd )
aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin )
AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
;;
@ -4024,7 +4041,7 @@ fi
version=$PACKAGE_VERSION
copyright="Copyright (C) 2012 Free Software Foundation, Inc."
copyright="Copyright (C) 2013 Free Software Foundation, Inc."
AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"],
[Short copyright string for this version of Emacs.])
AC_SUBST(copyright)
@ -4079,7 +4096,9 @@ fi
AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
[Define to the canonical Emacs configuration name.])
AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}",
dnl Replace any embedded " characters (bug#13274).
emacs_config_options=`echo "$emacs_config_options" | sed -e "s/\"/'/g"`
AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${emacs_config_options}",
[Define to the options passed to configure.])
AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure
define this to include extra configuration information.])
@ -4293,10 +4312,6 @@ case "$opsys" in
*) LD_SWITCH_SYSTEM_TEMACS= ;;
esac
if test "$NS_IMPL_GNUSTEP" = "yes"; then
LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
fi
AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
@ -4391,7 +4406,7 @@ AC_SUBST(WINDOW_SYSTEM_OBJ)
AH_TOP([/* GNU Emacs site configuration template file.
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2012
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2013
Free Software Foundation, Inc.
This file is part of GNU Emacs.

16
doc/emacs/ChangeLog
View file

@ -1,3 +1,17 @@
2013-01-05 Glenn Morris <rgm@gnu.org>
* text.texi (HTML Mode): Remove deleted nxml C-RET binding.
2012-12-21 Glenn Morris <rgm@gnu.org>
* emacs-xtra.texi (copying): The FSF does not sell copies of this.
Simply include doclicense.
2012-12-21 Chong Yidong <cyd@gnu.org>
* frames.texi (Mouse Commands): Fix description of the effect of
mouse dragging (Bug#13049).
2012-12-15 Juri Linkov <juri@jurta.org>
* misc.texi (Recursive Edit): Add a link to "Query Replace".
@ -9703,7 +9717,7 @@
;; coding: utf-8
;; End:
Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.

2
doc/emacs/Makefile.in
View file

@ -1,6 +1,6 @@
#### Makefile for the Emacs Manual
# Copyright (C) 1994, 1996-2012 Free Software Foundation, Inc.
# Copyright (C) 1994, 1996-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

4
doc/emacs/abbrevs.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Abbrevs
@chapter Abbrevs

2
doc/emacs/ack.texi
View file

@ -1,6 +1,6 @@
@c -*- coding: iso-latin-1 -*-
@c This is part of the Emacs manual.
@c Copyright (C) 1994-1997, 1999-2012 Free Software Foundation, Inc.
@c Copyright (C) 1994-1997, 1999-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@node Acknowledgments

2
doc/emacs/anti.texi
View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2005-2012 Free Software Foundation, Inc.
@c Copyright (C) 2005-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Antinews

2
doc/emacs/arevert-xtra.texi
View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the

4
doc/emacs/basic.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Basic
@chapter Basic Editing Commands

4
doc/emacs/buffers.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Buffers
@chapter Using Multiple Buffers

4
doc/emacs/building.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Building
@chapter Compiling and Testing Programs

2
doc/emacs/cal-xtra.texi
View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual. -*- coding: iso-latin-1 -*-
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the

6
doc/emacs/calendar.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual. -*- coding: iso-latin-1 -*-
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Calendar/Diary
@chapter The Calendar and the Diary
@ -372,7 +372,7 @@ Generate a one-month calendar (@code{cal-html-cursor-month}).
@item H y
Generate a calendar file for each month of a year, as well as an index
page (@code{cal-html-cursor-year}). By default, this command writes
files to a @var{yyyy} subdirectory - if this is altered some hyperlinks
files to a @var{yyyy} subdirectory---if this is altered some hyperlinks
between years will not work.
@end table

4
doc/emacs/cmdargs.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Emacs Invocation
@appendix Command Line Arguments for Emacs Invocation

4
doc/emacs/commands.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@chapter Characters, Keys and Commands

4
doc/emacs/custom.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Customization
@chapter Customization

2
doc/emacs/dired-xtra.texi
View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the

4
doc/emacs/dired.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Dired
@chapter Dired, the Directory Editor

4
doc/emacs/display.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Display

24
doc/emacs/emacs-xtra.texi
View file

@ -11,25 +11,18 @@
@copying
This manual describes specialized features of Emacs.
Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
Copyright @copyright{} 2004--2013 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU
Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the
license is included in the section entitled ``GNU Free Documentation
License'' in the Emacs manual.
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@ -60,7 +53,7 @@ license to the document, as described in section 6 of the license.
@menu
* Introduction:: What documentation belongs here?
@iftex
* Picture Mode:: Editing pictures made up of characters using
* Picture Mode:: Editing pictures made up of characters using
the quarter-plane screen model.
* Autorevert:: Auto Reverting non-file buffers.
@ -71,6 +64,7 @@ license to the document, as described in section 6 of the license.
* Fortran:: Fortran mode and its special features.
* MS-DOS:: Using Emacs on MS-DOS.
@end iftex
* GNU Free Documentation License:: The license for this documentation.
* Index::
@end menu
@ -131,6 +125,10 @@ the Emacs manual.
@lowersections
@end iftex
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@node Index
@unnumbered Index

2
doc/emacs/emacs.texi
View file

@ -26,7 +26,7 @@ This is the @cite{GNU Emacs Manual},
@end ifnottex
updated for Emacs version @value{EMACSVER}.
Copyright @copyright{} 1985-1987, 1993-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1985--1987, 1993--2013 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document

2
doc/emacs/emerge-xtra.texi
View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the

4
doc/emacs/entering.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@chapter Entering and Exiting Emacs

4
doc/emacs/files.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Files
@chapter File Handling

4
doc/emacs/fixit.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Fixit
@chapter Commands for Fixing Typos

2
doc/emacs/fortran-xtra.texi
View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the

8
doc/emacs/frames.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Frames
@chapter Frames and Graphical Displays
@ -77,8 +77,8 @@ for doing so on MS-DOS).
Move point to where you click (@code{mouse-set-point}).
@item Drag-Mouse-1
Activate the region around the text selected by dragging, and copy it
to the kill ring (@code{mouse-set-region}).
Activate the region around the text selected by dragging, and put the
text in the primary selection (@code{mouse-set-region}).
@item Mouse-2
Move point to where you click, and insert the contents of the primary

138
doc/emacs/glossary.texi
View file

@ -1,12 +1,12 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Glossary
@unnumbered Glossary
@table @asis
@anchor{Glossary - Abbrev}
@anchor{Glossary---Abbrev}
@item Abbrev
An abbrev is a text string that expands into a different text string
when present in the buffer. For example, you might define a few letters
@ -29,7 +29,7 @@ key labeled @key{ALT} that is really a @key{META} key.) @xref{User
Input, Alt}.
@item Argument
@xref{Glossary - Numeric Argument}.
@xref{Glossary---Numeric Argument}.
@item @acronym{ASCII} character
An @acronym{ASCII} character is either an @acronym{ASCII} control
@ -63,7 +63,7 @@ function from those libraries. This is called `autoloading'.
A backtrace is a trace of a series of function calls showing how a
program arrived at a certain point. It is used mainly for finding and
correcting bugs (q.v.). Emacs can display a backtrace when it signals
an error or when you type @kbd{C-g} (@pxref{Glossary - Quitting}).
an error or when you type @kbd{C-g} (@pxref{Glossary---Quitting}).
@xref{Checklist}.
@item Backup File
@ -79,14 +79,14 @@ Automatic balancing works by blinking or highlighting the delimiter
that matches the one you just inserted, or inserting the matching
delimiter for you (@pxref{Matching,,Matching Parens}).
@anchor{Glossary - Balanced Expression}
@anchor{Glossary---Balanced Expression}
@item Balanced Expressions
A balanced expression is a syntactically recognizable expression, such
as a symbol, number, string constant, block, or parenthesized expression
in C@. @xref{Expressions,Balanced Expressions}.
@item Balloon Help
@xref{Glossary - Tooltips}.
@xref{Glossary---Tooltips}.
@item Base Buffer
A base buffer is a buffer whose text is shared by an indirect buffer
@ -102,7 +102,7 @@ is `bidirectional text'. @xref{Bidirectional Editing}.
To bind a key sequence means to give it a binding (q.v.).
@xref{Rebinding}.
@anchor{Glossary - Binding}
@anchor{Glossary---Binding}
@item Binding
A key sequence gets its meaning in Emacs by having a binding, which is a
command (q.v.), a Lisp function that is run when you type that
@ -151,12 +151,12 @@ A button down event is the kind of input event (q.v.@:) generated
right away when you press down on a mouse button. @xref{Mouse Buttons}.
@item By Default
@xref{Glossary - Default}.
@xref{Glossary---Default}.
@item Byte Compilation
@xref{Glossary - Compilation}.
@xref{Glossary---Compilation}.
@anchor{Glossary - C-}
@anchor{Glossary---C-}
@item @kbd{C-}
@kbd{C-} in the name of a character is an abbreviation for Control.
@xref{User Input,C-}.
@ -181,7 +181,7 @@ Emacs supports a number of character sets, each of which represents a
particular alphabet or script. @xref{International}.
@item Character Terminal
@xref{Glossary - Text Terminal}.
@xref{Glossary---Text Terminal}.
@item Click Event
A click event is the kind of input event (q.v.@:) generated when you
@ -189,7 +189,7 @@ press a mouse button and release it without moving the mouse.
@xref{Mouse Buttons}.
@item Client
@xref{Glossary - Server}.
@xref{Glossary---Server}.
@item Clipboard
A clipboard is a buffer provided by the window system for transferring
@ -211,7 +211,7 @@ binding (q.v.@:) is looked up in the relevant keymaps (q.v.@:) to find
the command to run. @xref{Commands}.
@item Command History
@xref{Glossary - Minibuffer History}.
@xref{Glossary---Minibuffer History}.
@item Command Name
A command name is the name of a Lisp symbol that is a command
@ -229,7 +229,7 @@ Common Lisp is a dialect of Lisp (q.v.@:) much larger and more powerful
than Emacs Lisp. Emacs provides a subset of Common Lisp in the CL
package. @xref{Top, Common Lisp, Overview, cl, Common Lisp Extensions}.
@anchor{Glossary - Compilation}
@anchor{Glossary---Compilation}
@item Compilation
Compilation is the process of creating an executable program from source
code. Emacs has commands for compiling files of Emacs Lisp code
@ -254,10 +254,10 @@ is known; for example, on command names, buffer names, and
file names. Completion usually occurs when @key{TAB}, @key{SPC} or
@key{RET} is typed. @xref{Completion}.@refill
@anchor{Glossary - Continuation Line}
@anchor{Glossary---Continuation Line}
@item Continuation Line
When a line of text is longer than the width of the window, it
normally (but see @ref{Glossary - Truncation}) takes up more than one
normally (but see @ref{Glossary---Truncation}) takes up more than one
screen line when displayed. We say that the text line is continued, and all
screen lines used for it after the first are called continuation
lines. @xref{Continuation Lines}. A related Emacs feature is
@ -282,7 +282,7 @@ GNU General Public License. @xref{Copying}.
@item @key{CTRL}
The @key{CTRL} or ``control'' key is what you hold down
in order to enter a control character (q.v.). @xref{Glossary - C-}.
in order to enter a control character (q.v.). @xref{Glossary---C-}.
@item Current Buffer
The current buffer in Emacs is the Emacs buffer on which most editing
@ -317,9 +317,9 @@ or by rebinding key sequences (@pxref{Keymaps}).
@cindex cut and paste
@item Cut and Paste
@xref{Glossary - Killing}, and @ref{Glossary - Yanking}.
@xref{Glossary---Killing}, and @ref{Glossary---Yanking}.
@anchor{Glossary - Daemon}
@anchor{Glossary---Daemon}
@item Daemon
A daemon is a standard term for a system-level process that runs in the
background. Daemons are often started when the system first starts up.
@ -333,7 +333,7 @@ do not specify one. When the minibuffer is used to read an argument,
the default argument is used if you just type @key{RET}.
@xref{Minibuffer}.
@anchor{Glossary - Default}
@anchor{Glossary---Default}
@item Default
A default is the value that is used for a certain purpose when
you do not explicitly specify a value to use.
@ -360,7 +360,7 @@ key or the @key{BACKSPACE} key, whichever one is easy to type.
Deletion means erasing text without copying it into the kill ring
(q.v.). The alternative is killing (q.v.). @xref{Killing,Deletion}.
@anchor{Glossary - Deletion of Files}
@anchor{Glossary---Deletion of Files}
@item Deletion of Files
Deleting a file means erasing it from the file system.
(Note that some systems use the concept of a ``trash can'', or ``recycle
@ -384,7 +384,7 @@ File directories are named collections in the file system, within which
you can place individual files or subdirectories. They are sometimes
referred to as ``folders''. @xref{Directories}.
@anchor{Glossary - Directory Local Variable}
@anchor{Glossary---Directory Local Variable}
@item Directory Local Variable
A directory local variable is a local variable (q.v.@:) that applies
to all the files within a certain directory. @xref{Directory
@ -436,7 +436,7 @@ else as well. For example, some programming language major modes define
particular delimiter characters to reindent the line, or insert one or
more newlines in addition to self-insertion.
@anchor{Glossary - End Of Line}
@anchor{Glossary---End Of Line}
@item End Of Line
End of line is a character or a sequence of characters that indicate
the end of a text line. On GNU and Unix systems, this is a newline
@ -452,7 +452,7 @@ variables in the environment it passes to programs it invokes.
@xref{Environment}.
@item EOL
@xref{Glossary - End Of Line}.
@xref{Glossary---End Of Line}.
@item Error
An error occurs when an Emacs command cannot execute in the current
@ -477,7 +477,7 @@ typed), you press the @key{ESC} key as you would press a letter key, and
it applies to the next character you type.
@item Expression
@xref{Glossary - Balanced Expression}.
@xref{Glossary---Balanced Expression}.
@item Expunging
Expunging an Rmail, Gnus newsgroup, or Dired buffer is an operation
@ -494,10 +494,10 @@ order to display that text as specified by the face attributes.
@item File Local Variable
A file local variable is a local variable (q.v.@:) specified in a
given file. @xref{File Variables}, and @ref{Glossary - Directory
given file. @xref{File Variables}, and @ref{Glossary---Directory
Local Variable}.
@anchor{Glossary - File Locking}
@anchor{Glossary---File Locking}
@item File Locking
Emacs uses file locking to notice when two different users
start to edit one file at the same time. @xref{Interlocking}.
@ -530,14 +530,14 @@ The fill prefix is a string that should be expected at the beginning
of each line when filling is done. It is not regarded as part of the
text to be filled. @xref{Filling}.
@anchor{Glossary - Filling}
@anchor{Glossary---Filling}
@item Filling
Filling text means adjusting the position of line-breaks to shift text
between consecutive lines, so that all the lines are approximately the
same length. @xref{Filling}. Some other editors call this feature
``line wrapping''.
@anchor{Glossary - Font Lock}
@anchor{Glossary---Font Lock}
@item Font Lock
Font Lock is a mode that highlights parts of buffer text in different
faces, according to the syntax. Some other editors refer to this as
@ -551,7 +551,7 @@ make it easy to change several fonts at once by specifying the name of a
fontset, rather than changing each font separately. @xref{Fontsets}.
@item Formfeed Character
@xref{Glossary - Page}.
@xref{Glossary---Page}.
@item Frame
A frame is a rectangular cluster of Emacs windows. Emacs starts out
@ -567,7 +567,7 @@ and modify it. Emacs is free software, part of the GNU project
(q.v.), and distributed under a copyleft (q.v.@:) license called the
GNU General Public License. @xref{Copying}.
@anchor{Glossary - Free Software Foundation}
@anchor{Glossary---Free Software Foundation}
@item Free Software Foundation
The Free Software Foundation (FSF) is a charitable foundation
dedicated to promoting the development of free software (q.v.).
@ -581,7 +581,7 @@ the buffer text (@pxref{Fringes}). Emacs displays the fringe using a
special face (q.v.@:) called @code{fringe}. @xref{Faces,fringe}.
@item FSF
@xref{Glossary - Free Software Foundation}.
@xref{Glossary---Free Software Foundation}.
@item FTP
FTP is an acronym for File Transfer Protocol. This is one standard
@ -610,9 +610,9 @@ mode's local keymap (q.v.). @xref{Keymaps}.
The global mark ring records the series of buffers you have recently
set a mark (q.v.@:) in. In many cases you can use this to backtrack
through buffers you have been editing, or in which you have found
tags (@pxref{Glossary - Tags Table}). @xref{Global Mark Ring}.
tags (@pxref{Glossary---Tags Table}). @xref{Global Mark Ring}.
@anchor{Glossary - Global Substitution}
@anchor{Glossary---Global Substitution}
@item Global Substitution
Global substitution means replacing each occurrence of one string by
another string throughout a large amount of text. @xref{Replace}.
@ -648,7 +648,7 @@ buffer.
Emacs uses highlighting in several ways. It highlights the region
whenever it is active (@pxref{Mark}). Incremental search also
highlights matches (@pxref{Incremental Search}). @xref{Glossary - Font Lock}.
highlights matches (@pxref{Incremental Search}). @xref{Glossary---Font Lock}.
@item Hardcopy
Hardcopy means printed output. Emacs has various commands for
@ -697,7 +697,7 @@ Rmail transfers mail from inboxes to Rmail files in which the
mail is then stored permanently or until explicitly deleted.
@xref{Rmail Inbox}.
@anchor{Glossary - Incremental Search}
@anchor{Glossary---Incremental Search}
@item Incremental Search
Emacs provides an incremental search facility, whereby Emacs begins
searching for a string as soon as you type the first character.
@ -733,17 +733,17 @@ Insertion means adding text into the buffer, either from the keyboard
or from some other place in Emacs.
@item Interlocking
@xref{Glossary - File Locking}.
@xref{Glossary---File Locking}.
@item Isearch
@xref{Glossary - Incremental Search}.
@xref{Glossary---Incremental Search}.
@item Justification
Justification means adding extra spaces within lines of text in order
to adjust the position of the text edges. @xref{Fill Commands}.
@item Key Binding
@xref{Glossary - Binding}.
@xref{Glossary---Binding}.
@item Keyboard Macro
Keyboard macros are a way of defining new Emacs commands from
@ -756,7 +756,7 @@ play them back as many times as you like.
@item Keyboard Shortcut
A keyboard shortcut is a key sequence (q.v.@:) that invokes a
command. What some programs call ``assigning a keyboard shortcut'',
Emacs calls ``binding a key sequence''. @xref{Glossary - Binding}.
Emacs calls ``binding a key sequence''. @xref{Glossary---Binding}.
@item Key Sequence
A key sequence (key, for short) is a sequence of input events (q.v.@:)
@ -776,11 +776,11 @@ codes that come from the terminal into the character codes that make up
key sequences.
@item Kill Ring
The kill ring is where all text you have killed (@pxref{Glossary - Killing})
The kill ring is where all text you have killed (@pxref{Glossary---Killing})
recently is saved. You can reinsert any of the killed text still in
the ring; this is called yanking (q.v.). @xref{Yanking}.
@anchor{Glossary - Killing}
@anchor{Glossary---Killing}
@item Killing
Killing means erasing text and saving it on the kill ring so it can be
yanked (q.v.@:) later. Some other systems call this ``cutting''.
@ -802,7 +802,7 @@ non-@acronym{ASCII} text (@pxref{International}).
@c Lexical Binding
@item Line Wrapping
@xref{Glossary - Filling}.
@xref{Glossary---Filling}.
@item Lisp
Lisp is a programming language. Most of Emacs is written in a dialect
@ -851,7 +851,7 @@ Control-Meta; it means the same thing as `@kbd{C-M-}' (q.v.).
name. This is how you run commands that are not bound to key sequences.
@xref{M-x,M-x,Running Commands by Name}.
@anchor{Glossary - Mail}
@anchor{Glossary---Mail}
@item Mail
Mail means messages sent from one user to another through the computer
system, to be read at the recipient's convenience. Emacs has commands for
@ -891,7 +891,7 @@ words you can click on with the mouse to bring up menus, or you can use
a keyboard interface to navigate it. @xref{Menu Bars}.
@item Message
@xref{Glossary - Mail}.
@xref{Glossary---Mail}.
@item Meta
Meta is the name of a modifier bit which you can use in a command
@ -914,7 +914,7 @@ The minibuffer is the window that appears when necessary inside the
echo area (q.v.), used for reading arguments to commands.
@xref{Minibuffer}.
@anchor{Glossary - Minibuffer History}
@anchor{Glossary---Minibuffer History}
@item Minibuffer History
The minibuffer history records the text you have specified in the past
for minibuffer arguments, so you can conveniently use the same text
@ -972,7 +972,7 @@ all. @xref{Narrowing}.
@item Newline
Control-J characters in the buffer terminate lines of text and are
therefore also called newlines. @xref{Glossary - End Of Line}.
therefore also called newlines. @xref{Glossary---End Of Line}.
@cindex nil
@cindex t
@ -980,7 +980,7 @@ therefore also called newlines. @xref{Glossary - End Of Line}.
@code{nil} is a value usually interpreted as a logical ``false''. Its
opposite is @code{t}, interpreted as ``true''.
@anchor{Glossary - Numeric Argument}
@anchor{Glossary---Numeric Argument}
@item Numeric Argument
A numeric argument is a number, specified before a command, to change
the effect of the command. Often the numeric argument serves as a
@ -996,7 +996,7 @@ A package is a collection of Lisp code that you download and
automatically install from within Emacs. Packages provide a
convenient way to add new features. @xref{Packages}.
@anchor{Glossary - Page}
@anchor{Glossary---Page}
@item Page
A page is a unit of text, delimited by formfeed characters (@acronym{ASCII}
control-L, code 014) at the beginning of a line. Some Emacs
@ -1020,7 +1020,7 @@ character. The terminal's cursor (q.v.@:) indicates the location of
point. @xref{Point}.
@item Prefix Argument
@xref{Glossary - Numeric Argument}.
@xref{Glossary---Numeric Argument}.
@item Prefix Key
A prefix key is a key sequence (q.v.@:) whose sole function is to
@ -1056,7 +1056,7 @@ a kind of prompting (@pxref{Echo Area}).
Query-replace is an interactive string replacement feature provided by
Emacs. @xref{Query Replace}.
@anchor{Glossary - Quitting}
@anchor{Glossary---Quitting}
@item Quitting
Quitting means canceling a partially typed command or a running
command, using @kbd{C-g} (or @kbd{C-@key{BREAK}} on MS-DOS). @xref{Quitting}.
@ -1101,7 +1101,7 @@ correspond to changes that have been made in the text being edited.
@xref{Screen,Redisplay}.
@item Regexp
@xref{Glossary - Regular Expression}.
@xref{Glossary---Regular Expression}.
@item Region
The region is the text between point (q.v.@:) and the mark (q.v.).
@ -1112,7 +1112,7 @@ Registers are named slots in which text, buffer positions, or
rectangles can be saved for later use. @xref{Registers}. A related
Emacs feature is `bookmarks' (q.v.).
@anchor{Glossary - Regular Expression}
@anchor{Glossary---Regular Expression}
@item Regular Expression
A regular expression is a pattern that can match various text strings;
for example, @samp{a[0-9]+} matches @samp{a} followed by one or more
@ -1126,10 +1126,10 @@ you have a supported method to gain access to those files.
@xref{Remote Files}.
@item Repeat Count
@xref{Glossary - Numeric Argument}.
@xref{Glossary---Numeric Argument}.
@item Replacement
@xref{Glossary - Global Substitution}.
@xref{Glossary---Global Substitution}.
@item Restriction
A buffer's restriction is the amount of text, at the beginning or the
@ -1220,12 +1220,12 @@ are self-inserting in Emacs, except in certain special major modes.
Emacs has commands for moving by or killing by sentences.
@xref{Sentences}.
@anchor{Glossary - Server}
@anchor{Glossary---Server}
@item Server
Within Emacs, you can start a `server' process, which listens for
connections from `clients'. This offers a faster alternative to
starting several Emacs instances. @xref{Emacs Server}, and
@ref{Glossary - Daemon}.
@ref{Glossary---Daemon}.
@c This is only covered in the lispref, not the user manual.
@ignore
@ -1277,10 +1277,10 @@ inside the string; however, backslash sequences as in C, such as
allowed as well.
@item String Substitution
@xref{Glossary - Global Substitution}.
@xref{Glossary---Global Substitution}.
@item Syntax Highlighting
@xref{Glossary - Font Lock}.
@xref{Glossary---Font Lock}.
@item Syntax Table
The syntax table tells Emacs which characters are part of a word,
@ -1304,7 +1304,7 @@ your buffers, unsaved edits, undo history, etc. @xref{Exiting}.
@key{TAB} is the tab character. In Emacs it is typically used for
indentation or completion.
@anchor{Glossary - Tags Table}
@anchor{Glossary---Tags Table}
@item Tags Table
A tags table is a file that serves as an index to the function
definitions in one or more other files. @xref{Tags}.
@ -1329,7 +1329,7 @@ Data consisting of written human language (as opposed to programs),
or following the stylistic conventions of human language.
@end itemize
@anchor{Glossary - Text Terminal}
@anchor{Glossary---Text Terminal}
@item Text Terminal
A text terminal, or character terminal, is a display that is limited
to displaying text in character units. Such a terminal cannot control
@ -1352,7 +1352,7 @@ of an Emacs frame. Clicking on one of these icons executes a command.
You can think of this as a graphical relative of the menu bar (q.v.).
@xref{Tool Bars}.
@anchor{Glossary - Tooltips}
@anchor{Glossary---Tooltips}
@item Tooltips
Tooltips are small windows displaying a help echo (q.v.@:) text, which
explains parts of the display, lists useful options available via mouse
@ -1374,17 +1374,17 @@ two adjacent characters, words, balanced expressions (q.v.@:) or lines
(@pxref{Transpose}).
@item Trash Can
@xref{Glossary - Deletion of Files}.
@xref{Glossary---Deletion of Files}.
@anchor{Glossary - Truncation}
@anchor{Glossary---Truncation}
@item Truncation
Truncating text lines in the display means leaving out any text on a
line that does not fit within the right margin of the window
displaying it. @xref{Continuation Lines,Truncation}, and
@ref{Glossary - Continuation Line}.
@ref{Glossary---Continuation Line}.
@item TTY
@xref{Glossary - Text Terminal}.
@xref{Glossary---Text Terminal}.
@item Undoing
Undoing means making your previous editing go in reverse, bringing
@ -1443,13 +1443,13 @@ have their] own windows at the same time. All modern operating systems
include a window system.
@item Word Abbrev
@xref{Glossary - Abbrev}.
@xref{Glossary---Abbrev}.
@item Word Search
Word search is searching for a sequence of words, considering the
punctuation between them as insignificant. @xref{Word Search}.
@anchor{Glossary - Yanking}
@anchor{Glossary---Yanking}
@item Yanking
Yanking means reinserting text previously killed (q.v.). It can be
used to undo a mistaken kill, or for copying or moving text. Some

4
doc/emacs/gnu.texi
View file

@ -1,5 +1,5 @@
@c Copyright (C) 1985-1987, 1993, 1995, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993, 1995, 2001-2013 Free Software
@c Foundation, Inc.
@c
@c Permission is granted to anyone to make or distribute verbatim copies
@c of this document, in any medium, provided that the copyright notice and

4
doc/emacs/help.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Help
@chapter Help

4
doc/emacs/indent.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Indentation
@chapter Indentation

4
doc/emacs/killing.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Killing

4
doc/emacs/kmacro.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Keyboard Macros
@chapter Keyboard Macros

4
doc/emacs/m-x.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node M-x
@chapter Running Commands by Name

2
doc/emacs/macos.texi
View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2000-2012 Free Software Foundation, Inc.
@c Copyright (C) 2000-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Mac OS / GNUstep
@appendix Emacs and Mac OS / GNUstep

6
doc/emacs/maintaining.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Maintaining
@chapter Maintaining Large Programs
@ -1065,7 +1065,7 @@ the version control system which the VC Directory buffer should use.
@cindex CVS directory mode
In addition to the VC Directory buffer, Emacs has a similar facility
called PCL-CVS which is specialized for CVS@. @xref{Top, , About
PCL-CVS, pcl-cvs, PCL-CVS --- The Emacs Front-End to CVS}.
PCL-CVS, pcl-cvs, PCL-CVS---The Emacs Front-End to CVS}.
@end ifnottex
@menu

2
doc/emacs/makefile.w32-in
View file

@ -1,6 +1,6 @@
#### -*- Makefile -*- for the Emacs Manual
# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# Copyright (C) 2003-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

4
doc/emacs/mark.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Mark
@chapter The Mark and the Region

4
doc/emacs/mini.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Minibuffer
@chapter The Minibuffer

4
doc/emacs/misc.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@chapter Miscellaneous Commands

4
doc/emacs/modes.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Modes
@chapter Major and Minor Modes

2
doc/emacs/msdog-xtra.texi
View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the

4
doc/emacs/msdog.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Microsoft Windows
@appendix Emacs and Microsoft Windows/MS-DOS

2
doc/emacs/mule.texi
View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1997, 1999-2012 Free Software Foundation, Inc.
@c Copyright (C) 1997, 1999-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node International
@chapter International Character Set Support

4
doc/emacs/package.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Packages
@chapter Emacs Lisp Packages

2
doc/emacs/picture-xtra.texi
View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the

4
doc/emacs/programs.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Programs
@chapter Editing Programs

4
doc/emacs/regs.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Registers
@chapter Registers

4
doc/emacs/rmail.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Rmail
@chapter Reading Mail with Rmail

4
doc/emacs/screen.texi
View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Screen
@chapter The Organization of the Screen

Some files were not shown because too many files have changed in this diff Show more