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

merge emacs-23

Browse source
This commit is contained in:
Kenichi Handa 2010-11-25 12:56:41 +09:00
commit e957f9ae90
154 changed files with 7767 additions and 3503 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.dir-locals.el
View file

@ -1,9 +1,12 @@
((nil . ((tab-width . 8)
(fill-column . 70)))
(c-mode . ((c-file-style . "GNU")))
;; You must set bugtracker_debbugs_url in your bazaar.conf for this to work.
;; See admin/notes/bugtracker.
(log-edit-mode . ((log-edit-rewrite-fixes
" (bug#\\([0-9]+\\))" . "debbugs:\\1")))
(change-log-mode . ((add-log-time-zone-rule . t)
(fill-column . 74)
(bug-reference-url-format . "http://debbugs.gnu.org/%s")
(mode . bug-reference))))
;; arch-tag: fb93c160-e9fe-4184-aad1-e4f5daa11cbd

20
ChangeLog
View file

@ -1,3 +1,23 @@
2010-11-13 Dan Nicolaescu <dann@ics.uci.edu>
Fix alloca definition when using gcc on non-gnu systems.
* configure.in: Use the code sequence indicated by "info autoconf"
for alloca (bug#6170).
2010-11-08 Stefan Monnier <monnier@iro.umontreal.ca>
* .dir-locals.el (log-edit-mode): Set log-edit-rewrite-fixes.
2010-11-04 Michael Albinus <michael.albinus@gmx.de>
* configure.in: Don't write a warning for D-Bus anymore.
2010-11-03 Glenn Morris <rgm@gnu.org>
* configure.in (CRT_DIR): New output variable.
(--with-crt-dir): New option. (Bug#5655)
(HAVE_LIB64_DIR): Remove.
2010-10-12 Glenn Morris <rgm@gnu.org>
* BUGS, INSTALL.BZR, README: Updates.

2
README
View file

@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
See the end of the file for license conditions.
This directory tree holds version 23.2.50 of GNU Emacs, the extensible,
This directory tree holds version 23.2.90 of GNU Emacs, the extensible,
customizable, self-documenting real-time display editor.
The file INSTALL in this directory says how to build and install GNU

39
admin/notes/bugtracker
View file

@ -449,16 +449,41 @@ http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
** Bazaar stuff
*** You can use `bzr commit --fixes emacs:123' to mark that a commit fixes
Emacs bug 123. You will first need to add a line to your bazaar.conf:
*** You can use `bzr commit --fixes debbugs:123' to mark that a commit fixes
Emacs bug 123. You will first need to add a line to one of your
configuration files, ~/.bazaar/bazaar.conf or ~/.bazaar/locations.conf:
bugtracker_emacs_url = http://debbugs.gnu.org/{id}
bugtracker_debbugs_url = http://debbugs.gnu.org/{id}
Here "{id}" is a literal string, a placeholder that will be replaced
by the bug number you specify after `--fixes debbugs:' in the bzr
command line (123 in the example above).
In the bazaar.conf file, this setting should go into the [DEFAULTS]
section.
In the locations.conf file, it should go into the branch-specific
configuration section for the branch where you want this to be in
effect. For example, if you want this to be in effect for the branch
located at `/home/projects/emacs/trunk', you need to have this in your
~/.bazaar/locations.conf file:
[/home/projects/emacs/trunk]
bugtracker_debbugs_url = http://debbugs.gnu.org/{id}
If you want to use this in all Emacs branches whose common parent is
`/home/projects/emacs', put the setting in the [/home/projects/emacs]
section. See "bzr help configuration" for more information about
the *.conf files, their location and formats. See "bzr help bugs" for
more information about the bugtracker_debbugs_url setting.
See also log-edit-rewrite-fixes in .dir-locals.el.
Note that all this does is add some metadata to the commit, it doesn't
actually mark the bug as closed in the tracker. There seems to be no
way to see this "metadata" with `bzr log', which is rather poor, but
it will show up as a link in a recent loggerhead installation, or with
some of the graphical frontends to bzr log.
actually mark the bug as closed in the tracker. You can see this
information with `bzr log', and it will show up as a link in a recent
loggerhead installation, or with some of the graphical frontends to
`bzr log'.
** Gnus-specific voodoo

523
configure vendored
View file

File diff suppressed because it is too large Load diff

65
configure.in
View file

@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.62)
AC_INIT(emacs, 23.2.50)
AC_INIT(emacs, 23.2.90)
AC_CONFIG_HEADER(src/config.h:src/config.in)
AC_CONFIG_SRCDIR(src/lisp.h)
@ -169,6 +169,12 @@ if test "X${with_pkg_config_prog}" != X; then
fi
fi
CRT_DIR=
AC_ARG_WITH([crt-dir],dnl
[AS_HELP_STRING([--with-crt-dir=DIR],[directory containing crtn.o etc.
This option is only used on x86-64 and s390x GNU/Linux architectures.])])
CRT_DIR="${with_crt_dir}"
AC_ARG_WITH([gnustep-conf],dnl
[AS_HELP_STRING([--with-gnustep-conf=PATH],[path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE, or /etc/GNUstep/GNUstep.conf])])
test "X${with_gnustep_conf}" != X && test "${with_gnustep_conf}" != yes && \
@ -996,18 +1002,28 @@ AC_CONFIG_LIBOBJ_DIR(src)
dnl Do this early because it can frob feature test macros for Unix-98 &c.
AC_SYS_LARGEFILE
### The standard library on x86-64 and s390x GNU/Linux distributions can
### be located in either /usr/lib64 or /usr/lib.
### In some rare cases, /usr/lib64 exists but does not contain the
### relevant files (bug#1287). Hence test for crtn.o.
## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x.
## Other machine types hard-code the location in src/[ms]/*.h.
case "${canonical}" in
x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
if test -e /usr/lib64/crtn.o; then
AC_DEFINE(HAVE_LIB64_DIR, 1,
[Define to 1 if the directory /usr/lib64 exists.])
fi
## On x86-64 and s390x GNU/Linux distributions, the standard library
## can be in a variety of places. We only try /usr/lib64 and /usr/lib.
## For anything else (eg /usr/lib32), it is up the user to specify
## the location (bug#5655).
## Test for crtn.o, not just the directory, because sometimes the
## directory exists but does not have the relevant files (bug#1287).
## If user specified a crt-dir, use that unconditionally.
if test "X$CRT_DIR" = "X"; then
CRT_DIR=/usr/lib
test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64
fi
test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
AC_MSG_ERROR([crt*.o not found. Use --with-crt-dir to specify the location.])
;;
esac
test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib
AC_SUBST(CRT_DIR)
dnl This function defintion taken from Gnome 2.0
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
@ -1760,6 +1776,8 @@ if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then
PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.13, HAVE_GCONF=yes, HAVE_GCONF=no)
if test "$HAVE_GCONF" = yes; then
AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if using GConf.])
dnl Newer GConf doesn't link with g_objects, so this is not defined.
AC_CHECK_FUNCS([g_type_init])
fi
fi
@ -2911,15 +2929,19 @@ extern char *getenv ();
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifndef __GNUC__
# ifdef HAVE_ALLOCA_H
# include <alloca.h>
# else /* AIX files deal with #pragma. */
# ifndef alloca /* predefined by HP cc +Olibcalls */
char *alloca ();
# endif
# endif /* HAVE_ALLOCA_H */
#endif /* __GNUC__ */
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca (size_t);
#endif
#ifndef HAVE_SIZE_T
typedef unsigned size_t;
#endif
@ -3054,11 +3076,6 @@ to run if these resources are not installed."
echo
fi
if test "$HAVE_DBUS" = yes && test "${opsys}" != "gnu-linux"; then
echo "D-Bus integration has been tested for GNU/Linux only."
echo
fi
# Remove any trailing slashes in these variables.
[test "${prefix}" != NONE &&

30
doc/emacs/ChangeLog
View file

@ -1,3 +1,33 @@
2010-11-23 Bob Rogers <rogers-emacs@rgrjr.dyndns.org>
* maintaining.texi (VC With A Locking VCS, VC Directory Commands):
* vc1-xtra.texi (Customizing VC, General VC Options): Small fixes.
2010-11-21 Chong Yidong <cyd@stupidchicken.com>
* maintaining.texi (Version Control Systems): Fix repeated sentence.
Suggested by Štěpán Němec.
2010-11-20 Chong Yidong <cyd@stupidchicken.com>
* maintaining.texi (Version Control): Say "commit", not "check in".
(Version Control Systems): Simplify descriptions.
(VCS Merging, VCS Changesets, VCS Repositories): New nodes, split from
VCS Concepts.
(VC Mode Line): Update example.
(Old Revisions): Document revert-buffer for vc-diff.
(Log Buffer): Promote to a subsection. Document header lines.
* macos.texi (Mac / GNUstep Basics): Document
ns-right-alternate-modifier.
* emacs.texi (Top): Update node listing.
2010-11-06 Eli Zaretskii <eliz@gnu.org>
* msdog.texi (Windows HOME): Add information regarding startup
directory when invoking Emacs from a desktop shortcut. (bug#7300)
2010-09-14 Glenn Morris <rgm@gnu.org>
* cal-xtra.texi (Fancy Diary Display): Emphasize that sort should be

7
doc/emacs/emacs.texi
View file

@ -5,7 +5,7 @@
@c The edition number appears in several places in this file
@set EDITION Sixteenth
@set EMACSVER 23.2.50
@set EMACSVER 23.2.90
@copying
This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
@ -770,6 +770,7 @@ Version Control
* Introduction to VC:: How version control works in general.
* VC Mode Line:: How the mode line shows version control status.
* Basic VC Editing:: How to edit a file under version control.
* Log Buffer:: Features available in log entry buffers.
* Old Revisions:: Examining and comparing old versions.
* Secondary VC Commands:: The commands used a little less frequently.
* VC Directory Mode:: Listing files managed by version control.
@ -784,6 +785,9 @@ Introduction to Version Control
* Why Version Control?:: Understanding the problems it addresses.
* Version Control Systems:: Supported version control back-end systems.
* VCS Concepts:: Words and concepts related to version control.
* VCS Merging:: How file conflicts are handled.
* VCS Changesets:: Changesets in version control.
* VCS Repositories:: Where version control repositories are stored.
* Types of Log File:: The VCS log in contrast to the ChangeLog.
Basic Editing under Version Control
@ -791,7 +795,6 @@ Basic Editing under Version Control
* VC With A Merging VCS:: Without locking: default mode for CVS.
* VC With A Locking VCS:: RCS in its default mode, SCCS, and optionally CVS.
* Advanced C-x v v:: Advanced features available with a prefix argument.
* Log Buffer:: Features available in log entry buffers.
The Secondary Commands of VC

85
doc/emacs/macos.texi
View file

@ -8,23 +8,22 @@
@cindex Macintosh
@cindex GNUstep
This section briefly describes the peculiarities of using Emacs built with
the GNUstep libraries on GNU/Linux or other operating systems, or on Mac OS X
with native window system support. For Mac OS X, Emacs can be built either
without window system support, with X11, or with the Cocoa interface. This
section only applies to the Cocoa build. Emacs 23 does not support Mac OS
Classic.
This section describes the peculiarities of using Emacs built with
the GNUstep libraries on GNU/Linux or other operating systems, or on
Mac OS X with native window system support. On Mac OS X, Emacs can be
built either without window system support, with X11, or with the
Cocoa interface; this section only applies to the Cocoa build. Emacs
does not support earlier versions of Mac OS.
Emacs, when built on Mac OS X, uses the Cocoa application interface. For
various historical and technical reasons, Emacs uses the term @samp{Nextstep}
internally, instead of ``Cocoa'' or ``Mac OS X''; for instance, most of the
commands and variables described in the following sections begin with
@samp{ns-}, which is short for @samp{Nextstep}. NeXTstep was an application
interface released by NeXT Inc during the 1980s, of which Cocoa is a direct
descendant. Apart from Cocoa, there is another NeXTstep-style system:
GNUstep, which is free software. As of this writing, the GNUstep support is
alpha status (@pxref{GNUstep Support}), but we hope to improve it in the
future.
For various historical and technical reasons, Emacs uses the term
@samp{Nextstep} internally, instead of ``Cocoa'' or ``Mac OS X''; for
instance, most of the commands and variables described in this section
begin with @samp{ns-}, which is short for @samp{Nextstep}. NeXTstep
was an application interface released by NeXT Inc during the 1980s, of
which Cocoa is a direct descendant. Apart from Cocoa, there is
another NeXTstep-style system: GNUstep, which is free software. As of
this writing, the GNUstep support is alpha status (@pxref{GNUstep
Support}), but we hope to improve it in the future.
@menu
* Mac / GNUstep Basics:: Basic Emacs usage under GNUstep or Mac OS.
@ -37,19 +36,24 @@ future.
@section Basic Emacs usage under Mac OS and GNUstep
By default, the @key{alt} and @key{option} keys are the same as
@key{Meta} when running under Mac OS. The Mac @key{Cmd} key is the
same as @key{Super}, and Emacs provides a set of keybindings using
this modifier key that mimic other Mac / GNUstep applications (@pxref{Mac /
GNUstep Events}). You can change these bindings in the usual way (@pxref{Key
Bindings}).
@key{Meta}. The Mac @key{Cmd} key is the same as @key{Super}, and
Emacs provides a set of keybindings using this modifier key that mimic
other Mac / GNUstep applications (@pxref{Mac / GNUstep Events}). You
can change these bindings in the usual way (@pxref{Key Bindings}).
The standard Mac / GNUstep font and color panels are accessible via Lisp commands.
To use the color panel, drag from it to an Emacs frame to change the
foreground color of the face at that position (if the @key{shift} key
is held down, it changes the background color instead). To discard the
settings, create a new frame and close the altered one.
@c [unclear if the following holds.]
@c To finalize the settings for either color or font, choose @samp{Save Options} in the @samp{Options} menu.
The variable @code{ns-right-alternate-modifier} controls the
behavior of the right @key{alt} and @key{option} keys. These keys
behave like the left-hand keys if the value is @code{left} (the
default). A value of @code{control}, @code{meta}, @code{alt},
@code{super}, or @code{hyper} makes them behave like the corresponding
modifier keys; a value of @code{none} tells Emacs to ignore them.
The standard Mac / GNUstep font and color panels are accessible via
Lisp commands. To use the color panel, drag from it to an Emacs frame
to change the foreground color of the face at that position (if the
@key{shift} key is held down, it changes the background color
instead). To discard the settings, create a new frame and close the
altered one.
@key{S-Mouse-1} (i.e., clicking the left mouse button
while holding down the @key{Shift} key) adjusts the region to the
@ -58,7 +62,7 @@ it does not pop up a menu for changing the default face, as
@key{S-Mouse-1} normally does (@pxref{Temporary Face Changes}). This
change makes Emacs behave more like other Mac / GNUstep applications.
When you open or save files using the menus, or using the
When you open or save files using the menus, or using the
@key{Cmd-o} and @key{Cmd-S} bindings, Emacs uses graphical file
dialogs to read file names. However, if you use the regular Emacs key
sequences, such as @key{C-x C-f}, Emacs uses the minibuffer to read
@ -110,7 +114,7 @@ dragging will alter the foreground color. Shift dragging will alter the
background color.
@c To make the changes permanent select the "Save Options"
@c item in the "Options" menu, or run @code{menu-bar-options-save}.
@c item in the "Options" menu, or run @code{menu-bar-options-save}.
Useful in this context is the listing of all faces obtained by @key{M-x}
@code{list-faces-display}.
@ -193,7 +197,7 @@ font are stored in the variables @code{ns-input-font} and
@code{ns-input-fontsize}, respectively.
@item ns-power-off
This event occurs when the user logs out and Emacs is still running, or when
This event occurs when the user logs out and Emacs is still running, or when
`Quit Emacs' is chosen from the application menu.
The default behavior is to save all file-visiting buffers.
@end table
@ -208,26 +212,9 @@ and return the result as a string. You can also use the Lisp function
services and receive the results back. Note that you may need to
restart Emacs to access newly-available services.
@node GNUstep Support, , Mac / GNUstep Events, Mac OS / GNUstep
@section GNUstep Support
Emacs can be built and run under GNUstep, however there are still some
Emacs can be built and run under GNUstep, but there are still some
issues to be addressed. Interested developers should contact
@email{emacs-devel@@gnu.org}.
@c Presumably no longer relevant since CANNOT_DUMP removed 2009-05-06:
@ignore
In particular, it may be necessary to run @samp{make bootstrap} with a
plain X configuration, then @samp{make clean} and @samp{./configure
--with-ns} followed by @samp{make install}.
Currently CANNOT_DUMP is automatically enabled in GNUstep configurations,
because the unex file(s) for GNUstep, mainly @samp{unexelf.c}, have not been
updated yet with the ``zone'' code in and related to @samp{unexmacosx.c}.
@end ignore
@ignore
arch-tag: a822c2ab-4273-4997-927e-c153bb71dcf6
@end ignore

354
doc/emacs/maintaining.texi
View file

@ -24,20 +24,20 @@ programs.
@section Version Control
@cindex version control
A @dfn{version control system} is a package that can record multiple
A @dfn{version control system} is a program that can record multiple
versions of a source file, storing information such as the creation
time of each version, who created it, and a description of what was
changed in that version.
time of each version, who made it, and a description of what was
changed.
The Emacs version control interface is called VC. Its commands work
with several different version control systems; currently, it supports
GNU Arch, Bazaar, CVS, Git, Mercurial, Monotone, RCS, SCCS/CSSC, and
Subversion. Of these, the GNU project distributes CVS, GNU Arch, RCS,
and Bazaar.
The Emacs version control interface is called @dfn{VC}. VC commands
work with several different version control systems; currently, it
supports GNU Arch, Bazaar, CVS, Git, Mercurial, Monotone, RCS,
SCCS/CSSC, and Subversion. Of these, the GNU project distributes CVS,
Arch, RCS, and Bazaar.
VC is enabled automatically whenever you visit a file that is
governed by a version control system. To disable VC entirely, set the
customizable variable @code{vc-handled-backends} to @code{nil}
VC is enabled automatically whenever you visit a file governed by a
version control system. To disable VC entirely, set the customizable
variable @code{vc-handled-backends} to @code{nil}
@iftex
(@pxref{Customizing VC,,,emacs-xtra, Specialized Emacs Features}).
@end iftex
@ -49,6 +49,7 @@ customizable variable @code{vc-handled-backends} to @code{nil}
* Introduction to VC:: How version control works in general.
* VC Mode Line:: How the mode line shows version control status.
* Basic VC Editing:: How to edit a file under version control.
* Log Buffer:: Features available in log entry buffers.
* Old Revisions:: Examining and comparing old versions.
* Secondary VC Commands:: The commands used a little less frequently.
* VC Directory Mode:: Listing files managed by version control.
@ -65,12 +66,13 @@ customizable variable @code{vc-handled-backends} to @code{nil}
@subsection Introduction to Version Control
VC allows you to use a version control system from within Emacs,
integrating the version control operations smoothly with editing.
Though VC cannot completely bridge the gaps between version control
systems with widely differing capabilities, it does provide a uniform
interface to many version control operations. Regardless of which
version control system is in use, you will be able to do basic
operations in much the same way.
integrating the version control operations smoothly with editing. It
provides a uniform interface for common operations in many version
control operations.
Some uncommon or intricate version control operations, such as
altering repository settings, are not supported in VC. You should
perform such tasks outside Emacs, e.g. via the command line.
This section provides a general overview of version control, and
describes the version control systems that VC supports. You can skip
@ -81,6 +83,9 @@ you want to use.
* Why Version Control?:: Understanding the problems it addresses.
* Version Control Systems:: Supported version control back-end systems.
* VCS Concepts:: Words and concepts related to version control.
* VCS Merging:: How file conflicts are handled.
* VCS Changesets:: How changes are grouped.
* VCS Repositories:: Where version control repositories are stored.
* Types of Log File:: The VCS log in contrast to the ChangeLog.
@end menu
@ -112,8 +117,8 @@ vitally important form of communication among developers.
@subsubsection Supported Version Control Systems
@cindex back end (version control)
VC currently works with many different version control systems or
@dfn{back ends}:
VC currently works with many different version control systems,
which it refers to as @dfn{back ends}:
@itemize @bullet
@ -134,73 +139,60 @@ control system.
@cindex RCS
@item
RCS is the free version control system around which VC was initially
built. Almost everything you can do with RCS can be done through VC.
However, you cannot use RCS over the network, and it only works at the
level of individual files rather than projects.
built. It is relatively primitive: it cannot be used over the
network, and works at the level of individual files. Almost
everything you can do with RCS can be done through VC.
@cindex CVS
@item
CVS is the free version control system that was, until recently (circa
2008), used by the majority of free software projects. Nowadays, it
is slowly being superseded by newer systems. CVS allows concurrent
multi-user development either locally or over the network. It lacks
support for atomic commits or file moving/renaming. VC supports all
basic editing operations under CVS. For some less common tasks, you
still need to call CVS from the command line. Note also that before
using CVS you must set up a repository, which is a subject too complex
to treat here.
multi-user development either locally or over the network. Unlike
newer systems, it lacks support for atomic commits and file
moving/renaming. VC supports all basic editing operations under CVS.
@cindex SVN
@cindex Subversion
@item
Subversion (SVN) is a free version control system designed to be
similar to CVS but without its problems. It supports atomic commits
of filesets, and versioning of directories, symbolic links, meta-data,
renames, copies, and deletes.
similar to CVS but without its problems (e.g., it supports atomic
commits of filesets, and versioning of directories, symbolic links,
meta-data, renames, copies, and deletes).
@cindex GNU Arch
@cindex Arch
@item
GNU Arch is a version control system designed for distributed work.
It differs in many ways from older systems like CVS and RCS. It
provides different methods for interoperating between users, support
for offline operations, and good branching and merging features. It
also supports atomic commits of filesets and file moving/renaming. VC
does not support all operations provided by GNU Arch, so you must
sometimes invoke it from the command line.
GNU Arch is one of the earliest @dfn{distributed} version control
systems (the other being Monotone). @xref{VCS Concepts}, for a
description of distributed version control systems. It is no longer
under active development, and has been deprecated in favor of Bazaar.
@cindex git
@item
Git is a distributed version control system invented by Linus Torvalds to support
development of Linux (his kernel). It supports atomic commits of filesets and
file moving/renaming. One significant feature of git is that it
largely abolishes the notion of a single centralized repository;
instead, each working copy of a git project is its own repository and
coordination is done through repository-sync operations. VC supports
most git operations, with the exception of news merges and repository
syncing; these must be done from the command line.
Git is a distributed version control system originally invented by
Linus Torvalds to support development of Linux (his kernel). VC
supports many common git operations, but others, such as repository
syncing, must be done from the command line.
@cindex hg
@cindex Mercurial
@item
Mercurial (hg) is a distributed version control system broadly
resembling GNU Arch and git, with atomic fileset commits and file
moving/renaming. Like git, it is fully decentralized. VC supports
most Mercurial commands, with the exception of repository sync
operations; this needs to be done from the command line.
resembling git. VC supports most Mercurial commands, with the
exception of repository sync operations.
@cindex bzr
@cindex Bazaar
@item
Bazaar (bzr) is a distributed version control system that supports both
repository-based and distributed versioning, with atomic fileset
commits and file moving/renaming. VC supports most basic editing
operations under Bazaar.
Bazaar (bzr) is a distributed version control system that supports
both repository-based and distributed versioning. VC supports most
basic editing operations under Bazaar.
@end itemize
Previous versions of VC supported a version control system known as
Meta-CVS. This support has been dropped because of limited interest
from users and developers.
Meta-CVS. This support was dropped due to limited interest from users
and developers.
@node VCS Concepts
@subsubsection Concepts of Version Control
@ -216,11 +208,11 @@ as @dfn{log entries} that describe the changes made to each file.
@cindex work file
@cindex checking out files
A file @dfn{checked out} of a repository is called the @dfn{work
file}. You edit the work file and make changes in it, as you would
with an ordinary file. After you are done with a set of changes, you
@dfn{check in} or @dfn{commit} the file; this records the changes in
the repository, along with a log entry for those changes.
The copy of a version-controlled file that you actually edit is
called the @dfn{work file}. You can change each work file as you
would an ordinary file. After you are done with a set of changes, you
@dfn{commit} (or @dfn{check in}) the changes; this records the changes
in the repository, along with a descriptive log entry.
@cindex revision
@cindex revision ID
@ -231,12 +223,15 @@ on the version control system; in the simplest case, it is just an
integer.
To go beyond these basic concepts, you will need to understand three
aspects in which version control systems differ.
They can be locking-based or merging-based; they can be file-based or
changeset-based; and they can be centralized or decentralized. VC
handles all these modes of operation, but it cannot hide the differences.
aspects in which version control systems differ. As explained in the
next three sections, they can be lock-based or merge-based; file-based
or changeset-based; and centralized or decentralized. VC handles all
these modes of operation, but it cannot hide the differences.
@node VCS Merging
@subsubsection Merge-based vs lock-based Version Control
@cindex locking versus merging
A version control system typically has some mechanism to coordinate
between users who want to change the same file. There are two ways to
do this: merging and locking.
@ -244,8 +239,7 @@ do this: merging and locking.
In a version control system that uses merging, each user may check
out and modify a work file at any time. The system lets you
@dfn{merge} your work file, which may contain changes that have not
been checked in, with the latest changes that others have checked into
the repository.
been committed, with the latest changes that others have committed.
Older version control systems use a @dfn{locking} scheme instead.
Here, work files are normally read-only. To edit a file, you ask the
@ -253,7 +247,7 @@ version control system to make it writable for you by @dfn{locking}
it; only one user can lock a given file at any given time. This
procedure is analogous to, but different from, the locking that Emacs
uses to detect simultaneous editing of ordinary files
(@pxref{Interlocking}). When you check in your changes, that unlocks
(@pxref{Interlocking}). When you commit your changes, that unlocks
the file, and the work file becomes read-only again. Other users may
then lock the file to make their own changes.
@ -261,8 +255,8 @@ then lock the file to make their own changes.
users try to modify the same file at the same time. Locking systems
have @dfn{lock conflicts}; a user may try to check a file out and be
unable to because it is locked. In merging systems, @dfn{merge
conflicts} happen when you check in a change to a file that conflicts
with a change checked in by someone else after your checkout. Both
conflicts} happen when you commit a change to a file that conflicts
with a change committed by someone else after your checkout. Both
kinds of conflict have to be resolved by human judgment and
communication. Experience has shown that merging is superior to
locking, both in convenience to developers and in minimizing the
@ -275,27 +269,33 @@ Distributed version control systems, such as GNU Arch, git, and
Mercurial, are exclusively merging-based.
VC mode supports both locking and merging version control. The
terms ``checkin'' and ``checkout'' come from locking-based version
control systems; newer version control systems have slightly different
operations usually called ``commit'' and ``update'', but VC hides the
differences between them as much as possible.
terms ``commit'' and ``update'' are used in newer version control
systems; older lock-based systems use the terms ``check in'' and
``check out''. VC hides the differences between them as much as
possible.
@cindex files versus changesets.
@node VCS Changesets
@subsubsection Changeset-based vs File-based Version Control
@cindex changesets
On SCCS, RCS, CVS, and other early version control systems, version
control operations are @dfn{file-based}: each file has its own comment
and revision history separate from that of all other files in the
system. Later systems, beginning with Subversion, are
@dfn{changeset-based}: a checkin may include changes to several files,
and the entire set of changes is treated as a unit by the system. Any
comment associated with the change does not belong to a single file,
but to the changeset itself.
and revision history separate from that of all other files. Newer
systems, beginning with Subversion, are @dfn{changeset-based}: a
checkin may include changes to several files, and the entire set of
changes is handled as a unit. Any comment associated with the change
does not belong to a single file, but to the changeset itself.
Changeset-based version control is more flexible and powerful than
file-based version control; usually, when a change to multiple files
has to be reversed, it's good to be able to easily identify and remove
all of it.
@cindex centralized vs. decentralized version control
@node VCS Repositories
@subsubsection Decentralized vs Centralized Repositories
@cindex centralized version control
@cindex decentralized version control
Early version control systems were designed around a
@dfn{centralized} model in which each project has only one repository
used by all developers. SCCS, RCS, CVS, and Subversion share this
@ -306,14 +306,12 @@ point for reliability and efficiency.
control, later implemented in git, Mercurial, and Bazaar. A project
may have several different repositories, and these systems support a
sort of super-merge between repositories that tries to reconcile their
change histories. At the limit, each developer has his/her own
repository, and repository merges replace checkin/commit operations.
change histories. In effect, there is one repository for each
developer, and repository merges take the place of commit operations.
VC's job is to help you manage the traffic between your personal
workfiles and a repository. Whether that repository is a single
master or one of a network of peer repositories is not something VC
has to care about. Thus, the difference between a centralized and a
decentralized version control system is invisible to VC mode.
VC helps you manage the traffic between your personal workfiles and
a repository. Whether the repository is a single master, or one of a
network of peer repositories, is not something VC has to care about.
@node Types of Log File
@subsubsection Types of Log File
@ -323,9 +321,9 @@ decentralized version control system is invisible to VC mode.
Projects that use a version control system can have two types of log
for changes. One is the log maintained by the version control system:
each time you check in a change, you fill out a @dfn{log entry} for
the change (@pxref{Log Buffer}). This is called the @dfn{version
control log}.
each time you commit a change, you fill out a @dfn{log entry} for the
change (@pxref{Log Buffer}). This is called the @dfn{version control
log}.
The other kind of log is the file @file{ChangeLog} (@pxref{Change
Log}). It provides a chronological record of all changes to a large
@ -364,21 +362,22 @@ change, and later use the @kbd{C-x v a} command to copy it to
@subsection Version Control and the Mode Line
When you visit a file that is under version control, Emacs indicates
this on the mode line. For example, @samp{RCS-1.3} says that RCS is
used for that file, and the current version is 1.3.
this on the mode line. For example, @samp{Bzr-1223} says that Bazaar
is used for that file, and the current revision ID is 1223.
The character between the back-end name and the revision ID
indicates the version control status of the file. @samp{-} means that
the work file is not locked (if locking is in use), or not modified (if
locking is not in use). @samp{:} indicates that the file is locked, or
that it is modified. If the file is locked by some other user (for
instance, @samp{jim}), that is displayed as @samp{RCS:jim:1.3}.
indicates the status of the work file. In a merge-based version
control system, a @samp{-} character indicates that the work file is
unmodified, and @samp{:} indicates that it has been modified. In a
lock-based system, @samp{-} indicates an unlocked file, and @samp{:} a
locked file; if the file is locked by another user (for instance,
@samp{jim}), that is displayed as @samp{RCS:jim:1.3}.
On a graphical display, you can move the mouse over this mode line
indicator to pop up a ``tool-tip'', which displays a more verbose
description of the version control status. Pressing @kbd{Mouse-1}
over the indicator pops up a menu of VC commands. This menu is
identical to the @samp{Tools / Version Control} menu item.
over the indicator pops up a menu of VC commands, identical to
@samp{Tools / Version Control} on the menu bar.
@vindex auto-revert-check-vc-info
When Auto Revert mode (@pxref{Reverting}) reverts a buffer that is
@ -430,12 +429,6 @@ command line. All files in a VC fileset must be under the same
version control system; if they are not, Emacs signals an error when
you attempt to execute a command on the fileset.
Support for VC filesets and changeset-based version control systems
is the main improvement to VC in Emacs 23. When you mark multi-file
VC in a VC Directory buffer, VC operations treat them as a VC fileset,
and operate on them all at once if the version control system is
changeset-based. @xref{VC Directory Mode}.
VC filesets are distinct from the ``named filesets'' used for
viewing and visiting files in functional groups (@pxref{Filesets}).
Unlike named filesets, VC filesets are not named and don't persist
@ -445,7 +438,6 @@ across sessions.
* VC With A Merging VCS:: Without locking: default mode for CVS.
* VC With A Locking VCS:: RCS in its default mode, SCCS, and optionally CVS.
* Advanced C-x v v:: Advanced features available with a prefix argument.
* Log Buffer:: Features available in log entry buffers.
@end menu
@node VC With A Merging VCS
@ -478,9 +470,9 @@ If you have not changed the work file, but some other user has checked
in changes to the repository, merge those changes into the work file.
@item
If you have made modifications to the work file, attempts to check in
your changes. To do this, Emacs first reads the log entry for the new
revision (@pxref{Log Buffer}). If some other user has checked in
If you have made modifications to the work file, attempt to commit
the changes. To do this, Emacs first reads the log entry for the new
revision (@pxref{Log Buffer}). If some other user has committed
changes to the repository since you last checked it out, the checkin
fails. In that case, type @kbd{C-x v v} again to merge those changes
into your own work file; this puts the work file into a ``conflicted''
@ -495,8 +487,8 @@ trying to commit your own changes, type @kbd{C-x v m @key{RET}}.
These rules also apply when you use RCS in its ``non-locking'' mode,
except that changes are not automatically merged from the repository.
Nothing informs you if another user has checked in changes in the same
file since you began editing it; when you check in your revision, his
Nothing informs you if another user has committed changes in the same
file since you began editing it; when you commit your revision, his
changes are removed (however, they remain in the repository and are
thus not irrevocably lost). Therefore, you must verify that the
current revision is unchanged before checking in your changes. In
@ -516,7 +508,7 @@ If the file is not locked, lock it and make it writable, so that you
can change it.
@item
If the file is locked by you, and contains changes, check in the
If the file is locked by you, and contains changes, commit the
changes. In order to do this, Emacs first reads the log entry for the
new revision. @xref{Log Buffer}.
@ -532,12 +524,12 @@ locked the file, to inform him of what has happened.
@end itemize
These rules also apply when you use CVS in locking mode, except
that there is no such thing as stealing a lock.
that CVS does not support stealing a lock.
@node Advanced C-x v v
@subsubsection Advanced Control in @kbd{C-x v v}
@cindex revision ID to check in/out
@cindex revision ID in version control
When you give a prefix argument to @code{vc-next-action} (@kbd{C-u
C-x v v}), it still performs the next logical version control
operation, but accepts additional arguments to specify precisely how
@ -546,8 +538,8 @@ to do the operation.
@itemize @bullet
@item
If the file is modified (or locked), you can specify the revision ID
to use for the new version that you check in. This is one way
to create a new branch (@pxref{Branches}).
to use for the new version that you commit. This is one way to create
a new branch (@pxref{Branches}).
@item
If the file is not modified (and unlocked), you can specify the
@ -573,34 +565,53 @@ Features}).
@end itemize
@node Log Buffer
@subsubsection Features of the Log Entry Buffer
@subsection Features of the Log Entry Buffer
When you check in changes, Emacs pops up a buffer called
@samp{*VC-Log*} for you to enter a log entry.
When you tell VC to commit a change, it pops up a buffer called
@samp{*VC-Log*}. In this buffer, you should write a @dfn{log entry}
describing the changes you have made (@pxref{Why Version Control?}).
After you are done, type @kbd{C-c C-c}; this exits the buffer and
commits the change, together with your log entry.
After you have finished editing the log message, type @kbd{C-c C-c}
to exit the buffer and commit the change.
While in the @samp{*VC-Log*} buffer, you can write one or more
@dfn{header lines}, specifying additional information to be supplied
to the version control system. Each header line must occupy a single
line at the top of the buffer; the first line that is not a header
line is treated as the start of the log entry. For example, the
following header line states that the present change was not written
by you, but by another developer:
@smallexample
Author: J. R. Hacker <jrh@@example.com>
@end smallexample
@noindent
Apart from the @samp{Author} header, Emacs recognizes the headers
@samp{Date} (a manually-specified commit time) and @samp{Fixes} (a
reference to a bug fixed by the change). Not all version control
systems recognize all headers: Bazaar recognizes all three headers,
while git, Mercurial, and Monotone recognizes only @samp{Author} and
@samp{Summary}. If you specify a header for a version control that
does not support it, the header is treated as part of the log entry.
@findex log-edit-show-files
@findex log-edit-show-diff
In the @samp{*VC-Log*} buffer, typing @kbd{C-c C-f}
(@code{log-edit-show-files}) displays a list of files in the VC
fileset you are committing. If you called @kbd{C-x v v} directly from
a work file, the VC fileset consists of that single file, so this
command is not very useful. If you called @kbd{C-x v v} from a VC
directory buffer, the VC fileset may consist of multiple files
(@pxref{VC Directory Mode}).
Type @kbd{C-c C-f} (@code{log-edit-show-files}) to display a list of
files in the current VC fileset. If you called @kbd{C-x v v} directly
from a work file, the fileset consists of that single file; if you
called @kbd{C-x v v} from a VC directory buffer (@pxref{VC Directory
Mode}), the fileset may consist of multiple files.
@findex log-edit-insert-changelog
Type @kbd{C-c C-d} (@code{log-edit-show-diff}) to show a ``diff'' of
the changes you have made (i.e., the differences between the work file
and the repository revision from which you started editing the file).
The diff is displayed in a special buffer in another window.
@xref{Comparing Files}.
Type @kbd{C-c C-d} (@code{log-edit-show-diff}) to show a @dfn{diff}
of the changes you have made (i.e., the differences between the work
file and the repository revision from which you started editing).
@xref{Old Revisions}.
If you have written an entry in the @file{ChangeLog} (@pxref{Change
Log}), type @kbd{C-c C-a} (@code{log-edit-insert-changelog}) to pull
it into the @samp{*VC-Log*} buffer. If the topmost item in the
If the current VC fileset includes one or more @file{ChangeLog}
files (@pxref{Change Log}), type @kbd{C-c C-a}
(@code{log-edit-insert-changelog}) to pull the relevant entries into
the @samp{*VC-Log*} buffer. If the topmost item in each
@file{ChangeLog} was made under your user name on the current date,
this command searches that item for entries that match the file(s) to
be committed; if found, these entries are inserted.
@ -615,7 +626,7 @@ the revision control log.
To abort a check-in, just @strong{don't} type @kbd{C-c C-c} in that
buffer. You can switch buffers and do other editing. As long as you
don't try to check in another file, the entry you were editing remains
don't try to commit another file, the entry you were editing remains
in the @samp{*VC-Log*} buffer, and you can go back to that buffer at
any time to complete the check-in.
@ -624,7 +635,7 @@ convenient to specify the same log entry for many of the files. (This
is the normal way to do things on a changeset-oriented system, where
comments are attached to changesets rather than the history of
individual files.) The most convenient way to do this is to mark all
the files in VC Directory Mode and check in from there; the log buffer
the files in VC Directory Mode and commit from there; the log buffer
will carry the fileset information with it and do a group commit when
you type @kbd{C-c C-c}.
@ -636,7 +647,7 @@ work just like the minibuffer history commands (except that these
versions are used outside the minibuffer).
@vindex vc-log-mode-hook
Each time you check in a change, the log entry buffer is put into VC
Each time you commit a change, the log entry buffer is put into VC
Log Edit mode, which involves running two hooks: @code{text-mode-hook}
and @code{vc-log-mode-hook}. @xref{Hooks}.
@ -688,8 +699,12 @@ buffer in a separate window.
@kbd{C-x v =} (@code{vc-diff}) compares each file in the current VC
fileset (saving them if necessary) with the repository revision(s)
from which you started editing. Note that the latter may or may not
be the latest revision of the file(s). The diff is displayed in a
special buffer in another window. @xref{Comparing Files}.
be the latest revision of the file(s).
The diff is displayed in another window, in a Diff mode buffer
(@pxref{Diff Mode}) named @file{*vc-diff*}. In this buffer, the
@kbd{g} (@code{revert-buffer}) command performs the file comparison
again, generating a new diff.
@findex vc-diff
@kindex C-u C-x v =
@ -996,7 +1011,7 @@ then decide not to change it.
@kindex C-x v c
@findex vc-rollback
To cancel a change that you already checked in, use @kbd{C-x v c}
To cancel a change that you already committed, use @kbd{C-x v c}
(@code{vc-rollback}). This command discards all record of the most
recent checked-in revision, but only if your work file corresponds to
that revision---you cannot use @kbd{C-x v c} to cancel a revision that
@ -1063,8 +1078,8 @@ output is used. Here is an example using CVS:
@noindent
In this example, @samp{file1.c} is modified with respect to the
repository, and @samp{file2.c} is not. @samp{file3.c} is modified,
but other changes have also been checked in to the repository---you
need to merge them with the work file before you can check it in.
but other changes have also been committed---you need to merge them
with the work file before you can check it in.
@vindex vc-stay-local
@vindex vc-cvs-stay-local
@ -1102,7 +1117,7 @@ this includes Version Control subdirectories such as @samp{RCS} and
VC Directory mode has a full set of navigation and marking commands
for picking out filesets. Some of these are also available in a
context menu invoked by the @kbd{mouse-2} button.
context menu invoked by @kbd{mouse-2}.
Up- and down-arrow keys move in the buffer; @kbd{n} and @kbd{p} also
move vertically as in other list-browsing modes. @key{SPC} and
@ -1146,7 +1161,8 @@ directory buffer will be used.
@kbd{M-s a C-s} does an incremental search on the marked files.
@kbd{M-s a C-M-s} does an incremental search on the marked files.
@kbd{M-s a C-M-s} does an incremental regular expression search
on the marked files.
@cindex stashes in version control
@cindex shelves in version control
@ -1162,11 +1178,11 @@ buffers. Some single-key shortcuts are available as well; @kbd{=},
@kbd{+}, @kbd{l}, @kbd{i}, and @kbd{v} behave as through prefixed with
@kbd{C-x v}.
The command @kbd{C-x v v} (@code{vc-next-action}) operates on all the
marked files, so that you can check in several files at once.
If the underlying VC supports atomic commits of multiple-file
changesets, @kbd{C-x v v} with a selected set of modified but not
committed files will commit all of them at once as a single changeset.
The command @kbd{C-x v v} (@code{vc-next-action}) operates on all
the marked files, so that you can commit several files at once. If
the underlying VC supports atomic commits of multiple-file changesets,
@kbd{C-x v v} with a selected set of modified but not committed files
will commit all of them at once as a single changeset.
When @kbd{C-x v v} (@code{vc-next-action}) operates on multiple
files, all of those files must be either in the same state or in
@ -1249,15 +1265,15 @@ other branch.
@node Creating Branches
@subsubsection Creating New Branches
To create a new branch from a head revision (one that is the latest in
the branch that contains it), first select that revision if necessary,
lock it with @kbd{C-x v v}, and make whatever changes you want. Then,
when you check in the changes, use @kbd{C-u C-x v v}. This lets you
specify the revision ID for the new revision. You should specify a
suitable branch ID for a branch starting at the current revision.
For example, if the current revision is 2.5, the branch ID should be
2.5.1, 2.5.2, and so on, depending on the number of existing branches at
that point.
To create a new branch from a head revision (one that is the latest
in the branch that contains it), first select that revision if
necessary, lock it with @kbd{C-x v v}, and make whatever changes you
want. Then, when you commit the changes, use @kbd{C-u C-x v v}. This
lets you specify the revision ID for the new revision. You should
specify a suitable branch ID for a branch starting at the current
revision. For example, if the current revision is 2.5, the branch ID
should be 2.5.1, 2.5.2, and so on, depending on the number of existing
branches at that point.
To create a new branch at an older revision (one that is no longer the
head of a branch), first select that revision (@pxref{Switching
@ -1270,11 +1286,11 @@ revision, that you really mean to create a new branch---if you say no,
you'll be offered a chance to lock the latest revision instead. On
a merging-based VCS you will skip this step.
Then make your changes and type @kbd{C-x v v} again to check in a new
Then make your changes and type @kbd{C-x v v} again to commit a new
revision. This automatically creates a new branch starting from the
selected revision. You need not specially request a new branch, because
that's the only way to add a new revision at a point that is not the head
of a branch.
selected revision. You need not specially request a new branch,
because that's the only way to add a new revision at a point that is
not the head of a branch.
After the branch is created, you ``stay'' on it. That means that
subsequent check-ins create new revisions on that branch. To leave the
@ -1322,11 +1338,11 @@ type @kbd{C-x v v} to lock revision 1.5 so that you can change it. Next,
type @kbd{C-x v m 1.3.1 @key{RET}}. This takes the entire set of changes on
branch 1.3.1 (relative to revision 1.3, where the branch started, up to
the last revision on the branch) and merges it into the current revision
of the work file. You can now check in the changed file, thus creating
of the work file. You can now commit the changed file, thus creating
revision 1.6 containing the changes from the branch.
It is possible to do further editing after merging the branch, before
the next check-in. But it is usually wiser to check in the merged
the next check-in. But it is usually wiser to commit the merged
revision, then lock it and make the further changes. This will keep
a better record of the history of changes.
@ -1362,7 +1378,7 @@ master file revision with user B's changes in it is 1.11.
Then you can resolve the conflicts by editing the file manually. Or
you can type @code{M-x vc-resolve-conflicts} after visiting the file.
This starts an Ediff session, as described above. Don't forget to
check in the merged version afterwards.
commit the merged version afterwards.
@node Multi-User Branching
@subsubsection Multi-User Branching

12
doc/emacs/msdog.texi
View file

@ -31,7 +31,8 @@ here.
* Text and Binary:: Text files use CRLF to terminate lines.
* Windows Files:: File-name conventions on Windows.
* ls in Lisp:: Emulation of @code{ls} for Dired.
* Windows HOME:: Where Emacs looks for your @file{.emacs}.
* Windows HOME:: Where Emacs looks for your @file{.emacs} and
where it starts up.
* Windows Keyboard:: Windows-specific keyboard features.
* Windows Mouse:: Windows-specific mouse features.
* Windows Processes:: Running subprocesses on Windows.
@ -329,7 +330,7 @@ names, which might cause misalignment of columns in Dired display.
@end ifnottex
@node Windows HOME
@section HOME Directory on MS-Windows
@section HOME and Startup Directories on MS-Windows
@cindex @code{HOME} directory on MS-Windows
The Windows equivalent of the @code{HOME} directory is the
@ -371,6 +372,13 @@ names, the Windows port of Emacs supports an alternative name
@file{_emacs} as a fallback, if such a file exists in the home
directory, whereas @file{.emacs} does not.
@cindex start directory, MS-Windows
@cindex directory where Emacs starts on MS-Windows
If you use a Windows desktop shortcut to start Emacs, it starts in
the directory specified by the shortcut. To control where that is,
right-click on the shortcut, select ``Properties'', and in the
``Shortcut'' tab modify the ``Start in'' field to your liking.
@node Windows Keyboard
@section Keyboard Usage on MS-Windows
@cindex keyboard, MS-Windows

6
doc/emacs/vc1-xtra.texi
View file

@ -594,7 +594,7 @@ headers.
@vindex vc-handled-backends
The variable @code{vc-handled-backends} determines which version
control systems VC should handle. The default value is @code{(RCS CVS
SVN SCCS BZR GIT HG Arch)}, so it contains all the version systems
SVN SCCS Bzr Git Hg Mtn Arch)}, so it contains all the version systems
that are currently supported. If you want VC to ignore one or more of
these systems, exclude its name from the list. To disable VC entirely,
set this variable to @code{nil}.
@ -657,8 +657,8 @@ variable does not affect @kbd{C-x v c}; that operation is so drastic
that it should always ask for confirmation.)
@vindex vc-command-messages
VC mode does much of its work by running the shell commands for RCS,
CVS and SCCS. If @code{vc-command-messages} is non-@code{nil}, VC
VC mode does much of its work by running the shell commands for the
appropriate backend. If @code{vc-command-messages} is non-@code{nil}, VC
displays messages to indicate which shell commands it runs, and
additional messages when the commands finish.

50
doc/lispref/ChangeLog
View file

@ -1,3 +1,53 @@
2010-11-21 Chong Yidong <cyd@stupidchicken.com>
* nonascii.texi (Converting Representations): Document
byte-to-string.
* strings.texi (Creating Strings): Don't mention semi-obsolete
function char-to-string.
(String Conversion): Shorten discussion of semi-obsolete function
string-to-char. Link to Converting Representations.
* objects.texi (Symbol Type):
* text.texi (Near Point):
* help.texi (Help Functions):
* functions.texi (Mapping Functions): Use string instead of
char-to-string in examples.
2010-11-20 Chong Yidong <cyd@stupidchicken.com>
* text.texi (Kill Functions, Kill Functions)
(Low-Level Kill Ring, Low-Level Kill Ring): Remove obsolete
YANK-HANDLER args.
* symbols.texi (Creating Symbols): Using unintern without an
obarray arg is now obsolete.
* numbers.texi (Float Basics): Document float-e and float-pi.
* variables.texi (Defining Variables): Change "pi" example to
"float-pi".
2010-11-12 Eli Zaretskii <eliz@gnu.org>
* customize.texi (Composite Types): Lower-case index entry.
* loading.texi (How Programs Do Loading): Document
load-file-name. (Bug#7346)
2010-11-10 Glenn Morris <rgm@gnu.org>
* text.texi (Kill Functions, Low-Level Kill Ring): Small fixes.
2010-10-27 Glenn Morris <rgm@gnu.org>
* maps.texi (Standard Keymaps): Update File menu description.
2010-10-22 Eli Zaretskii <eliz@gnu.org>
* display.texi (Window Systems): Deprecate use of window-system as
a predicate.
2010-09-05 Alexander Klimov <alserkli@inbox.ru> (tiny change)
* files.texi (Directory Names): Use \` rather than ^.

2
doc/lispref/book-spine.texinfo
View file

@ -11,7 +11,7 @@
@center @titlefont{GNU Emacs Lisp Reference Manual}
@sp 5
@center GNU
@center Emacs Version 23.2.50
@center Emacs Version 23.2.90
@center for Unix Users
@sp 5

2
doc/lispref/customize.texi
View file

@ -733,7 +733,7 @@ The value must be a valid color name, and you can do completion with
@node Composite Types
@subsection Composite Types
@cindex Composite Types (customization)
@cindex composite types (customization)
When none of the simple types is appropriate, you can use composite
types, which build new types from other types or from specified data.

8
doc/lispref/display.texi
View file

@ -5878,6 +5878,14 @@ selected frame). The list of possible symbols it returns is the same
one documented for the variable @code{window-system} above.
@end defun
Do @emph{not} use @code{window-system} and
@code{initial-window-system} as predicates or boolean flag variables,
if you want to write code that works differently on text terminals and
graphic displays. That is because @code{window-system} is not a good
indicator of Emacs capabilities on a given display type. Instead, use
@code{display-graphic-p} or any of the other @code{display-*-p}
predicates described in @ref{Display Feature Testing}.
@defvar window-setup-hook
This variable is a normal hook which Emacs runs after handling the
initialization files. Emacs runs this hook after it has completed

2
doc/lispref/elisp.texi
View file

@ -8,7 +8,7 @@
@c Please remember to update the edition number in README as well.
@c And also the copies in vol1.texi and vol2.texi.
@set VERSION 3.0
@set EMACSVER 23.2.50
@set EMACSVER 23.2.90
@set DATE July 2009
@c in general, keep the following line commented out, unless doing a

2
doc/lispref/functions.texi
View file

@ -818,7 +818,7 @@ length of @var{sequence}. For example:
@result{} (a c e)
(mapcar '1+ [1 2 3])
@result{} (2 3 4)
(mapcar 'char-to-string "abc")
(mapcar 'string "abc")
@result{} ("a" "b" "c")
@end group

2
doc/lispref/help.texi
View file

@ -551,7 +551,7 @@ follows:
@smallexample
@group
(define-key global-map (char-to-string help-char) 'help-command)
(define-key global-map (string help-char) 'help-command)
(fset 'help-command help-map)
@end group
@end smallexample

10
doc/lispref/loading.texi
View file

@ -107,6 +107,10 @@ in @code{load-path}, where @code{nil} stands for the default directory.
@code{load-path}, then all three suffixes in the second directory, and
so on. @xref{Library Search}.
Whatever the name under which the file is eventually found, and the
directory where Emacs found it, Emacs sets the value of the variable
@code{load-file-name} to that file's name.
If you get a warning that @file{foo.elc} is older than @file{foo.el}, it
means you should consider recompiling @file{foo.el}. @xref{Byte
Compilation}.
@ -157,6 +161,12 @@ This variable is non-@code{nil} if Emacs is in the process of loading a
file, and it is @code{nil} otherwise.
@end defvar
@defvar load-file-name
When Emacs is in the process of loading a file, this variable's value
is the name of that file, as Emacs found it during the search
described earlier in this section.
@end defvar
@defvar load-read-function
@anchor{Definition of load-read-function}
@c do not allow page break at anchor; work around Texinfo deficiency.

12
doc/lispref/maps.texi
View file

@ -1,7 +1,8 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004,
@c 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
@c 2005, 2006, 2007, 2008, 2009, 2010
@c Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../../info/maps
@node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top
@ -183,9 +184,9 @@ A sparse keymap used by Lisp mode.
@vindex menu-bar-edit-menu
The keymap which displays the Edit menu in the menu bar.
@item menu-bar-files-menu
@vindex menu-bar-files-menu
The keymap which displays the Files menu in the menu bar.
@item menu-bar-file-menu
@vindex menu-bar-file-menu
The keymap which displays the File menu in the menu bar.
@item menu-bar-help-menu
@vindex menu-bar-help-menu
@ -239,6 +240,3 @@ The keymap defining the contents of the tool bar.
A full keymap used by View mode.
@end table
@ignore
arch-tag: b741253c-7e23-4a02-b3fa-cffd9e4d72b9
@end ignore

7
doc/lispref/nonascii.texi
View file

@ -202,6 +202,13 @@ unibyte string, it is returned unchanged. Use this function for
characters.
@end defun
@defun byte-to-string byte
@cindex byte to string
This function returns a unibyte string containing a single byte of
character data, @var{character}. It signals a error if
@var{character} is not an integer between 0 and 255.
@end defun
@defun multibyte-char-to-unibyte char
This converts the multibyte character @var{char} to a unibyte
character, and returns that character. If @var{char} is neither

8
doc/lispref/numbers.texi
View file

@ -224,6 +224,14 @@ down to an integer.
@end example
@end defun
@defvar float-e
The mathematical constant @math{e} (2.71828@dots{}).
@end defvar
@defvar float-pi
The mathematical constant @math{pi} (3.14159@dots{}).
@end defvar
@node Predicates on Numbers
@section Type Predicates for Numbers
@cindex predicates for numbers

1
doc/lispref/objects.texi
View file

@ -582,7 +582,6 @@ makes it invalid as a number.
@group
foo ; @r{A symbol named @samp{foo}.}
FOO ; @r{A symbol named @samp{FOO}, different from @samp{foo}.}
char-to-string ; @r{A symbol named @samp{char-to-string}.}
@end group
@group
1+ ; @r{A symbol named @samp{1+}}

63
doc/lispref/strings.texi
View file

@ -126,9 +126,8 @@ This function returns a string made up of @var{count} repetitions of
@result{} ""
@end example
Other functions to compare with this one include @code{char-to-string}
(@pxref{String Conversion}), @code{make-vector} (@pxref{Vectors}), and
@code{make-list} (@pxref{Building Lists}).
Other functions to compare with this one include @code{make-vector}
(@pxref{Vectors}) and @code{make-list} (@pxref{Building Lists}).
@end defun
@defun string &rest characters
@ -565,38 +564,6 @@ of text characters and general input events
(@code{single-key-description} and @code{text-char-description}). These
are used primarily for making help messages.
@defun char-to-string character
@cindex character to string
This function returns a new string containing one character,
@var{character}. This function is semi-obsolete because the function
@code{string} is more general. @xref{Creating Strings}.
@end defun
@defun string-to-char string
@cindex string to character
This function returns the first character in @var{string}. If the
string is empty, the function returns 0. The value is also 0 when the
first character of @var{string} is the null character, @acronym{ASCII} code
0.
@example
(string-to-char "ABC")
@result{} 65
(string-to-char "xyz")
@result{} 120
(string-to-char "")
@result{} 0
@group
(string-to-char "\000")
@result{} 0
@end group
@end example
This function may be eliminated in the future if it does not seem useful
enough to retain.
@end defun
@defun number-to-string number
@cindex integer to string
@cindex integer to decimal
@ -657,21 +624,41 @@ this function returns 0.
@findex string-to-int
@code{string-to-int} is an obsolete alias for this function.
@end defun
@defun char-to-string character
@cindex character to string
This function returns a new string containing one character,
@var{character}. This function is semi-obsolete because the function
@code{string} is more general. @xref{Creating Strings}.
@end defun
@defun string-to-char string
This function returns the first character in @var{string}. This
mostly identical to @code{(aref string 0)}, except that it returns 0
if the string is empty. (The value is also 0 when the first character
of @var{string} is the null character, @acronym{ASCII} code 0.) This
function may be eliminated in the future if it does not seem useful
enough to retain.
@end defun
Here are some other functions that can convert to or from a string:
@table @code
@item concat
@code{concat} can convert a vector or a list into a string.
This function converts a vector or a list into a string.
@xref{Creating Strings}.
@item vconcat
@code{vconcat} can convert a string into a vector. @xref{Vector
This function converts a string into a vector. @xref{Vector
Functions}.
@item append
@code{append} can convert a string into a list. @xref{Building Lists}.
This function converts a string into a list. @xref{Building Lists}.
@item byte-to-string
This function converts a byte of character data into a unibyte string.
@xref{Converting Representations}.
@end table
@node Formatting Strings

2
doc/lispref/symbols.texi
View file

@ -383,7 +383,7 @@ See @code{documentation} in @ref{Accessing Documentation}, for another
example using @code{mapatoms}.
@end defun
@defun unintern symbol &optional obarray
@defun unintern symbol obarray
This function deletes @var{symbol} from the obarray @var{obarray}. If
@code{symbol} is not actually in the obarray, @code{unintern} does
nothing. If @var{obarray} is @code{nil}, the current obarray is used.

47
doc/lispref/text.texi
View file

@ -86,7 +86,7 @@ buffer is @samp{@@}:
@example
@group
(char-to-string (char-after 1))
(string (char-after 1))
@result{} "@@"
@end group
@end example
@ -121,9 +121,9 @@ but there is no peace.
@end group
@group
(char-to-string (preceding-char))
(string (preceding-char))
@result{} "a"
(char-to-string (following-char))
(string (following-char))
@result{} "c"
@end group
@end example
@ -865,7 +865,7 @@ adds it to the most recent element. It determines automatically (using
@code{last-command}) whether the previous command was a kill command,
and if so appends the killed text to the most recent entry.
@deffn Command kill-region start end &optional yank-handler
@deffn Command kill-region start end
This function kills the text in the region defined by @var{start} and
@var{end}. The text is deleted but saved in the kill ring, along with
its text properties. The value is always @code{nil}.
@ -873,17 +873,10 @@ its text properties. The value is always @code{nil}.
In an interactive call, @var{start} and @var{end} are point and
the mark.
@c Emacs 19 feature
If the buffer or text is read-only, @code{kill-region} modifies the kill
ring just the same, then signals an error without modifying the buffer.
This is convenient because it lets the user use a series of kill
commands to copy text from a read-only buffer into the kill ring.
If @var{yank-handler} is non-@code{nil}, this puts that value onto
the string of killed text, as a @code{yank-handler} text property.
@xref{Yanking}. Note that if @var{yank-handler} is @code{nil}, any
@code{yank-handler} properties present on the killed text are copied
onto the kill ring, like other text properties.
@end deffn
@defopt kill-read-only-ok
@ -900,10 +893,10 @@ from the buffer. It returns @code{nil}.
The command does not set @code{this-command} to @code{kill-region}, so a
subsequent kill command does not append to the same kill ring entry.
Don't call @code{copy-region-as-kill} in Lisp programs unless you aim to
support Emacs 18. For newer Emacs versions, it is better to use
@code{kill-new} or @code{kill-append} instead. @xref{Low-Level Kill
Ring}.
@c FIXME Why is it better? Why isn't copy-region-as-kill obsolete then?
@c Why is it used in many places in Emacs?
In Lisp programs, it is better to use @code{kill-new} or
@code{kill-append} instead of this command. @xref{Low-Level Kill Ring}.
@end deffn
@node Yanking
@ -1041,8 +1034,8 @@ text property, if there is one.
@subsection Low-Level Kill Ring
These functions and variables provide access to the kill ring at a
lower level, but still convenient for use in Lisp programs, because they
take care of interaction with window system selections
lower level, but are still convenient for use in Lisp programs,
because they take care of interaction with window system selections
(@pxref{Window System Selections}).
@defun current-kill n &optional do-not-move
@ -1068,7 +1061,7 @@ it returns the entry pointed at by the yanking pointer and does not
move the yanking pointer.
@end defun
@defun kill-new string &optional replace yank-handler
@defun kill-new string &optional replace
This function pushes the text @var{string} onto the kill ring and
makes the yanking pointer point to it. It discards the oldest entry
if appropriate. It also invokes the value of
@ -1077,25 +1070,15 @@ if appropriate. It also invokes the value of
If @var{replace} is non-@code{nil}, then @code{kill-new} replaces the
first element of the kill ring with @var{string}, rather than pushing
@var{string} onto the kill ring.
If @var{yank-handler} is non-@code{nil}, this puts that value onto
the string of killed text, as a @code{yank-handler} property.
@xref{Yanking}. Note that if @var{yank-handler} is @code{nil}, then
@code{kill-new} copies any @code{yank-handler} properties present on
@var{string} onto the kill ring, as it does with other text properties.
@end defun
@defun kill-append string before-p &optional yank-handler
@defun kill-append string before-p
This function appends the text @var{string} to the first entry in the
kill ring and makes the yanking pointer point to the combined entry.
Normally @var{string} goes at the end of the entry, but if
@var{before-p} is non-@code{nil}, it goes at the beginning. This
function also invokes the value of @code{interprogram-cut-function}
(see below). This handles @var{yank-handler} just like
@code{kill-new}, except that if @var{yank-handler} is different from
the @code{yank-handler} property of the first entry of the kill ring,
@code{kill-append} pushes the concatenated string onto the kill ring,
instead of replacing the original first entry with it.
(see below).
@end defun
@defvar interprogram-paste-function
@ -4279,6 +4262,4 @@ code that is itself run from a modification hook, then rebind locally
@code{inhibit-modification-hooks} to @code{nil}.
@end defvar
@ignore
arch-tag: 3721e738-a1cb-4085-bc1a-6cb8d8e1d32b
@end ignore

18
doc/lispref/variables.texi
View file

@ -544,21 +544,23 @@ not the buffer-local value. (But you should not be making
buffer-local bindings for a symbol that is defined with
@code{defconst}.)
Here, @code{pi} is a constant that presumably ought not to be changed
by anyone (attempts by the Indiana State Legislature notwithstanding).
As the second form illustrates, however, this is only advisory.
An example of the use of @code{defconst} is Emacs' definition of
@code{float-pi}---the mathematical constant @math{pi}, which ought not
to be changed by anyone (attempts by the Indiana State Legislature
notwithstanding). As the second form illustrates, however,
@code{defconst} is only advisory.
@example
@group
(defconst pi 3.1415 "Pi to five places.")
@result{} pi
(defconst float-pi 3.141592653589793 "The value of Pi.")
@result{} float-pi
@end group
@group
(setq pi 3)
@result{} pi
(setq float-pi 3)
@result{} float-pi
@end group
@group
pi
float-pi
@result{} 3
@end group
@end example

2
doc/lispref/vol1.texi
View file

@ -27,7 +27,7 @@
@c Version of the manual and of Emacs.
@c Please remember to update the edition number in README as well.
@set VERSION 3.0
@set EMACSVER 23.2.50
@set EMACSVER 23.2.90
@set DATE July 2009
@dircategory Emacs

2
doc/lispref/vol2.texi
View file

@ -27,7 +27,7 @@
@c Version of the manual and of Emacs.
@c Please remember to update the edition number in README as well.
@set VERSION 3.0
@set EMACSVER 23.2.50
@set EMACSVER 23.2.90
@set DATE July 2009
@dircategory Emacs

2
doc/man/emacs.1
View file

@ -1,5 +1,5 @@
.\" See section COPYING for copyright and redistribution information.
.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2.50"
.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2.90"
.
.
.SH NAME

29
doc/misc/ChangeLog
View file

@ -1,3 +1,32 @@
2010-11-23 Glenn Morris <rgm@gnu.org>
James Clark <none@example.com>
* nxml-mode.texi (Introduction): New section.
2010-11-10 Glenn Morris <rgm@gnu.org>
* edt.texi: Remove information about Emacs 19.
2010-11-05 Michael Albinus <michael.albinus@gmx.de>
* trampver.texi: Update release number.
2010-11-03 Jay Belanger <jay.p.belanger@gmail.com>
* calc.texi: Use emacsver.texi to determine Emacs version.
2010-10-30 Glenn Morris <rgm@gnu.org>
* mh-e.texi (Preface, From Bill Wohler): Change 23 to past tense.
2010-10-29 Glenn Morris <rgm@gnu.org>
* cc-mode.texi: Remove reference to defunct viewcvs URL.
2010-10-22 Juanma Barranquero <lekktu@gmail.com>
* gnus.texi (Group Parameters, Buttons): Fix typos.
2010-10-08 Glenn Morris <rgm@gnu.org>
* cl.texi (Organization, Installation, Old CL Compatibility):

2
doc/misc/calc.texi
View file

@ -89,7 +89,7 @@
This file documents Calc, the GNU Emacs calculator.
@end ifinfo
@ifnotinfo
This file documents Calc, the GNU Emacs calculator, included with GNU Emacs 23.1.
This file documents Calc, the GNU Emacs calculator, included with GNU Emacs 23.3.
@end ifnotinfo
Copyright @copyright{} 1990, 1991, 2001, 2002, 2003, 2004,

11
doc/misc/cc-mode.texi
View file

@ -160,7 +160,8 @@ CC Mode
This manual is for CC Mode in Emacs.
Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -201,9 +202,8 @@ developing GNU and promoting software freedom.''
@vskip 0pt plus 1filll
@insertcopying
This manual was generated from cc-mode.texi, which can be downloaded
from
@url{http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/doc/misc/cc-mode.texi}.
This manual was generated from cc-mode.texi, which is distributed with Emacs,
or can be downloaded from @url{http://savannah.gnu.org/projects/emacs/}.
@end titlepage
@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@ -6998,6 +6998,3 @@ Since most @ccmode{} variables are prepended with the string
@bye
@ignore
arch-tag: c4cab162-5e57-4366-bdce-4a9db2fc97f0
@end ignore

21
doc/misc/edt.texi
View file

@ -63,8 +63,8 @@ of DEC's EDT editor.
@node Overview
@chapter Overview of the EDT Package
This manual describes version 4.0 of the EDT Emulation for Emacs 19 and
above. It comes with special functions which replicate nearly all of
This manual describes version 4.0 of the EDT Emulation for Emacs.
It comes with special functions which replicate nearly all of
EDT's keypad mode behavior. It sets up default keypad and function key
bindings which closely match those found in EDT. Support is provided so
that users may reconfigure most keypad and function key bindings to
@ -152,9 +152,8 @@ You can also invoke @code{edt-set-scroll-margins} interactively while
EDT Emulation is active to change the settings for that session.
@strong{Please note:} Another way to set the scroll margins is to use
the Emacs customization feature (not available in Emacs 19) to set the
following two variables directly: @code{edt-top-scroll-margin} and
@code{edt-bottom-scroll-margin}.
the Emacs customization feature to set the following two variables
directly: @code{edt-top-scroll-margin} and @code{edt-bottom-scroll-margin}.
Enter the Emacs @code{customize} command. First select the
@samp{Editing} group and then select the @samp{Emulations} group.
@ -239,8 +238,7 @@ Provide an easy way to restore @strong{all} original Emacs key bindings,
just as they existed before the EDT emulation was first invoked.
@item
Support GNU Emacs 19 and higher. (GNU Emacs 18 and below is no longer
supported.) XEmacs 19, and above, is also supported.
Support GNU Emacs 19 and higher. XEmacs 19, and above, is also supported.
@item
Supports highlighting of marked text within the EDT emulation on all
@ -933,9 +931,8 @@ You can also invoke @code{edt-set-scroll-margins} interactively while
EDT Emulation is active to change the settings for that session.
@strong{Please note:} Another way to set the scroll margins is to use
the Emacs customization feature (not available in Emacs 19) to set the
following two variables directly: @code{edt-top-scroll-margin} and
@code{edt-bottom-scroll-margin}.
the Emacs customization feature to set the following two variables
directly: @code{edt-top-scroll-margin} and @code{edt-bottom-scroll-margin}.
Enter the Emacs @code{customize} command. First select the
@samp{Editing} group and then select the @samp{Emulations} group.
@ -946,7 +943,3 @@ Finally, select the @samp{Edt} group and follow the directions.
@include doclicense.texi
@bye
@ignore
arch-tag: 1b7ebe01-754b-4834-a12b-f152ef7db9e0
@end ignore

2
doc/misc/faq.texi
View file

@ -5,7 +5,7 @@
@c %**end of header
@c This is used in many places
@set VER 23.2.50
@set VER 23.2.90
@c This file is maintained by Romain Francoise <rfrancoise@gnu.org>.
@c Feel free to install changes without prior permission (but I'd

6
doc/misc/gnus.texi
View file

@ -3142,8 +3142,8 @@ The Sieve language is described in RFC 3028. @xref{Top, Emacs Sieve,
Top, sieve, Emacs Sieve}.
@item (agent parameters)
If the agent has been enabled, you can set any of the its parameters
to control the behavior of the agent in individual groups. See Agent
If the agent has been enabled, you can set any of its parameters to
control the behavior of the agent in individual groups. See Agent
Parameters in @ref{Category Syntax}. Most users will choose to set
agent parameters in either an agent category or group topic to
minimize the configuration effort.
@ -23709,7 +23709,7 @@ Hook called after creating the score mode menu.
@cindex mouse
@cindex click
Those new-fangled @dfn{mouse} contraptions is very popular with the
Those new-fangled @dfn{mouse} contraptions are very popular with the
young, hep kids who don't want to learn the proper way to do things
these days. Why, I remember way back in the summer of '89, when I was
using Emacs on a Tops 20 system. Three hundred users on one single

10
doc/misc/mh-e.texi
View file

@ -213,7 +213,7 @@ more niceties about GNU Emacs and MH@. Now I'm fully hooked on both of
them.
The MH-E package is distributed with GNU Emacs@footnote{Version
@value{VERSION} of MH-E will appear in GNU Emacs 23.1. It is supported
@value{VERSION} of MH-E appeared in GNU Emacs 23.1. It is supported
in GNU Emacs 21 and 22, as well as XEmacs 21 (except for versions
21.5.9-21.5.16). It is compatible with MH versions 6.8.4 and higher,
all versions of nmh, and GNU mailutils 1.0 and higher.}, so you
@ -8951,8 +8951,8 @@ files that were already part of Emacs) and the software was completely
reorganized to push back two decades of entropy. Version 8 appeared in
Emacs 22.1 in 2006.
Development was then quiet for a couple of years. Emacs 23.1, which is
due out in 2009, will contain version 8.1. This version includes a few
Development was then quiet for a couple of years. Emacs 23.1, released
in June 2009, contains version 8.2. This version includes a few
new features and several bug fixes.
Bill Wohler, August 2008
@ -9061,6 +9061,4 @@ Bill Wohler, August 2008
@c sentence-end-double-space: nil
@c End:
@ignore
arch-tag: b778477d-1a10-4a99-84de-f877a2ea6bef
@end ignore

59
doc/misc/nxml-mode.texi
View file

@ -8,7 +8,8 @@
This manual documents nxml-mode, an Emacs major mode for editing
XML with RELAX NG support.
Copyright @copyright{} 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
Copyright @copyright{} 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -43,6 +44,7 @@ license to the document, as described in section 6 of the license.
This manual is not yet complete.
@menu
* Introduction::
* Completion::
* Inserting end-tags::
* Paragraphs::
@ -52,6 +54,58 @@ This manual is not yet complete.
* Limitations::
@end menu
@node Introduction
@chapter Introduction
nXML mode is an Emacs major-mode for editing XML documents. It supports
editing well-formed XML documents, and provides schema-sensitive editing
using RELAX NG Compact Syntax. To get started, visit a file containing an
XML document, and, if necessary, use @kbd{M-x nxml-mode} to switch to nXML
mode. By default, @code{auto-mode-alist} and @code{magic-fallback-alist}
put buffers in nXML mode if they have recognizable XML content or file
extensions. You may wish to customize the settings, for example to
recognize different file extensions.
Once in nXML mode, you can type @kbd{C-h m} for basic information on the
mode.
The @file{etc/nxml} directory in the Emacs distribution contains some data
files used by nXML mode, and includes two files (@file{test.valid.xml} and
@file{test.invalid.xml}) that provide examples of valid and invalid XML
documents.
To get validation and schema-sensitive editing, you need a RELAX NG Compact
Syntax (RNC) schema for your document (@pxref{Locating a schema}). The
@file{etc/schema} directory includes some schemas for popular document
types. See @url{http://relaxng.org/} for more information on RELAX NG.
You can use the @samp{Trang} program from
@url{http://www.thaiopensource.com/relaxng/trang.html} to
automatically create RNC schemas. This program can:
@itemize @bullet
@item
infer an RNC schema from an instance document;
@item
convert a DTD to an RNC schema;
@item
convert a RELAX NG XML syntax schema to an RNC schema.
@end itemize
@noindent To convert a RELAX NG XML syntax (@samp{.rng}) schema to a RNC
one, you can also use the XSLT stylesheet from
@url{http://www.pantor.com/download.html}.
To convert a W3C XML Schema to an RNC schema, you need first to convert it
to RELAX NG XML syntax using the RELAX NG converter tool @code{rngconv}
(built on top of MSV). See @url{https://github.com/kohsuke/msv}
and @url{https://msv.dev.java.net/}.
For historical discussions only, see the mailing list archives at
@url{http://groups.yahoo.com/group/emacs-nxml-mode/}. Please make all new
discussions on the @samp{help-gnu-emacs} and @samp{emacs-devel} mailing
lists. Report any bugs with @kbd{M-x report-emacs-bug}.
@node Completion
@chapter Completion
@ -855,6 +909,3 @@ specification are not enforced.
@bye
@ignore
arch-tag: 3b6e8ac2-ae8d-4f38-bd43-ce9f80be04d6
@end ignore

2
doc/misc/trampver.texi
View file

@ -9,7 +9,7 @@
@c In the Tramp CVS, the version number is auto-frobbed from
@c configure.ac, so you should edit that file and run
@c "autoconf && ./configure" to change the version number.
@set trampver 2.1.19
@set trampver 2.1.20
@c Other flags from configuration
@set instprefix /usr/local

252
etc/AUTHORS
View file

@ -7,9 +7,10 @@ Aaron Ecay: changed nsterm.m
Aaron Larson: co-wrote bibtex.el
Aaron S. Hawley: changed files.texi autoinsert.el building.texi
custom.texi files.el glossary.texi isearch.el jka-cmpr-hook.el
misc.texi sgml-mode.el tar-mode.el texinfo.el thingatpt.el tutorial.el
Aaron S. Hawley: changed files.texi add-log.el autoinsert.el
building.texi custom.texi files.el glossary.texi isearch.el
jka-cmpr-hook.el misc.texi sgml-mode.el tar-mode.el texinfo.el
thingatpt.el tutorial.el
Abraham Nahum: changed configure.in dgux4.h sysdep.c
@ -72,7 +73,7 @@ Albert L. Ting: changed gnus-group.el mail-hist.el
Alex Coventry: changed files.el
Alex Harsanyi: changed vc-hooks.el vc.el
Alex Harsanyi: changed emacs3.py vc-hooks.el vc.el
Alex Ott: changed TUTORIAL.ru ru-refcard.tex ispell.el ru-refcard.ps
@ -86,13 +87,13 @@ and changed erc.el erc-track.el erc-button.el erc-stamp.el erc-match.el
erc-autoaway.el erc-nickserv.el rcirc.texi erc-autojoin.el erc-fill.el
erc-pcomplete.el erc-complete.el erc-ibuffer.el erc-members.el rmail.el
comint.el custom.el erc-bbdb.el erc-chess.el erc-ezbounce.el
erc-imenu.el and 31 other files
erc-imenu.el and 32 other files
Alex Shinn: changed files.el
Alexander Becher: changed vc-annotate.el
Alexander Klimov: changed calc-graph.el man.el
Alexander Klimov: changed calc-graph.el files.el files.texi man.el rx.el
Alexander Kreuzer: changed nnrss.el
@ -168,8 +169,8 @@ Andreas Politz: changed editfns.c elp.el ido.el term.el
Andreas Schwab: changed Makefile.in configure.in lisp.h xdisp.c files.el
coding.c alloc.c process.c fileio.c print.c editfns.c fns.c dired.el
xterm.c keyboard.c simple.el eval.c info.el buffer.c sysdep.c emacs.c
and 485 other files
keyboard.c xterm.c eval.c simple.el info.el buffer.c sysdep.c emacs.c
and 490 other files
Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus.el
nnslashdot.el gnus-util.el mm-url.el mm-uu.el url-http.el xterm.c
@ -333,7 +334,7 @@ Bob Halley: changed ccl.c esh-io.el
Bob Olson: co-wrote cperl-mode.el
Bob Rogers: changed cperl-mode.el ffap.el thingatpt.el vc-svn.el
Bob Rogers: changed vc-svn.el cperl-mode.el ffap.el thingatpt.el
Bob Weiner: changed info.el quail.el
@ -434,12 +435,14 @@ Chip Coldwell: changed font.c
Chong Yidong: wrote redisplay-testsuite.el
and co-wrote longlines.el
and changed xdisp.c simple.el files.el display.texi frames.texi
files.texi emacs.texi keyboard.c cus-edit.el faces.el xterm.c
Makefile.in misc.texi xfaces.c font.c startup.el xfns.c compile.el
image.c custom.texi configure.in and 635 other files
files.texi emacs.texi xterm.c keyboard.c cus-edit.el faces.el
Makefile.in xfaces.c misc.texi xfns.c font.c image.c startup.el
compile.el custom.texi text.texi and 650 other files
Chris Chase: co-wrote idlw-shell.el idlwave.el
Chris Foote: changed python.el
Chris Hall: changed callproc.c
Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c
@ -467,7 +470,7 @@ Christian Faulhammer: changed Makefile.in configure configure.in
Christian Limpach: co-wrote ns-win.el
and changed configure.in
Christian Lynbech: changed appt.el emacsserver.c
Christian Lynbech: changed appt.el emacsserver.c tramp.el
Christian Neukirchen: changed mm-util.el
@ -482,6 +485,8 @@ Christoph Bauer: changed configure.in
Christoph Conrad: changed gnus-agent.el gnus-score.el makefile.w32-in
qp.el
Christoph Scholtes: changed minibuf.c python.el window.c
Christoph Wedler: wrote antlr-mode.el
and changed format.el gnus-art.el gnus-picon.el message.el register.el
smiley.el texinfmt.el
@ -516,6 +521,8 @@ and changed calc.el replace.el update-game-score.c calc-ext.el
Colin Williams: changed calc.texi
Courtney Bane: changed term.c
Craig Markwardt: changed icalendar.el
Craig McDaniel: changed sheap.c
@ -544,6 +551,8 @@ Damien Elmes: changed erc.el erc-dcc.el erc-track.el erc-log.el
Damon Anton Permezel: wrote hanoi.el (public domain)
Damyan Pepper: changed font.c font.h ftfont.c w32font.c
Dan Christensen: changed gnus-sum.el nndoc.el nnfolder.el gnus-art.el
gnus-group.el gnus-registry.el gnus-score.el nnmail.el
@ -552,7 +561,7 @@ and changed org-exp-blocks.el org-exp.el
Dan Nicolaescu: wrote iris-ansi.el romanian.el vc-dir.el
and co-wrote hideshow.el
and changed vc.el vc-hg.el vc-git.el Makefile.in vc-bzr.el vc-cvs.el
and changed vc.el vc-hg.el vc-git.el vc-bzr.el Makefile.in vc-cvs.el
vc-hooks.el configure.in vc-svn.el xterm.el sysdep.c term.el lisp.h
emacs.c files.el term.c process.c vc-rcs.el bindings.el diff-mode.el
lisp-mode.el and 840 other files
@ -728,9 +737,9 @@ and changed w32menu.c w32term.c close.png close.xpm empty.png empty.xpm
David Reitter: wrote mailclient.el
and changed nsterm.m nsfns.m ns-win.el nsfont.m Makefile.in cus-start.el
macos.texi menu-bar.el commands.h cus-edit.el easy-mmode.el emacsbug.el
emacsclient.c faces.el flyspell.el info.el keyboard.c keymap.c
macterm.c menu.c minibuf.c and 11 other files
macos.texi menu-bar.el simple.el commands.h cus-edit.el easy-mmode.el
emacsbug.el emacsclient.c faces.el flyspell.el info.el keyboard.c
keymap.c macterm.c menu.c and 11 other files
David Robinow: changed makefile.w32-in w32inevt.c
@ -818,9 +827,9 @@ Doug Maxey: changed mouse.el
Drake Wilson: changed files.el
Drew Adams: changed cus-edit.el mouse.el bindings.el bookmark.el
custom.el dired.texi etags.el faces.el finder.el frame.el help-fns.el
help.el info.el isearch.el menu-bar.el msdog.texi pp.el ring.el
speedbar.el
custom.el dired.el dired.texi etags.el faces.el files.el finder.el
frame.el help-fns.el help.el info.el isearch.el menu-bar.el msdog.texi
pp.el ring.el speedbar.el
E. Jay Berkenbilt: changed b2m.c flyspell.el ispell.el unrmail.el
whitespace.el window.h
@ -868,11 +877,13 @@ Eli Zaretskii: wrote rxvt.el tty-colors.el
and changed msdos.c makefile.w32-in Makefile.in files.el info.el rmail.el
fileio.c mainmake.v2 pc-win.el startup.el config.bat simple.el msdos.h
dired.c w32.c frame.c internal.el menu-bar.el process.c INSTALL
xfaces.c and 603 other files
xfaces.c and 604 other files
Elias Oltmanns: changed tls.el gnus-agent.el gnus-int.el gnus-srvr.el
gnus.el
Elias Pipping: changed XDelAssoc.c XMakeAssoc.c
Emanuele Giaquinta: changed configure.in gnus-faq.texi rxvt.el charset.c
etags.c fontset.c frame.el loadup.el lread.c sh-script.el text.texi
@ -905,34 +916,35 @@ Eric Hanchrow: changed vc-git.el TUTORIAL.es abbrev.el autorevert.el
Eric Knauel: changed gnus.el spam-report.el spam.el
Eric M. Ludlam: wrote analyze.el args.el autoconf-edit.el bovine.el c.el
cedet-cscope.el cedet-files.el cedet-global.el cedet-idutils.el
cedet-utests.el chart.el checkdoc.el compile.el complete.el cpp-root.el
cscope.el ctxt.el data-debug.el db-debug.el db-el.el db-file.el
db-find.el db-global.el db-mode.el db-ref.el db-typecache.el db.el
debug.el decorate.el dep.el dframe.el dictionary.el dired.el doc.el
document.el ede-grammar.el ede-tests.el ede.el edit.el eieio-base.el
eieio-comp.el eieio-custom.el eieio-datadebug.el eieio-opt.el
eieio-speedbar.el eieio.el el.el emacs.el expandproto.el extract.el
ezimage.el fcn.el fields.el files.el filter.el filters.el find.el
format.el fw.el gcc.el getset.el global.el grep.el html.el ia-sb.el
ia.el idle.el idutils.el imenu.el include.el insert.el inversion.el
java.el javascript.el lex-spp.el lex.el linux.el list.el locate.el
make.el makefile-edit.el map.el mode.el mru-bookmark.el pconf.el
pmake.el proj-archive.el proj-aux.el proj-comp.el proj-elisp.el
proj-info.el proj-misc.el proj-obj.el proj-prog.el proj-scheme.el
proj-shared.el proj.el project-am.el pulse.el refs.el sb-image.el sb.el
scm.el scope.el semantic-ia-utest.el semantic-tests.el
semantic-utest-c.el semantic-utest.el semantic.el shell.el simple.el
sort.el source.el speedbar.el srecode-tests.el srecode.el srt.el
symref.el system.el table.el tag-file.el tag-ls.el tag-write.el tag.el
test.el texi.el util.el
Eric M. Ludlam: wrote analyze.el args.el auto.el autoconf-edit.el base.el
bovine.el c.el cedet-cscope.el cedet-files.el cedet-global.el
cedet-idutils.el cedet-utests.el chart.el checkdoc.el compile.el
complete.el cpp-root.el cscope.el ctxt.el custom.el data-debug.el
db-debug.el db-el.el db-file.el db-find.el db-global.el db-mode.el
db-ref.el db-typecache.el db.el debug.el decorate.el dep.el dframe.el
dictionary.el dired.el doc.el document.el ede-grammar.el ede-tests.el
ede.el edit.el eieio-base.el eieio-comp.el eieio-custom.el
eieio-datadebug.el eieio-opt.el eieio-speedbar.el eieio.el el.el
emacs.el expandproto.el extract.el ezimage.el fcn.el fields.el files.el
filter.el filters.el find.el format.el fw.el gcc.el generic.el
getset.el global.el grep.el html.el ia-sb.el ia.el idle.el idutils.el
imenu.el include.el insert.el inversion.el java.el javascript.el
lex-spp.el lex.el linux.el list.el locate.el make.el makefile-edit.el
map.el mode.el mru-bookmark.el pconf.el pmake.el proj-archive.el
proj-aux.el proj-comp.el proj-elisp.el proj-info.el proj-misc.el
proj-obj.el proj-prog.el proj-scheme.el proj-shared.el proj.el
project-am.el pulse.el refs.el sb-image.el sb.el scm.el scope.el
semantic-ia-utest.el semantic-tests.el semantic-utest-c.el
semantic-utest.el semantic.el shell.el simple.el sort.el source.el
speedbar.el srecode-tests.el srecode.el srt.el symref.el system.el
table.el tag-file.el tag-ls.el tag-write.el tag.el test.el texi.el
util.el
and co-wrote cpp.el db-ebrowse.el util-modes.el
and changed *.el info.el rmail.el speedbspec.el gud.el sb-dir-minus.xpm
sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm
sb-pg.xpm sb-tag-gt.xpm sb-tag-minus.xpm sb-tag-plus.xpm
sb-tag-type.xpm sb-tag-v.xpm sb-tag.xpm Makefile.in comint.el dir
and 13 other files
sb-tag-type.xpm sb-tag-v.xpm sb-tag.xpm Makefile.in c-by.el cedet.el
and 18 other files
Eric Marsden: changed gnus-cache.el url-util.el
@ -1091,7 +1103,7 @@ Gaute B Strokkenes: changed imap.el gnus-fun.el mail-source.el process.c
Geert Kloosterman: changed which-func.el
Geoff Gole: changed align.el ibuffer.el
Geoff Gole: changed align.el ibuffer.el whitespace.el
Geoff Greene: changed message.el
@ -1131,9 +1143,9 @@ Giuseppe Scrivano: changed buffer.c configure.in sysdep.c xsmfns.c
Glenn Morris: wrote check-declare.el
and changed Makefile.in calendar.el diary-lib.el rmail.el f90.el
cal-menu.el cal-hebrew.el fortran.el holidays.el configure.in
cal-islam.el bytecomp.el calendar.texi cal-bahai.el emacs.texi files.el
appt.el cal-china.el rmailsum.el simple.el startup.el
and 976 other files
calendar.texi cal-islam.el bytecomp.el cal-bahai.el appt.el emacs.texi
files.el cal-china.el rmailsum.el cal-tex.el simple.el
and 1010 other files
Glynn Clements: wrote gamegrid.el snake.el tetris.el
@ -1196,6 +1208,8 @@ Harald Meland: changed gnus-art.el gnus-salt.el gnus-score.el
Heiko Muenkel: changed b2m.c
Helmut Eller: changed cl-macs.el process.c
Helmut Waitzmann: changed gnus-sum.el gnus.texi
Henrik Enberg: changed rmailout.el gnus-art.el gnus-msg.el lread.c
@ -1286,7 +1300,7 @@ Itai Zukerman: changed mm-decode.el
Ivan Boldyrev: changed mml1991.el
Ivan Kanis: wrote vc-hg.el
and changed term.el time.el
and changed appt.el term.el time.el
Ivan Shmakov: changed tcl.el
@ -1343,12 +1357,13 @@ and co-wrote byte-opt.el byte-run.el bytecomp.el disass.el font-lock.el
and changed bytecode.c mail-extr.el subr.el
Jan Djärv: wrote dnd.el font-setting.el x-dnd.el
and changed gtkutil.c xterm.c xfns.c configure.in xterm.h xmenu.c
and changed gtkutil.c xterm.c xfns.c xterm.h configure.in xmenu.c
x-win.el Makefile.in gtkutil.h keyboard.c frame.c frames.texi config.in
emacs.c xselect.c xresources.texi startup.el alloc.c cus-start.el
xlwmenu.c frame.h and 203 other files
emacs.c xselect.c xresources.texi cus-start.el startup.el alloc.c
process.c xlwmenu.c and 205 other files
Jan Moringen: co-wrote cpp.el
and changed eieio.el zeroconf.el
Jan Nieuwenhuizen: changed info.el TUTORIAL.nl add-log.el emacs.c
emacsclient.c gnus-start.el gud.el nnmh.el server.el startup.el
@ -1520,7 +1535,7 @@ Johan Bockgård: changed erc.el cl-macs.el erc-backend.el erc-button.el
erc-match.el browse-url.el bytecomp.el custom.el display.texi
erc-compat.el erc-nickserv.el erc-ring.el erc-speak.el erc-track.el
help-fns.el simple.el subr.el xterm.el advice.el align.el basic.texi
and 40 other files
and 42 other files
Johan Euphrosine: changed ibuf-ext.el
@ -1589,6 +1604,10 @@ Jonathan I. Kamens: changed pop.c movemail.c rmail.el Makefile.in
gnus-sum.el jka-compr.el rmailout.el rnewspost.el sendmail.el simple.el
timezone.el vc-hooks.el
Jonathan Marchand: changed cpp-root.el
Jonathan Rockway: changed rcirc.el
Jonathan Stigelman: changed hilit19.el
Jonathan Vail: changed vc.el
@ -1633,11 +1652,9 @@ Juan León Lahoz García: wrote wdired.el
and changed files.el perl-mode.el
Juanma Barranquero: changed makefile.w32-in subr.el files.el faces.el
bs.el help-fns.el w32fns.c org.el server.el simple.el emacsclient.c
desktop.el buffer.c mule-cmds.el ido.el window.c xdisp.c allout.el
keyboard.c replace.el eval.c and 932 other files
Juergen Hoetzel: changed url-handlers.el
w32fns.c bs.el help-fns.el server.el org.el simple.el emacsclient.c
buffer.c desktop.el mule-cmds.el ido.el window.c xdisp.c allout.el
keyboard.c replace.el eval.c and 939 other files
Juergen Kreileder: changed imap.el nnimap.el
@ -1647,6 +1664,8 @@ Julian Scheid: changed tramp.el
Julien Avarre: changed gnus-fun.el
Julien Danjou: changed erc-backend.el
Julien Gilles: wrote gnus-ml.el
Junio Hamano: changed window.el
@ -1657,7 +1676,7 @@ Juri Linkov: wrote files-x.el misearch.el
and changed info.el isearch.el simple.el replace.el dired-aux.el
startup.el grep.el compile.el dired.el files.el faces.el display.texi
menu-bar.el descr-text.el cus-edit.el bindings.el man.el image-mode.el
ispell.el text.texi dired-x.el and 281 other files
ispell.el text.texi dired-x.el and 282 other files
Justin Bogner: changed fortune.el
@ -1668,6 +1687,8 @@ Justus Piater: changed smtpmail.el
Jérôme Marant: changed Makefile.in make-dist bindings.el configure.in
emacsclient.c misc.texi
Jürgen Hötzel: changed url-handlers.el wid-edit.el
K. Shane Hartman: wrote chistory.el echistory.el electric.el emacsbug.el
helper.el picture.el view.el
and changed rmail.el ebuff-menu.el dired.el simple.el add-log.el
@ -1693,6 +1714,10 @@ Kalle Olavi Niemitalo: changed keyboard.c
Kanematsu Daiji: changed nnimap.el
Karel Klic: changed ftfont.c
Karel Klíč: changed tramp.el
Karl Berry: changed emacs.texi info.texi elisp.texi text.texi anti.texi
display.texi .cvsignore emacs-xtra.texi faq.texi filelock.c gnu.texi
macos.texi minibuf.texi mule.texi processes.texi texinfo.tex
@ -1707,9 +1732,10 @@ Karl Eichwalder: changed Makefile.in add-log.el bookmark.el dired-aux.el
dired.el info.el menu-bar.el midnight.el po.el
Karl Fogel: wrote bookmark.el mail-hist.el saveplace.el
and changed files.el INSTALL autogen.sh doc-view.el image-mode.el info.el
isearch.el menu-bar.el simple.el thingatpt.el INSTALL.BZR configure
configure.in editfns.c gnus-bookmark.el nnmail.el vc-svn.el window.c
and changed files.el simple.el INSTALL autogen.sh doc-view.el
image-mode.el info.el isearch.el menu-bar.el thingatpt.el INSTALL.BZR
configure configure.in editfns.c gnus-bookmark.el nnmail.el vc-svn.el
window.c
Karl Heuer: changed keyboard.c lisp.h xdisp.c buffer.c xfns.c xterm.c
alloc.c files.el frame.c window.c configure.in Makefile.in data.c
@ -1748,7 +1774,7 @@ Keisuke Nishida: changed print.c alloc.c bytecomp.el data.c keymap.c
Keith Gabryelski: wrote hexl.c hexl.el
Ken Brown: changed browse-url.el cygwin.h configure.in emacs.c
Ken Brown: changed cygwin.h browse-url.el configure.in dired.c emacs.c
Ken Brush: changed emacsclient.c
@ -1770,8 +1796,8 @@ Kenichi Handa: wrote composite.el cyrillic.el isearch-x.el ps-bdf.el
and co-wrote ps-def.el ps-mule.el ps-print.el ps-samp.el quail.el
and changed coding.c mule-cmds.el mule.el fontset.c charset.c fontset.el
xdisp.c xterm.c font.c fileio.c Makefile.in mule-conf.el characters.el
fns.c mule-diag.el ftfont.c ccl.c charset.h xfaces.c coding.h
japanese.el and 377 other files
fns.c mule-diag.el ftfont.c ccl.c charset.h coding.h xfaces.c
japanese.el and 378 other files
Kenichi Okada: co-wrote sasl-cram.el sasl-digest.el
@ -1817,8 +1843,8 @@ Kevin Rodgers: changed compile.el mailabbrev.el dired-x.el files.el
Kevin Ryde: wrote info-xref.el
and changed info-look.el info.el checkdoc.el arc-mode.el cl.texi
compilation.txt ffap.el gnus-art.el mule.el os.texi MORE.STUFF
browse-url.el compile.el dig.el etags.c gnus-sum.el mailcap.el man.el
newst-backend.el nroff-mode.el simple.el and 71 other files
browse-url.el compile.el dig.el etags.c gnus-sum.el keyboard.c
mailcap.el man.el newst-backend.el nroff-mode.el and 71 other files
Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el
keypad.el kmacro.el
@ -1833,6 +1859,8 @@ Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el
Kimit Yada: changed copyright.el
Kirk Kelsey: changed make-mode.el
Kishore Kumar: changed terminal.el
Klaus Straubinger: changed url-http.el url-history.el pcmpl-rpm.el
@ -1956,6 +1984,8 @@ Lucid, Inc.: changed byte-opt.el byte-run.el bytecode.c bytecomp.el
Łukasz Demianiuk: changed erc.el
Łukasz Stelmach: changed cookie1.el
Lute Kamstra: changed modes.texi generic.el debug.el generic-x.el
font-lock.el simple.el subr.el Makefile.in battery.el debugging.texi
easy-mmode.el elisp.texi hl-line.el info.el basic.texi bindings.el
@ -1969,7 +1999,7 @@ Maciek Pasternacki: changed nnrss.el
Magnus Henoch: changed url-http.el ispell.el url.el dbusbind.c dns.el
url-gw.el url-parse.el url-proxy.el autoinsert.el cl.texi configure.in
cyrillic.el dbus.el gnus.texi hashcash.el log-edit.el message.el
org-latex.el org-table.el process.c rcirc.el and 8 other files
org-latex.el org-table.el process.c rcirc.el and 9 other files
Malcolm Purvis: changed spam-stat.el
@ -2120,7 +2150,7 @@ Masatake Yamato: wrote ld-script.el subword.el
and changed etags.el asm-mode.el hexl.el xdisp.c bindings.el man.el
xfaces.c simple.el vc.el wid-edit.el add-log.el compile.el etags.c
faces.el pcvs.el register.el ruler-mode.el buffer.c cus-face.el
dired-x.el dispextern.h and 67 other files
dired-x.el dispextern.h and 69 other files
Masayuki Ataka: changed texinfmt.el texinfo.el characters.el cmuscheme.el
make-mode.el
@ -2170,10 +2200,10 @@ Michael Albinus: wrote dbus.el tramp-cmds.el tramp-compat.el
tramp-fish.el tramp-ftp.el tramp-gvfs.el tramp-gw.el tramp-smb.el
xesam.el zeroconf.el
and co-wrote tramp-cache.el tramp.el
and changed tramp.texi dbusbind.c dbus.texi ange-ftp.el trampver.el
and changed tramp.texi dbusbind.c dbus.texi trampver.el ange-ftp.el
trampver.texi files.el files.texi tramp-vc.el Makefile.in tramp-util.el
tramp-uu.el dired-aux.el tramp-imap.el compile.el em-unix.el grep.el
simple.el vc.el configure.in dired.el and 50 other files
tramp-imap.el tramp-uu.el dired-aux.el compile.el configure.in
em-unix.el grep.el simple.el vc.el dired.el and 51 other files
Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h
unexec.c
@ -2303,6 +2333,8 @@ Miyashita Hisashi: changed ccl.c coding.c coding.h mule-cmds.el
Miyoshi Masanori: changed mouse.el smtpmail.el xdisp.c
Mon Key: changed syntax.el
Morten Welinder: wrote [many MS-DOS files] arc-mode.el desktop.el
dosfns.c internal.el msdos.h pc-win.el s-region.el
and changed msdos.c sed1.inp config.bat keyboard.c sed2.inp fileio.c
@ -2329,7 +2361,8 @@ Nakaji Hiroyuki: changed mm-util.el amdx86-64.h configure.in smiley.el
Nakamura Toshikazu: changed w32fns.c
Naohiro Aota: changed fontset.c gnus-art.el mm-view.el tls.el
Naohiro Aota: changed fontset.c ftfont.c gnus-art.el mm-view.el tls.el
xftfont.c
Nathan J. Williams: changed imap.el
@ -2385,6 +2418,8 @@ and changed rsz-mini.el comint.el emacs-buffer.gdb files.el Makefile
coding.c complete.el config.in configure.in copyright.h fns.c
gnu-linux.h hpux7.h irix3-3.h and 17 other files
Noah Lavine: changed tramp.el
Nobuyoshi Nakada: co-wrote ruby-mode.el
Nobuyuki Hikichi: changed news-risc.h
@ -2408,6 +2443,8 @@ Ole Aamot: changed compile.el
Oleg S. Tihonov: changed cyrillic.el ispell.el map-ynp.el subr.el
Oleksandr Gavenko: changed generic-x.el
Olin Shivers: wrote cmuscheme.el inf-lisp.el
and co-wrote comint.el shell.el
@ -2426,13 +2463,15 @@ Olivier Lecarme: changed make-mode.el ange-ftp.el apropos.el bibtex.el
Olli Savia: changed etags.c syssignal.h
Olof Ohlsson Sax: changed vc-svn.el
Osamu Yamane: changed smtpmail.el
Oscar Figueiredo: wrote eudc-bob.el eudc-export.el eudc-hotlist.el
eudc-vars.el eudc.el eudcb-bbdb.el eudcb-ldap.el eudcb-ph.el ldap.el
and changed ph.el
Óscar Fuentes: changed ido.el emacsclient.c vc-bzr.el
Óscar Fuentes: changed ido.el cmdproxy.c emacsclient.c vc-bzr.el
P. E. Jareth Hein: changed gnus-util.el
@ -2542,7 +2581,7 @@ Peter Kleiweg: wrote ps-mode.el
Peter Liljenberg: wrote elint.el
Peter O'Gorman: changed configure.in frame.h termhooks.h
Peter O'Gorman: changed configure.in frame.h hpux10-20.h termhooks.h
Peter Povinec: changed term.el
@ -2643,7 +2682,7 @@ Reiner Steib: wrote gmm-utils.el gnus-news.el
and changed message.el gnus.texi gnus-art.el gnus-sum.el gnus-group.el
gnus.el mml.el gnus-faq.texi mm-util.el gnus-score.el message.texi
gnus-msg.el gnus-start.el gnus-util.el spam-report.el mm-uu.el spam.el
mm-decode.el files.el gnus-agent.el nnmail.el and 181 other files
mm-decode.el files.el gnus-agent.el nnmail.el and 182 other files
Remek Trzaska: changed gnus-ems.el
@ -2671,6 +2710,8 @@ Richard King: wrote filelock.c uniquify.el userlock.el
Richard L. Pieri: wrote pop3.el
Richard Levitte: changed vc-mtn.el
Richard M. Heiberger: changed tex-mode.el
Richard M. Stallman: wrote [The original GNU Emacs and numerous files]
@ -2690,7 +2731,7 @@ and changed files.el sysdep.c rmail.el info.el keyboard.c bytecomp.el
subr.el and 129 other files
Richard Sharman: wrote hilit-chg.el
and changed sh-script.el ediff-init.el regexp-opt.el simple.el
and changed sh-script.el ediff-init.el gdb-ui.el regexp-opt.el simple.el
Rick Farnbach: wrote morse.el
@ -2797,7 +2838,7 @@ Sam Kendall: changed etags.c etags.el
Sam Steingold: wrote gulp.el midnight.el
and changed cl-indent.el compile.el vc-cvs.el vc.el font-lock.el mouse.el
simple.el ange-ftp.el pcvs.el tex-mode.el vc-hg.el add-log.el
simple.el ange-ftp.el vc-hg.el pcvs.el tex-mode.el add-log.el
bindings.el bookmark.el debug.el diary-lib.el dired.el files.el grep.el
inf-lisp.el sgml-mode.el and 108 other files
@ -2809,7 +2850,7 @@ Sascha Lüdecke: co-wrote mml1991.el
and changed gnus-win.el
Sascha Wilde: changed pgg-gpg.el pgg.texi pgg.el bubbles.el configure.in
proj-shared.el srecode.el
proj-shared.el srecode.el vc-hg.el
Satyaki Das: wrote mh-acros.el mh-gnus.el mh-search.el mh-speed.el
mh-thread.el mh-tool-bar.el
@ -2867,6 +2908,8 @@ Sergio Pokrovskij: changed TUTORIAL.eo
Seweryn Kokot: changed positions.texi searching.texi
Shawn Boles: changed url-cookie.el
Shawn M. Carey: wrote freebsd.h
Shenghuo Zhu: wrote binhex.el mm-extern.el mm-partial.el mm-url.el
@ -2889,6 +2932,8 @@ and changed gnus-group.el message.el nnmail.el
Shun-Ichi Goto: changed url-http.el
Shyam Karanatt: changed image-mode.el
Sidney Markowitz: changed doctor.el nsmenu.m
Sigbjorn Finne: changed gnus-srvr.el
@ -2932,12 +2977,12 @@ Stefan Merten: co-wrote rst.el
Stefan Monnier: wrote bibtex-style.el css-mode.el cvs-status.el
diff-mode.el log-edit.el log-view.el minibuffer.el mpc.el pcvs-defs.el
pcvs-info.el pcvs-parse.el pcvs-util.el reveal.el smerge-mode.el
vc-mtn.el
smie.el vc-mtn.el
and co-wrote font-lock.el
and changed vc.el lisp.h subr.el keyboard.c simple.el files.el pcvs.el
and changed vc.el subr.el lisp.h keyboard.c simple.el files.el pcvs.el
keymap.c xdisp.c Makefile.in vc-hooks.el alloc.c newcomment.el
tex-mode.el bytecomp.el compile.el buffer.c info.el fill.el fileio.c
window.c and 901 other files
window.c and 908 other files
Stefan Reichör: changed gnus-agent.el
@ -2951,9 +2996,10 @@ Stefan Wiens: changed gnus-sum.el
Steinar Bang: changed imap.el
Štěpán Němec: changed INSTALL cl.texi edebug.texi loading.texi maps.texi
mark.texi message.texi mini.texi minibuf.texi misc.texi programs.texi
subr.el tips.texi url.texi vc-git.el windows.texi
Štěpán Němec: changed INSTALL cl.texi comint.el edebug.texi loading.texi
maps.texi mark.texi message.texi mini.texi minibuf.texi misc.texi
programs.texi subr.el tips.texi url-vars.el url.texi vc-git.el
windows.texi
Stephan Stahl: changed which-func.el buff-menu.el buffer.c dired-x.texi
ediff-mult.el
@ -3032,10 +3078,9 @@ Sun Yijiang: changed TUTORIAL.cn
Sundar Narasimhan: changed rnews.el rnewspost.el
Sven Joachim: changed files.el de-refcard.tex dired-aux.el arc-mode.el
dired-x.el em-cmpl.el em-hist.el em-ls.el esh-cmd.el esh-ext.el
dired-x.el em-cmpl.el em-hist.el em-ls.el emacs.1 esh-cmd.el esh-ext.el
esh-io.el files.texi gnus-news.texi gnus-sum.el gnus.texi help.el
make-dist movemail.c mule.texi sed3v2.inp sh-script.el
and 5 other files
make-dist movemail.c mule.texi sed3v2.inp and 6 other files
Svend Tollak Munkejord: changed deuglify.el
@ -3198,7 +3243,7 @@ Torsten Bronger: changed latin-ltx.el
Toru Tomabechi: wrote tibet-util.el tibetan.el
Toru Tsuneyoshi: changed ange-ftp.el buff-menu.el cus-start.el fileio.c
files.el lisp.h w32fns.c
files.el lisp.h tramp.el w32fns.c
Toshiaki Nomura: changed uxpds.h
@ -3219,13 +3264,15 @@ Tsuchiya Masatoshi: changed gnus-art.el mm-view.el gnus-sum.el
Tsugutomo Enami: changed frame.c keyboard.c dispnew.c fileio.c process.c
simple.el xdisp.c add-log.el bytecomp.el configure.in editfns.c emacs.c
frame.h gnus-group.el nnheader.el perl-mode.el regex.c regex.h
rmailsum.el sysdep.c vc.el and 3 other files
frame.h gnus-group.el netbsd.h nnheader.el perl-mode.el regex.c regex.h
rmailsum.el sysdep.c and 4 other files
Tsuyoshi Akiho: changed gnus-sum.el nnrss.el
Tudor Hulubei: changed iso-acc.el latin-pre.el
Uday S Reddy: changed fill.el
Ulf Jasper: wrote bubbles.el icalendar-testsuite.el icalendar.el
newst-backend.el newst-plainview.el newst-reader.el newst-ticker.el
newst-treeview.el newsticker-testsuite.el newsticker.el
@ -3239,9 +3286,9 @@ Ulrich Leodolter: changed w32proc.c
Ulrich Mueller: changed configure.in Makefile.in files.el gud.el
ChgPane.c ChgSel.c INSTALL XMakeAssoc.c authors.el bytecomp.el
calc-units.el case-table.el configure doctor.el emacs.c emacs.desktop
emacsclient.c fortran.el gnu-linux.h iso-acc.el lread.c
and 12 other files
calc-units.el case-table.el configure doctor.el emacs.1 emacs.c
emacs.desktop emacsclient.c fortran.el gnu-linux.h iso-acc.el
and 13 other files
Ulrich Neumerkel: changed xterm.c
@ -3318,7 +3365,8 @@ William Xu: changed outline.el webjump.el
Wilson H. Tien: changed unexelf.c
Wilson Snyder: changed verilog-mode.el files.el
Wilson Snyder: co-wrote verilog-mode.el
and changed files.el
Wim Nieuwenhuizen: changed TUTORIAL.nl
@ -3348,9 +3396,9 @@ Xavier Maillard: changed gnus-faq.texi gnus-score.el mh-utils.el spam.el
Yagi Tatsuya: changed gnus-art.el gnus-start.el
Yamamoto Mitsuharu: changed macterm.c macfns.c mac-win.el mac.c macterm.h
macmenu.c macgui.h image.c macselect.c xdisp.c keyboard.c xterm.c
Makefile.in emacs.c darwin.h macos.texi unexmacosx.c w32term.c alloc.c
configure.in dispnew.c and 83 other files
macmenu.c macgui.h image.c xdisp.c macselect.c keyboard.c xterm.c
Makefile.in emacs.c darwin.h w32term.c dispextern.h macos.texi
process.c unexmacosx.c alloc.c and 83 other files
Yann Dirson: changed imenu.el
@ -3363,9 +3411,9 @@ Yoichi Nakayama: changed browse-url.el finder.el man.el rfc2368.el
Yong Lu: changed charset.c coding.c greek.el
Yoni Rabkin: changed faces.el net-utils.el artist.el cmacexp.el ediff.el
files.el hilit19.el ps-mode.el simula.el vera-mode.el verilog-mode.el
vhdl-mode.el viper.el whitespace.el
Yoni Rabkin: changed faces.el net-utils.el artist.el bs.el cmacexp.el
ediff.el files.el hilit19.el ps-mode.el simula.el vera-mode.el
verilog-mode.el vhdl-mode.el viper.el whitespace.el
Yoshiaki Kasahara: changed term.c

12
etc/ChangeLog
View file

@ -1,3 +1,15 @@
2010-11-21 Ulrich Mueller <ulm@gentoo.org>
* HELLO: Add ancient Greek (Bug#7418).
2010-10-20 Richard Stallman <rms@gnu.org>
* DISTRIB: Update donation section.
2010-10-20 Glenn Morris <rgm@gnu.org>
* DISTRIB: Small updates.
2010-10-12 Juanma Barranquero <lekktu@gmail.com>
* tutorials/TUTORIAL.es: Fix typos.

62
etc/DISTRIB
View file

@ -1,12 +1,9 @@
-*- text -*-
For an order form for all Emacs and FSF distributions deliverable from
the USA, see http://www.gnu.org/order/order.html.
GNU Emacs availability information, October 2000
GNU Emacs availability information
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995,
1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
2010 Free Software Foundation, Inc.
See the end of the file for license conditions.
@ -29,31 +26,17 @@ are designed to make sure that everyone who has a copy of GNU Emacs
(including modified versions) has the freedom to redistribute and
change it.
If you do not know anyone to get a copy of GNU Emacs from, you can
order a cd-rom from the Free Software Foundation. We distribute
several Emacs versions. We also distribute nicely typeset copies of
the Emacs user manual, Emacs Lisp Reference Manual, the Emacs
reference card, etc. See http://www.gnu.org/order/order.html.
If you have Internet access, you can copy the latest Emacs
distribution from hosts, such as ftp.gnu.org. There are several ways
to do this; see http://www.gnu.org/software/software.html for more
information.
For information on how to get GNU software, see
http://www.gnu.org/software/software.html. Printed copies of GNU
manuals, including the Emacs manual, are available from the FSF's
online store at http://shop.fsf.org.
Emacs has been run on GNU/Linux, FreeBSD, NetBSD, OpenBSD, and on many
Unix systems, on a variety of types of cpu, as well as on MSDOS,
Windows and MacOS. It also formerly worked on VMS and on Apollo
computers, though with some deficiencies that reflect problems in
these operating systems. See the file `MACHINES' in this directory
(see above) for a full list of machines that GNU Emacs has been tested
Windows and MacOS. See the file `etc/MACHINES' in the Emacs
distribution for a full list of machines that GNU Emacs has been tested
on, with machine-specific installation notes and warnings.
Note that there is significant variation between Unix systems
supposedly running the same version of Unix; it is possible that what
works in GNU Emacs for me does not work on your system due to such an
incompatibility. Since I must avoid reading Unix source code, I
cannot even guess what such problems may exist.
GNU Emacs is distributed with no warranty (see the General Public
License for full details, in the file `COPYING' in this directory (see
above)), and neither I nor the Free Software Foundation promises any
@ -62,14 +45,13 @@ of people who are willing to offer support and assistance for hire.
See http://www.gnu.org/help/gethelp.html.
However, we plan to continue to improve GNU Emacs and keep it
reliable, so please send me any complaints and suggestions you have.
I will probably fix anything that I consider a malfunction. I may
make improvements that are suggested, but I may choose not to.
reliable, so please send us any complaints and suggestions you have.
We will probably fix anything that we consider a malfunction. We may
make improvements that are suggested, but we may choose not to.
If you are on the Internet, report bugs to bug-gnu-emacs@gnu.org. You
can use the Emacs command M-x report-bug RET to mail a bug report.
Please read the Bugs section of the Emacs manual before reporting
bugs.
If you are on the Internet, report bugs to bug-gnu-emacs@gnu.org.
You can use the Emacs command M-x report-bug RET to mail a bug report.
Please read the Bugs section of the Emacs manual before reporting bugs.
General questions about the GNU Project can be asked of gnu@gnu.org.
@ -80,12 +62,14 @@ You should consider making a donation to help support the GNU project;
if you estimate what it would cost to distribute some commercial
product and divide it by five, that is a good amount.
If you like GNU Emacs, please express your satisfaction with a
donation: send me or the Foundation what you feel Emacs has been worth
to you. If you are glad that I developed GNU Emacs and distribute it
as free software, rather than following the obstructive and antisocial
practices typical of software developers, reward me. If you would
like the Foundation to develop more free software, contribute.
If you like GNU Emacs, please express your satisfaction with a donation:
send me (please email me about how) or the Foundation
(https://my.fsf.org/donate) what you feel Emacs has been worth to you.
If you are glad that I developed GNU Emacs and distribute it as free
software, rather than following the obstructive and antisocial
practices of proprietary software, you can reward me. If you would
like the Foundation to do more to forward the cause of free software,
you can contribute.
Your donations will help to support the development of additional GNU
software. GNU/Linux systems (variants of GNU, based on the kernel

1
etc/HELLO
View file

@ -33,6 +33,7 @@ French (fran,Ag(Bais) Bonjour / Salut
Georgian ($,1JEJ0J@J7J5J4J:J8(B) $,1J2J0J;J0J@JOJ=J1J0(B
German (Deutsch) Guten Tag / Gr,A|_(B Gott
Greek (,Fekkgmij\(B) ,FCei\(B ,Fsar(B
Greek, ancient ($,1p1,Fkkgmij^(B) ,FO$,1pv,Fk](B ,Fte(B ,Fja$,1q6(B ,Fl]ca(B ,Fwa$,1r6,Fqe(B
Gujarati ($,19W:!9\9p9~9d: (B) $,19h9n9x:-9d:'(B
Hebrew (,Hzixar(B) ,Hylem(B
Hungarian (magyar) Sz,Bi(Bp j,Bs(B napot!

8
etc/MH-E-NEWS
View file

@ -1,13 +1,13 @@
* COPYRIGHT
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
2010 Free Software Foundation, Inc.
See the end of the file for license conditions.
* Changes in MH-E 8.2
Version 8.2 of MH-E will appear in GNU Emacs 23.1. This is a small
Version 8.2 of MH-E appeared in GNU Emacs 23.1. This is a small
release that includes internal changes from the Emacs team. A new
hook, `mh-pack-folder-hook', has been added.
@ -231,7 +231,7 @@ gatewayed at gmane.org (closes SF #979308).
If you want to see the release notes for the alpha and beta releases
leading up this release, please see:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/MH-E-NEWS?rev=1.25&root=emacs&view=markup
http://cvs.savannah.gnu.org/viewvc/emacs/emacs/etc/MH-E-NEWS?revision=1.25&view=markup

69
etc/NEWS
View file

@ -17,13 +17,15 @@ with a prefix argument or by typing C-u C-h C-n.
* Installation Changes in Emacs 23.3
---
** New configure option --with-crt-dir specifies the location of your
crt*.o files, if they are in a non-standard location. This is only
used on x86-64 and s390x GNU/Linux architectures.
* Startup Changes in Emacs 23.3
* Changes in Emacs 23.3
** The nextstep port can have different modifiers for the left and right
alt/option key by customizing the value for ns-right-alternate-modifier.
* Editing Changes in Emacs 23.3
@ -34,6 +36,42 @@ alt/option key by customizing the value for ns-right-alternate-modifier.
** The appt-add command takes an optional argument for the warning time.
This can be used in place of the default appt-message-warning-time.
---
** You can allow inferior Python processes to load modules from the
current directory by setting `python-remove-cwd-from-path' to nil.
** VC and related modes
*** New VC command `vc-log-incoming', bound to `C-x v I'.
This shows a log of changes to be received with a pull operation.
For Git, this runs "git fetch" to make the necessary data available
locally; this requires version 1.7 or newer.
*** New VC command `vc-log-outgoing', bound to `C-x v O'.
This shows a log of changes to be sent in the next commit.
*** New VC command vc-find-conflicted-file.
+++
*** The 'g' key in VC diff, log, log-incoming and log-outgoing buffers
reruns the corresponding VC command to compute an up to date version
of the buffer.
*** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
+++
*** Special markup can be added to log-edit buffers.
You can add headers specifying additional information to be supplied
to the version control system. For example:
Author: J. R. Hacker <jrh@example.com>
Fixes: 4204
Actual text of log entry...
Bazaar recognizes the headers "Author", "Date" and "Fixes".
Git, Mercurial, and Monotone recognize "Author" and "Date".
Any unknown header is left as is in the message, so it is not lost.
** Obsolete packages
+++
@ -42,21 +80,44 @@ This can be used in place of the default appt-message-warning-time.
* New Modes and Packages in Emacs 23.3
** smie.el is a generic navigation and indentation engine.
It takes a simple BNF description of the grammar, and provides both
sexp-style navigation (jumping over begin..end pairs) as well as
indentation, which can be adjusted via ad-hoc indentation rules.
* Incompatible Lisp Changes in Emacs 23.3
** posn-col-row now excludes the header line from the row count
If the frame has a header line, posn-col-row will count row numbers
starting from the first line of text below the header line.
* Lisp changes in Emacs 23.3
+++
** `e' and `pi' are now called `float-e' and `float-pi'.
The old names are obsolete.
** The use of unintern without an obarray arg is declared obsolete.
+++
** The use of unintern without an obarray arg is now obsolete.
---
** The function `princ-list' is now obsolete.
+++
** The yank-handler argument to kill-region and friends is now obsolete.
+++
** New function byte-to-string, like char-to-string but for bytes.
* Changes in Emacs 23.3 on non-free operating systems
+++
** The nextstep port can have different modifiers for the left and right
alt/option key by customizing the value for ns-right-alternate-modifier.
* Installation Changes in Emacs 23.2

2
etc/NEWS.1-17
View file

@ -235,7 +235,7 @@ Various new commands and features exist; see the Emacs manual.
* Nroff mode and TeX mode.
The are two new major modes for editing nroff input and TeX input.
There are two new major modes for editing nroff input and TeX input.
See the Emacs manual for full information.
* New C indentation style variable `c-brace-imaginary-offset'.

19
etc/PROBLEMS
View file

@ -241,19 +241,18 @@ necessary but missing, please report it via M-x report-emacs-bug.
On platforms such as Solaris, you can also work around this problem by
configuring your compiler to use the native linker instead of GNU ld.
** Emacs compiled with Gtk+ crashes when closing a display (x-close-connection).
** When Emacs is compiled with Gtk+, closing a display kills Emacs.
This happens because of bugs in Gtk+. Gtk+ 2.10 seems to be OK. See bug
http://bugzilla.gnome.org/show_bug.cgi?id=85715.
There is a long-standing bug in GTK that prevents it from recovering
from disconnects: http://bugzilla.gnome.org/show_bug.cgi?id=85715.
** Emacs compiled with Gtk+ may loop forever if a display crashes.
Thus, for instance, when Emacs is run as a server on a text terminal,
and an X frame is created, and the X server for that frame crashes or
exits unexpectedly, Emacs must exit to prevent a GTK error that would
result in an endless loop.
This is related to the bug above. A scenario for this is when emacs is run
as a server, and an X frame is created. If the X server for the frame
crashes or exits unexpectedly and an attempt is made to create a new
frame on another X display, then a Gtk+ error happens in the emacs
server that results in an endless loop. This is not fixed in any known
Gtk+ version (2.14.4 being current).
If you need Emacs to be able to recover from closing displays, compile
it with the Lucid toolkit instead of GTK.
* General runtime problems

5
lib-src/ChangeLog
View file

@ -1,3 +1,8 @@
2010-11-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* emacsclient.c (set_local_socket) [DARWIN_OS]: Add fall-back
definition of _CS_DARWIN_USER_TEMP_DIR for Mac OS X 10.4 and older.
2010-10-01 Glenn Morris <rgm@gnu.org>
* emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back

3
lib-src/emacsclient.c
View file

@ -1251,6 +1251,9 @@ set_local_socket ()
if (!tmpdir)
{
#ifdef DARWIN_OS
#ifndef _CS_DARWIN_USER_TEMP_DIR
#define _CS_DARWIN_USER_TEMP_DIR 65537
#endif
size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0);
if (n > 0)
{

2
lib-src/makefile.w32-in
View file

@ -22,7 +22,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
.PHONY: $(ALL)
VERSION = 23.2.50
VERSION = 23.2.90
LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
-DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \

731
lisp/ChangeLog
View file

@ -1,3 +1,548 @@
2010-11-24 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/which-func.el (which-func-imenu-joiner-function):
Return a string, as expected.
(which-function-mode): Make sure we stop any previous timer before
starting a new one.
2010-11-23 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-default-method-alist)
(tramp-default-user-alist, tramp-default-proxies-alist):
Adapt custom options type. (Bug#7445)
2010-11-21 Chong Yidong <cyd@stupidchicken.com>
* progmodes/python.el: Add Ipython support (Bug#5390).
(python-shell-prompt-alist)
(python-shell-continuation-prompt-alist): New options.
(python--set-prompt-regexp): New function.
(inferior-python-mode, run-python, python-shell):
Require ansi-color. Use python--set-prompt-regexp to set the comint
prompt based on the Python interpreter.
(python--prompt-regexp): New var.
(python-check-comint-prompt)
(python-comint-output-filter-function): Use it.
(run-python): Use a pipe (Bug#5694).
2010-11-21 Chong Yidong <cyd@stupidchicken.com>
* progmodes/python.el (run-python): Doc fix.
(python-keep-current-directory-in-path): New var (Bug#7454).
2010-11-20 Chong Yidong <cyd@stupidchicken.com>
* lpr.el (lpr-buffer, print-buffer, lpr-region, print-region):
Prompt user before actually printing.
2010-11-18 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (kill-new, kill-append, kill-region):
* comint.el (comint-kill-region): Make the yank-handler argument
obsolete.
2010-11-17 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/smie.el (smie-bnf-classify): Signal errors for tokens
that are both openers (resp. closers) and something else.
(smie-grammar): Loosen definition of valid values.
(smie-next-sexp, smie-down-list, smie-blink-matching-open)
(smie-indent--parent, smie-rule-parent, smie-indent-keyword)
(smie-indent-after-keyword): Adjust users.
(smie-indent-keyword): Don't indent empty lines.
* vc-hg.el (vc-hg-program): New var.
Suggested by Norman Gray <norman@astro.gla.ac.uk>.
(vc-hg-state, vc-hg-working-revision, vc-hg-command): Use it.
2010-11-17 Glenn Morris <rgm@gnu.org>
* emacs-lisp/autoload.el (autoload-find-destination): The function
coding-system-eol-type may return non-numeric values. (Bug#7414)
2010-11-16 Ulrich Mueller <ulm@gentoo.org>
* server.el (server-force-stop): Ensure the server is stopped (Bug#7409).
2010-11-13 Eli Zaretskii <eliz@gnu.org>
* subr.el (posn-col-row): Pay attention to header line. (Bug#7390)
2010-11-13 Chong Yidong <cyd@stupidchicken.com>
* textmodes/picture.el (picture-mouse-set-point): Don't use
posn-col-row; explicitly compute the motion based on the posn at
the window-start (Bug#7390).
2010-11-13 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-remote-coding-commands): Add an alternative
using "base64 -d -i". This is needed for older base64 versions
from GNU coreutils. Reported by Klaus Reichl
<Klaus.Reichl@thalesgroup.com>.
2010-11-13 Glenn Morris <rgm@gnu.org>
* novice.el (disabled-command-function):
Fix 2009-11-15 change. (Bug#7384)
2010-11-12 Glenn Morris <rgm@gnu.org>
* calendar/calendar.el (diary-iso-date-forms): Make elements
mutually exclusive. (Bug#7377)
2010-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/smie.el (smie-prec2->grammar): Obey equality constraints
when filling the remaining "unconstrained" values.
2010-11-11 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/bytecomp.el (byte-compile-warnings): Simplify the
safety predicate.
* files.el (safe-local-variable-p): Gracefully handle errors.
* emacs-lisp/smie.el (smie-rule-parent, smie-indent--rule):
Use smie-indent-virtual when indenting relative to an opener.
(smie-rule-separator): Use smie-rule-parent.
(smie-indent-keyword): Consult rules, even for openers at bol.
(smie-indent-comment-close): Try to align closer's content.
2010-11-11 Glenn Morris <rgm@gnu.org>
* ls-lisp.el (ls-lisp-dired-ignore-case): Make it an obsolete alias.
2010-11-10 Glenn Morris <rgm@gnu.org>
* printing.el (pr-menu-bind): Doc fix.
* speedbar.el (speedbar-toggle-images): Doc fix.
* progmodes/python.el (python-shell): Doc fix.
* wid-edit.el (widget-field-use-before-change)
(widget-use-overlay-change): Doc fixes.
2010-11-09 Glenn Morris <rgm@gnu.org>
* progmodes/tcl.el (tcl-hairy-scan-for-comment): Doc fix.
2010-11-08 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el (minibuffer-completion-help): Specify the end of the
completion field (bug#7211).
* progmodes/python.el (python-font-lock-syntactic-keywords): (bug#7322)
Fix handling of backslash escapes.
(python-quote-syntax): Adjust accordingly.
2010-11-08 Richard Levitte <richard@levitte.org> (tiny change)
* vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)
(vc-mtn-workfile-branch): Adjust to new output format.
2010-11-08 Stefan Monnier <monnier@iro.umontreal.ca>
* international/mule-cmds.el (princ-list): Mark as obsolete.
2010-11-07 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/smie.el: New package.
2010-11-06 Michael Albinus <michael.albinus@gmx.de>
* files.el (backup-by-copying-when-mismatch):
Set `permanent-local' property.
* net/tramp.el (tramp-handle-insert-file-contents): Do not set
`permanent-local' property for `backup-by-copying-when-mismatch'.
2010-11-06 Eli Zaretskii <eliz@gnu.org>
* ls-lisp.el (insert-directory): Doc fix. (bug#7285)
(ls-lisp-classify-file): New function.
(ls-lisp-insert-directory): Call it if switches include -F (bug#6294).
(ls-lisp-classify): Call ls-lisp-classify-file.
(insert-directory): Remove blanks from switches.
2010-11-07 Wilson Snyder <wsnyder@wsnyder.org>
* progmodes/verilog-mode.el (verilog-insert-one-definition)
(verilog-read-decls, verilog-read-sub-decls-sig): Fix AUTOWIRE and
AUTOINOUT for SV style multidimensional arrays, bug294.
Reported by Eric Mastromarchi.
(verilog-preprocess): Use with-current-buffer and
font-lock-fontify-buffer to cleanup style issues.
2010-11-05 Michael Albinus <michael.albinus@gmx.de>
* net/trampver.el: Update release number.
2010-08-01 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* mouse.el (mouse-fixup-help-message): Match "mouse-2" only at the
beginning of the string. Use `string-match-p'. (Bug#6765)
2010-11-01 Glenn Morris <rgm@gnu.org>
* locate.el (locate, locate-mode): Doc fixes.
2010-11-01 Chong Yidong <cyd@stupidchicken.com>
* server.el (server-start): New arg INHIBIT-PROMPT prevents asking
user for confirmation.
(server-force-stop): Use it.
(server-start): Use server-force-stop for kill-emacs-hook, to
avoid user interaction while killing Emacs.
2010-10-31 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/log-edit.el (log-edit-rewrite-fixes): New var.
(log-edit-author): New dynamic var.
(log-edit-changelog-ours-p, log-edit-insert-changelog-entries):
Use it to return the author if different from committer.
(log-edit-insert-changelog): Use them to add Author: and Fixes headers.
2010-10-31 Eli Zaretskii <eliz@gnu.org>
* vc/vc-hooks.el (vc-default-mode-line-string): Doc fix.
2010-10-31 Chong Yidong <cyd@stupidchicken.com>
* vc/vc.el (vc-deduce-backend): New fun. Handle diff buffers.
(vc-root-diff, vc-print-root-log, vc-log-incoming)
(vc-log-outgoing): Use it.
(vc-diff-internal): Set diff-vc-backend.
* vc/diff-mode.el (diff-vc-backend): New var.
2010-10-31 Juri Linkov <juri@jurta.org>
* vc/vc.el (vc-diff-internal): Set `revert-buffer-function'
buffer-locally to lambda that re-runs the vc diff command.
(Bug#6447)
2010-10-31 Dan Nicolaescu <dann@ics.uci.edu>
* vc/log-view.el (log-view-mode-map): Bind revert-buffer.
Make 'g' (AKA revert-buffer) rerun VC log, log-incoming and
log-outgoing commands.
* vc/vc.el (vc-log-internal-common): Add a new argument and use it
to create a buffer local revert-buffer-function variable.
(vc-print-log-internal, vc-log-incoming, vc-log-outgoing): Pass a
revert-buffer-function lambda.
Improve VC create/retrieve tag/branch.
* vc.el (vc-create-tag): Do not read the directory name for VCs
with repository revision granularity. Adjust the tag/branch
prompt. Reset VC properties.
(vc-retrieve-tag): Do not read the directory name for VCs
with repository revision granularity. Reset VC properties.
Add optional support for resetting VC properties.
* vc-dispatcher.el (vc-resynch-window): Add new optional argument,
call vc-file-clearprops when true.
(vc-resynch-buffer): Add new optional argument, pass it down.
(vc-resynch-buffers-in-directory): Likewise.
Improve support for special markup in the VC commit message.
* vc-mtn.el (vc-mtn-checkin): Support Author: and Date: markup.
* vc-hg.el (vc-hg-checkin): Add support for Date:.
* vc-git.el (vc-git-checkin):
* vc-bzr.el (vc-bzr-checkin): Likewise.
Add support for vc-log-incoming, improve vc-log-outgoing for Git.
* vc-git.el (vc-git-log-view-mode): Fix font lock for
incoming/outgoing logs.
(vc-git-log-outgoing, vc-git-log-incoming): New functions.
* vc-git.el (vc-git-log-outgoing): Use the same format as the
short log.
(vc-git-log-incoming): Likewise. Run "git fetch" before the log
command
Add bindings for vc-log-incoming and vc-log-outgoing.
* vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming
and vc-log-outgoing.
* vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming
and vc-log-outgoing.
Improve state updating for VC tag commands.
* vc.el (vc-create-tag, vc-retrieve-tag): Call vc-resynch-buffer
to update the state of all buffers in the directory.
2010-05-19 Glenn Morris <rgm@gnu.org>
* vc-dir.el (vc-dir): Don't pop-up-windows. (Bug#6204)
2010-10-31 Stefan Monnier <monnier@iro.umontreal.ca>
* vc.el (vc-checkin, vc-modify-change-comment):
Adjust to new vc-start/finish-logentry.
(vc-find-conflicted-file): New command.
(vc-transfer-file): Adjust to new vc-checkin.
(vc-next-action): Improve scoping.
* vc-git.el (vc-git-checkin): Use log-edit-extract-headers.
(vc-git-commits-coding-system): Rename from git-commits-coding-system.
* vc-dispatcher.el (vc-log-edit): Shorten names for
log-edit-show-files.
* vc-bzr.el (vc-bzr-checkin): Use log-edit-extract-headers.
(vc-bzr-conflicted-files): New function.
* log-edit.el (log-edit-summary, log-edit-header)
(log-edit-unknown-header): New faces.
(log-edit-headers-alist): New var.
(log-edit-header-contents-regexp): New const.
(log-edit-match-to-eoh): New function.
(log-edit-font-lock-keywords): Use them.
(log-edit): Insert a "Summary:" header as default.
(log-edit-mode): Mark font-lock rules as case-insensitive.
(log-edit-done): Cleanup headers.
(log-edit-extract-headers): New function to replace it.
* vc-dispatcher.el (vc-finish-logentry): Don't mess so badly with
the windows/frames.
* vc-bzr.el (vc-bzr-shelve-apply): Don't use *vc-bzr-shelve*.
* vc-dir.el (vc-dir-kill-line): New command.
(vc-dir-mode-map): Bind it to C-k.
(vc-dir-headers): Abbreviate the working dir.
* vc-git.el (vc-git-revision-table): Include remote branches.
2010-10-31 Dan Nicolaescu <dann@ics.uci.edu>
New VC methods: vc-log-incoming and vc-log-outgoing.
* vc.el (vc-print-log-setup-buttons, vc-log-internal-common)
(vc-incoming-outgoing-internal, vc-log-incoming, vc-log-outgoing):
New functions.
(vc-print-log-internal): Just call vc-log-internal-common.
(vc-log-view-type): New permanent local variable.
* vc-hooks.el (vc-menu-map): Bind vc-log-incoming and vc-log-outgoing.
* vc-bzr.el (vc-bzr-log-view-mode): Use vc-log-view-type instead
of the dynamic bound vc-short-log.
(vc-bzr-log-incoming, vc-bzr-log-outgoing): New functions.
* vc-git.el (vc-git-log-outgoing): New function.
(vc-git-log-view-mode): Use vc-log-view-type instead
of the dynamic bound vc-short-log.
* vc-hg.el (vc-hg-log-view-mode): Use vc-log-view-type instead of
the dynamic bound vc-short-log. Highlight the tag.
(vc-hg-log-incoming, vc-hg-log-outgoing): New functions.
(vc-hg-outgoing, vc-hg-incoming, vc-hg-outgoing-mode):
(vc-hg-incoming-mode): Remove.
(vc-hg-extra-menu-map): Do not bind vc-hg-incoming and vc-hg-outgoing.
Fix default-directory for vc-root-diff.
* vc.el (vc-root-diff): Bind default-directory to the root
directory for the diff command.
2010-10-31 Sam Steingold <sds@gnu.org>
* vc-hg.el (vc-hg-push, vc-hg-pull): Use `apply' when calling
`vc-hg-command' with a list of flags.
2010-10-31 Glenn Morris <rgm@gnu.org>
* vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to
log-edit-before-checkin-process.
* vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry.
* vc-bzr.el, vc-hg.el (log-edit-mode): Declare.
* vc-dispatcher.el (vc-start-logentry): Doc fix.
(log-view-process-buffer, log-edit-extra-flags): Declare.
2010-10-31 Dan Nicolaescu <dann@ics.uci.edu>
Add special markup processing for commit logs.
* log-edit.el (log-edit): Add new argument MODE. Use that mode
when non-nil instead of the log-view-mode.
* vc.el (vc-default-log-edit-mode): New function.
* vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to
log-edit.
Support for shelving snapshots and for showing shelves.
* vc-bzr.el (vc-bzr-shelve-show, vc-bzr-shelve-show-at-point)
(vc-bzr-shelve-apply-and-keep-at-point, vc-bzr-shelve-snapshot):
New functions.
(vc-bzr-shelve-map, vc-bzr-shelve-menu-map)
(vc-bzr-extra-menu-map): Map them.
2010-10-30 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-handle-insert-file-contents): For root,
preserve owner and group when editing files. (Bug#7289)
2010-10-29 Glenn Morris <rgm@gnu.org>
* speedbar.el (speedbar-mode):
* play/fortune.el (fortune-in-buffer, fortune):
* play/gomoku.el (gomoku-mode):
* play/landmark.el (lm-mode):
* textmodes/bibtex.el (bibtex-validate, bibtex-validate-globally):
Replace inappropriate uses of toggle-read-only. (Bug#7292)
2010-10-28 Glenn Morris <rgm@gnu.org>
* select.el (x-selection): Mark it as an obsolete alias.
2010-10-27 Aaron S. Hawley <aaron.s.hawley@gmail.com>
* add-log.el (find-change-log): Use derived-mode-p rather than
major-mode (bug#7284).
2010-10-27 Glenn Morris <rgm@gnu.org>
* menu-bar.el (menu-bar-files-menu): Make it into an actual alias,
rather than just an unused variable that inherits from the real one.
2010-10-23 Michael McNamara <mac@mail.brushroad.com>
* verilog-mode.el (verilog-directive-re): Make this variable
auto-built for efficiency of execution and updating.
(verilog-extended-complete-re): Support 'pure' fucntion & task
declarations (these have no bodies).
(verilog-beg-of-statement): General cleanup to enable support of
'pure' fucntion & task declarations (these have no bodies).
These efforts together fix Verilog bug210 from veripool; which was also
noticed by Steve Pearlmutter.
(verilog-directive-re, verilog-directive-begin, verilog-indent-re)
(verilog-directive-nest-re, verilog-set-auto-endcomments):
Support `elsif. Reported by Shankar Giri.
(verilog-forward-ws&directives, verilog-in-attribute-p): Fixes for
attribute handling for lining up declarations and assignments.
(verilog-beg-of-statement-1): Fix issue where continued declaration
is indented differently if it is after a begin..end clock.
(verilog-in-attribute-p, verilog-skip-backward-comments)
(verilog-skip-forward-comment-p): Support proper treatment of
attributes by indent code. Reported by Jeff Steele.
(verilog-in-directive-p): Fix comment to correctly describe function.
(verilog-backward-up-list, verilog-in-struct-region-p)
(verilog-backward-token, verilog-in-struct-p)
(verilog-in-coverage-p, verilog-do-indent)
(verilog-pretty-declarations): Use verilog-backward-up-list as
wrapper around backward-up-list inorder to properly skip comments.
Reported by David Rogoff.
(verilog-property-re, verilog-endcomment-reason-re)
(verilog-beg-of-statement, verilog-set-auto-endcomments)
(verilog-calc-1 ): Fix for assert a; else b; indentation (new form
of if). Reported by Max Bjurling and
(verilog-calc-1): Fix for clocking block in modport
declaration. Reported by Brian Hunter.
2010-10-23 Wilson Snyder <wsnyder@wsnyder.org>
* verilog-mode.el (verilog-auto-inst, verilog-gate-ios)
(verilog-gate-keywords, verilog-read-sub-decls)
(verilog-read-sub-decls-gate, verilog-read-sub-decls-gate-ios)
(verilog-read-sub-decls-line, verilog-read-sub-decls-sig): Support
AUTOINST for gate primitives, bug284. Reported by Mark Johnson.
(verilog-read-decls): Fix spaces in V2K module parameters causing
mis-identification as interfaces, bug287.
(verilog-read-decls): Fix not treating "parameter string" as a
parameter in AUTOINSTPARAM.
(verilog-read-always-signals-recurse, verilog-read-decls): Fix not
treating `elsif similar to `endif inside AUTOSENSE.
(verilog-do-indent): Implement correct automatic or static task or
function end comment highlight. Reported by Steve Pearlmutter.
(verilog-font-lock-keywords-2): Fix highlighting of single
character pins, bug264. Reported by Michael Laajanen.
(verilog-auto-inst, verilog-read-decls, verilog-read-sub-decls)
(verilog-read-sub-decls-in-interfaced, verilog-read-sub-decls-sig)
(verilog-subdecls-get-interfaced, verilog-subdecls-new):
Support interfaces with AUTOINST, bug270. Reported by Luis Gutierrez.
(verilog-pretty-expr): Fix interactive arguments, bug272.
Reported by Mark Johnson.
(verilog-auto-tieoff, verilog-auto-tieoff-ignore-regexp):
Add 'verilog-auto-tieoff-ignore-regexp' for AUTOTIEOFF,
bug269. Suggested by Gary Delp.
(verilog-mode-map, verilog-preprocess, verilog-preprocess-history)
(verilog-preprocessor, verilog-set-compile-command):
Create verilog-preprocess and verilog-preprocessor to show
preprocessed output.
(verilog-get-beg-of-line, verilog-get-end-of-line)
(verilog-modi-file-or-buffer, verilog-modi-name)
(verilog-modi-point, verilog-within-string): Move defmacro's
before first use to avoid warning. Reported by Steve Pearlmutter.
(verilog-colorize-buffer, verilog-colorize-include-files-buffer)
(verilog-colorize-region, verilog-highlight-buffer)
(verilog-highlight-includes, verilog-highlight-modules)
(verilog-highlight-region, verilog-mode): Rename colorize to
highlight to match other packages. Disable module highlighting,
as received speed complaints, reenable for experimentation only
using new verilog-highlight-modules.
(verilog-read-decls): Fix regexp stack overflow in very large
AUTO_TEMPLATEs, bug250.
(verilog-auto, verilog-delete-auto, verilog-save-buffer-state)
(verilog-scan): Create verilog-save-buffer-state to standardize
making insignificant changes that shouldn't call hooks.
(verilog-save-no-change-functions, verilog-save-scan-cache)
(verilog-scan, verilog-scan-cache-ok-p, verilog-scan-region):
Create verilog-save-no-change-functions to wrap verilog-scan
preservation, and fix to work with nested preserved calls.
(verilog-auto-inst, verilog-auto-inst-dot-name): Support .name
port syntax for AUTOWIRE, and with new verilog-auto-inst-dot-name
generate .name with AUTOINST, bug245. Suggested by David Rogoff.
(verilog-submit-bug-report): Update variable list to be complete.
(verilog-auto, verilog-colorize-region): Fix AUTO expansion
breaking on-the-fly font-locking.
(verilog-colorize-buffer, verilog-colorize-include-files)
(verilog-colorize-include-files-buffer, verilog-colorize-region)
(verilog-load-file-at-mouse, verilog-load-file-at-point)
(verilog-mode, verilog-read-inst-module-matcher): With point on a
AUTOINST cell instance name, middle mouse button now finds-file on
it. Suggested by Brad Dobbie.
(verilog-alw-get-temps, verilog-auto-reset)
(verilog-auto-sense-sigs, verilog-read-always-signals)
(verilog-read-always-signals-recurse): Fix loop indexes being
AUTORESET. AUTORESET now assumes any variables in the
initialization section of a for() should be ignored.
Reported by Dan Dever.
(verilog-error-font-lock-keywords)
(verilog-error-regexp-emacs-alist)
(verilog-error-regexp-xemacs-alist): Fix error detection of
Cadence HAL, reported by David Asher. Repair drift between the
three similar error variables.
(verilog-modi-lookup, verilog-modi-lookup-cache)
(verilog-modi-lookup-last-current, verilog-modi-lookup-last-mod)
(verilog-modi-lookup-last-modi, verilog-modi-lookup-last-tick):
Fix slow verilog-auto expansion on very large files.
(verilog-read-sub-decls-expr, verilog-read-sub-decls-line):
Fix AUTOOUTPUT treating "1*2" as a signal name in submodule connection
"{1*2{...". Broke in last revision.
(verilog-read-sub-decls-expr): Fix AUTOOUTPUT not detecting
submodule connections with replications "{#{a},#{b}}".
2010-10-23 Glenn Morris <rgm@gnu.org>
* comint.el (comint-password-prompt-regexp):
Match "enter the password". (Bug#7224)
2010-10-22 Juanma Barranquero <lekktu@gmail.com>
* progmodes/dcl-mode.el (dcl-electric-reindent-regexps):
Fix typo in docstring.
2010-10-21 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-get-inline-coding): Return `nil' in case of
errors.
* net/trampver.el: Update release number.
2010-10-20 Kenichi Handa <handa@m17n.org>
* face-remap.el (text-scale-adjust): Call read-event with a proper
@ -940,7 +1485,8 @@
Fix annotating other revisions for renamed files in vc-annotate.
* vc-annotate.el (vc-annotate): Add an optional argument for the
VC backend. Use it when non-nil.
(vc-annotate-warp-revision): Pass the VC backend to vc-annotate. (Bug#6487)
(vc-annotate-warp-revision): Pass the VC backend to vc-annotate
(Bug#6487).
Fix vc-annotate-show-changeset-diff-revision-at-line for git.
* vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal):
@ -1536,8 +2082,8 @@
2010-02-28 Michael Albinus <michael.albinus@gmx.de>
* net/dbus.el (dbus-introspect, dbus-get-property)
(dbus-set-property, dbus-get-all-properties): Use
`dbus-call-method' when noninteractive. (Bug#5645)
(dbus-set-property, dbus-get-all-properties):
Use `dbus-call-method' when noninteractive. (Bug#5645)
2010-02-28 Chong Yidong <cyd@stupidchicken.com>
@ -1600,8 +2146,8 @@
2010-02-21 Chong Yidong <cyd@stupidchicken.com>
* files.el (directory-listing-before-filename-regexp): Use
stricter matching for iso-style dates, to avoid false matches with
* files.el (directory-listing-before-filename-regexp):
Use stricter matching for iso-style dates, to avoid false matches with
date-like filenames (Bug#5597).
* htmlfontify.el (htmlfontify): Doc fix.
@ -1624,8 +2170,8 @@
2010-02-19 Chong Yidong <cyd@stupidchicken.com>
* isearch.el (isearch-update-post-hook, isearch-update): Revert
2010-02-17 change.
* isearch.el (isearch-update-post-hook, isearch-update):
Revert 2010-02-17 change.
2010-02-19 Ulf Jasper <ulf.jasper@web.de>
@ -1860,7 +2406,8 @@
2010-02-06 Dan Nicolaescu <dann@ics.uci.edu>
* vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.
* vc-bzr.el (vc-bzr-dir-extra-headers):
Disable the pending merges header.
2010-02-05 Juri Linkov <juri@jurta.org>
@ -2091,8 +2638,8 @@
(vc-git-toggle-signoff): Remove function.
(vc-git-extra-menu-map): Do not bind vc-git-toggle-signoff.
* term/xterm.el (xterm-maybe-set-dark-background-mode): Rename
from xterm-set-background-mode. Return t if the background mode
* term/xterm.el (xterm-maybe-set-dark-background-mode):
Rename from xterm-set-background-mode. Return t if the background mode
was set.
(terminal-init-xterm): Move tty-set-up-initial-frame-faces
earlier, call it again in case the background mode has changed.
@ -2139,8 +2686,8 @@
2010-01-21 Alan Mackenzie <acm@muc.de>
Fix a situation where deletion of a cpp construct throws an error.
* progmodes/cc-engine.el (c-invalidate-state-cache): Before
invoking c-with-all-but-one-cpps-commented-out, check that the
* progmodes/cc-engine.el (c-invalidate-state-cache):
Before invoking c-with-all-but-one-cpps-commented-out, check that the
special cpp construct is still in the buffer.
(c-parse-state): Record the special cpp with markers, not numbers.
@ -2256,8 +2803,8 @@
2010-01-16 Lennart Borgman <lennart.borgman@gmail.com>
* nxml/nxml-mode.el (nxml-extend-after-change-region): Never
return t (Bug#3898).
* nxml/nxml-mode.el (nxml-extend-after-change-region):
Never return t (Bug#3898).
2010-01-16 Frédéric Perrin <frederic.perrin@resel.fr> (tiny change)
@ -2374,8 +2921,8 @@
2010-01-12 Glenn Morris <rgm@gnu.org>
* mail/emacsbug.el (report-emacs-bug-pretest-address): Set
it to bug-gnu-emacs rather than emacs-pretest-bug.
* mail/emacsbug.el (report-emacs-bug-pretest-address):
Set it to bug-gnu-emacs rather than emacs-pretest-bug.
2010-01-11 Sam Steingold <sds@gnu.org>
@ -2689,8 +3236,8 @@
2009-12-29 Dan Nicolaescu <dann@ics.uci.edu>
Make vc-dir work on subdirectories of the bzr root.
* vc-bzr.el (vc-bzr-after-dir-status): Add new argument. Return
file names relative to it.
* vc-bzr.el (vc-bzr-after-dir-status): Add new argument.
Return file names relative to it.
(vc-bzr-dir-status, vc-bzr-dir-status-files): Pass the bzr root
relative directory to vc-bzr-after-dir-status.
@ -2748,8 +3295,8 @@
2009-12-18 Ulf Jasper <ulf.jasper@web.de>
* calendar/icalendar.el (icalendar--convert-tz-offset): Fixed
timezone names.
* calendar/icalendar.el (icalendar--convert-tz-offset):
Fixed timezone names.
(icalendar--convert-tz-offset): Fixed the "last-day-problem".
(icalendar--add-diary-entry): Remove the trailing blank that
diary-make-entry inserts.
@ -2784,8 +3331,8 @@
* files.el (hack-local-variables-filter): While ignoring duplicates,
don't take `mode' into account.
(hack-local-variables-filter, hack-dir-local-variables): Don't
remove duplicate `mode' from local-variables-alist (like `eval').
(hack-local-variables-filter, hack-dir-local-variables):
Don't remove duplicate `mode' from local-variables-alist (like `eval').
2009-12-17 Juri Linkov <juri@jurta.org>
@ -2932,8 +3479,8 @@
2009-12-10 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* whitespace.el (whitespace-display-char-on): Ensure
`buffer-display-table' is unique when two or more windows are
* whitespace.el (whitespace-display-char-on):
Ensure `buffer-display-table' is unique when two or more windows are
visible. Reported by Martin Pohlack <mp26@os.inf.tu-dresden.de>.
New version 12.1.
@ -3150,11 +3697,11 @@
(tramp-methods, tramp-find-shell)
(tramp-open-connection-setup-interactive-shell)
(tramp-maybe-open-connection): Use it.
(tramp-shell-prompt-pattern, tramp-wait-for-output): Handle
existence of `#' and `$'.
(tramp-shell-prompt-pattern, tramp-wait-for-output):
Handle existence of `#' and `$'.
* net/tramp-fish.el (tramp-fish-maybe-open-connection): Use
`tramp-initial-end-of-output'.
* net/tramp-fish.el (tramp-fish-maybe-open-connection):
Use `tramp-initial-end-of-output'.
2009-12-07 Dan Nicolaescu <dann@ics.uci.edu>
@ -3212,13 +3759,13 @@
2009-12-06 Ulf Jasper <ulf.jasper@web.de>
* xml.el (xml-substitute-numeric-entities): Move
newsticker--decode-numeric-entities in newst-backend.el to
* xml.el (xml-substitute-numeric-entities):
Move newsticker--decode-numeric-entities in newst-backend.el to
xml-substitute-numeric-entities in xml.el. (Bug#5008)
* net/newst-backend.el (newsticker--parse-generic-feed)
(newsticker--parse-generic-items)
(newsticker--decode-numeric-entities): Move
newsticker--decode-numeric-entities in newst-backend.el to
(newsticker--decode-numeric-entities):
Move newsticker--decode-numeric-entities in newst-backend.el to
xml-substitute-numeric-entities in xml.el. (Bug#5008)
2009-12-06 Daniel Colascione <dan.colascione@gmail.com>
@ -3281,8 +3828,8 @@
2009-12-05 Kevin Ryde <user42@zip.com.au>
* textmodes/sgml-mode.el (sgml-lexical-context): Recognise
comment-start-skip to comment-end-skip as comment (Bug#4781).
* textmodes/sgml-mode.el (sgml-lexical-context):
Recognise comment-start-skip to comment-end-skip as comment (Bug#4781).
2009-12-05 Juri Linkov <juri@jurta.org>
@ -3739,8 +4286,8 @@
(doc-view-scroll-up-or-next-page)
(doc-view-scroll-down-or-previous-page)
(doc-view-next-line-or-next-page)
(doc-view-previous-line-or-previous-page): Rename
`doc-view-continuous-mode' to `doc-view-continuous'. (Bug#4896)
(doc-view-previous-line-or-previous-page):
Rename `doc-view-continuous-mode' to `doc-view-continuous'. (Bug#4896)
2009-11-30 Juri Linkov <juri@jurta.org>
@ -3942,8 +4489,8 @@
(verilog-auto-inst, verilog-auto-star-safe)
(verilog-delete-auto-star-implicit, verilog-read-sub-decls):
Fix removing "// Interfaces" when saving .* expansions. Reported by
Pierre-David Pfister.
Fix removing "// Interfaces" when saving .* expansions.
Reported by Pierre-David Pfister.
2009-11-26 Glenn Morris <rgm@gnu.org>
@ -5121,12 +5668,12 @@
(tramp-compat-delete-directory): New defuns.
* net/tramp-fish.el (tramp-fish-handle-delete-directory):
* net/tramp-gvfs.el (tramp-gvfs-handle-delete-directory): Use
`tramp-compat-delete-directory'.
* net/tramp-gvfs.el (tramp-gvfs-handle-delete-directory):
Use `tramp-compat-delete-directory'.
* net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-delete-directory): Use
`tramp-compat-copy-directory' and `tramp-compat-delete-directory'.
(tramp-smb-handle-delete-directory):
Use `tramp-compat-copy-directory' and `tramp-compat-delete-directory'.
* net/trampver.el: Update release number.
@ -5478,11 +6025,11 @@
2009-10-31 Chong Yidong <cyd@stupidchicken.com>
* international/mule-diag.el (list-character-sets-1): Minor
message fix (Bug#3526).
* international/mule-diag.el (list-character-sets-1):
Minor message fix (Bug#3526).
* progmodes/etags.el (etags-list-tags, etags-tags-apropos): Fix
face property (Bug#4834).
* progmodes/etags.el (etags-list-tags, etags-tags-apropos):
Fix face property (Bug#4834).
(etags-list-tags, etags-tags-apropos-additional)
(etags-tags-apropos, tags-select-tags-table): Add follow-link
property.
@ -5979,8 +6526,8 @@
2009-10-23 Jay Belanger <jay.p.belanger@gmail.com>
* calc/calc.el (math-read-number, math-read-number-simple): Use
`save-match-data'.
* calc/calc.el (math-read-number, math-read-number-simple):
Use `save-match-data'.
2009-10-22 Stefan Monnier <monnier@iro.umontreal.ca>
@ -7274,8 +7821,8 @@
2009-09-26 Alan Mackenzie <acm@muc.de>
* progmodes/cc-engine.el (c-beginning-of-statement-1): Correct
buggy bracketing. (Bug#4289)
* progmodes/cc-engine.el (c-beginning-of-statement-1):
Correct buggy bracketing. (Bug#4289)
* progmodes/cc-langs.el (c-nonlabel-token-key): Allow quoted
character constants (as case labels). (Bug#4289)
@ -7658,8 +8205,8 @@
2009-09-21 Chong Yidong <cyd@stupidchicken.com>
* files.el (conf-mode-maybe, magic-fallback-mode-alist): Use
nxml-mode instead of xml-mode.
* files.el (conf-mode-maybe, magic-fallback-mode-alist):
Use nxml-mode instead of xml-mode.
2009-09-21 Kevin Ryde <user42@zip.com.au>
@ -8480,8 +9027,8 @@
* net/tramp.el (tramp-handle-insert-directory): Handle "--dired"
also when adding a new directory.
* net/tramp-compat.el (tramp-compat-line-beginning-position): New
defun.
* net/tramp-compat.el (tramp-compat-line-beginning-position):
New defun.
2009-09-04 Stefan Monnier <monnier@iro.umontreal.ca>
@ -9808,8 +10355,8 @@
(gdb-control-current-thread): Interactive setters for
`gdb-gud-control-all-threads' to use in menu.
(gdb-show-run-p): Show «Go» when process is not active.
(gud-tool-bar-map): Add non-stop/A,T indicator. Uses
gud/thread.xpm and gud/all.xpm.
(gud-tool-bar-map): Add non-stop/A,T indicator.
Uses gud/thread.xpm and gud/all.xpm.
2009-08-08 Yoni Rabkin <yoni@rabkins.net>
@ -9833,8 +10380,8 @@
(gdb-breakpoints-mode-map): Don't assume threads buffer is present.
(gdb-threads-mode-map): Don't assume breakpoints buffer is present.
(gdb-disassembly-handler-custom, gdb-stack-list-frames-custom)
(gdb-locals-handler-custom, gdb-registers-handler-custom): Thread
info in mode name.
(gdb-locals-handler-custom, gdb-registers-handler-custom):
Thread info in mode name.
(gdb-registers-mode-map): TAB to switch to locals.
2009-08-08 Eli Zaretskii <eliz@gnu.org>
@ -9849,14 +10396,14 @@
2009-08-07 Eli Zaretskii <eliz@gnu.org>
* mail/sendmail.el (mail-yank-original): Set
buffer-file-coding-system from the one used by the message whose
* mail/sendmail.el (mail-yank-original):
Set buffer-file-coding-system from the one used by the message whose
text is yanked.
* calc/calc-graph.el (calc-graph-plot): Set calc-graph-last-device
to "windows" when "pgnuplot" is used.
(calc-graph-command, calc-gnuplot-command, calc-graph-init): Don't
call accept-process-output if "pgnuplot" is used.
(calc-graph-command, calc-gnuplot-command, calc-graph-init):
Don't call accept-process-output if "pgnuplot" is used.
(calc-graph-init): Don't send -display and -geometry to
"pgnuplot". If "pgnuplot" is used, glean gnuplot version by
running "pgnuplot -V" with shell-command-to-string.
@ -9996,11 +10543,11 @@
* progmodes/gdb-mi.el (gdb-thread-number): Initialize with nil.
(gdb-current-context-command): Do not append --thread if
`gdb-thread-number' is nil.
(gdb-running-threads-count, gdb-stopped-threads-count): New
variables.
(gdb-running-threads-count, gdb-stopped-threads-count):
New variables.
(gdb-non-stop, gdb-gud-control-all-threads, gdb-switch-reasons)
(gdb-stopped-hooks, gdb-switch-when-another-stopped): New
customization options.
(gdb-stopped-hooks, gdb-switch-when-another-stopped):
New customization options.
(gdb-gud-context-command, gdb-gud-context-call): New wrappers for
GUD commands.
(gdb): `gud-def' definitions changed to use `gdb-gud-context-call'.
@ -10124,8 +10671,8 @@
* net/tramp-cache.el (tramp-cache-inhibit-cache): New defvar.
(tramp-get-file-property): Use it.
* autorevert.el (auto-revert-handler): Allow
`auto-revert-tail-mode' for remote files.
* autorevert.el (auto-revert-handler):
Allow `auto-revert-tail-mode' for remote files.
2009-08-02 Jason Rumney <jasonr@gnu.org>
@ -10135,8 +10682,8 @@
2009-08-02 Chong Yidong <cyd@stupidchicken.com>
* font-lock.el (font-lock-string-face, font-lock-builtin-face)
(font-lock-variable-name-face, font-lock-constant-face): Darken
the colors for light backgrounds.
(font-lock-variable-name-face, font-lock-constant-face):
Darken the colors for light backgrounds.
2009-08-01 Eli Zaretskii <eliz@gnu.org>
@ -10236,8 +10783,8 @@
* net/zeroconf.el (zeroconf-init): Check for "GetVersionString"
instead of "IsNSSSupportAvailable". Avahi ought to work also when
"IsNSSSupportAvailable" method is not available. Reported by
Steve Youngs <steve@sxemacs.org>.
"IsNSSSupportAvailable" method is not available.
Reported by Steve Youngs <steve@sxemacs.org>.
2009-07-24 Kenichi Handa <handa@m17n.org>
@ -10362,11 +10909,11 @@
2009-07-21 Chong Yidong <cyd@stupidchicken.com>
* mail/rmailedit.el (rmail-edit-mode): Use
auto-save-include-big-deletions.
* mail/rmailedit.el (rmail-edit-mode):
Use auto-save-include-big-deletions.
* mail/rmail.el (rmail-variables): Use
auto-save-include-big-deletions.
* mail/rmail.el (rmail-variables):
Use auto-save-include-big-deletions.
* files.el (auto-save-mode): Revert 2009-07-21 and 2009-07-16
changes.
@ -10542,8 +11089,8 @@
* w32-fns.el (x-selection-owner-p): New function.
* mouse.el (mouse-drag-track): Call deactivate-mark earlier.
(mouse-yank-at-click, mouse-yank-primary): If
select-active-regions is non-nil, deactivate the mark before
(mouse-yank-at-click, mouse-yank-primary):
If select-active-regions is non-nil, deactivate the mark before
insertion.
* simple.el (deactivate-mark, set-mark): Only save selection if we
@ -10612,11 +11159,11 @@
* select.el (x-set-selection): Doc fix.
(x-valid-simple-selection-p): Allow buffer values.
(xselect--selection-bounds): Handle buffer values. Suggested by
David De La Harpe Golden.
(xselect--selection-bounds): Handle buffer values.
Suggested by David De La Harpe Golden.
* mouse.el (mouse-set-region, mouse-drag-track): Call
copy-region-as-kill before setting the mark, to let
* mouse.el (mouse-set-region, mouse-drag-track):
Call copy-region-as-kill before setting the mark, to let
select-active-regions work.
2009-07-15 David De La Harpe Golden <david@harpegolden.net>
@ -10818,8 +11365,8 @@
* progmodes/gdb-mi.el: Port memory buffer from gdb-ui.el.
(gdb-memory-address): New variable which holds top address of
memory page shown in memory buffer.
(gdb-memory-repeat-count, gdb-memory-format, gdb-memory-unit): New
customization variables.
(gdb-memory-repeat-count, gdb-memory-format, gdb-memory-unit):
New customization variables.
New functions:
(gdb-display-memory-buffer, gdb-frame-memory-buffer): Functions to
display the memory buffer.
@ -10832,8 +11379,8 @@
(gdb-memory-unit-word, gdb-memory-unit-halfword)
(gdb-memory-unit-giant, gdb-memory-unit-byte): Functions to set
unit size used in memory buffer.
(gdb-memory-show-next-page, gdb-memory-show-previous-page): Switch
to next/previous page of memory buffer.
(gdb-memory-show-next-page, gdb-memory-show-previous-page):
Switch to next/previous page of memory buffer.
Now using (bindat-get-field) instead of fadr functions.
2009-07-07 Sam Steingold <sds@gnu.org>
@ -10843,8 +11390,8 @@
2009-07-07 Kenichi Handa <handa@m17n.org>
* international/mule-cmds.el (reset-language-environment): Put
the highset priority to the charset iso-8859-1.
* international/mule-cmds.el (reset-language-environment):
Put the highset priority to the charset iso-8859-1.
2009-07-06 Chong Yidong <cyd@stupidchicken.com>
@ -10874,8 +11421,8 @@
(woman-file-name, woman2-format-paragraphs)
(woman-leave-blank-lines): Code cleanup.
(woman-use-own-frame): Change default to nil.
(woman-italic, woman-bold, woman-unknown, woman-addition): Change
defaults to inherit from default faces.
(woman-italic, woman-bold, woman-unknown, woman-addition):
Change defaults to inherit from default faces.
(woman2-process-escapes): Consume the newline after a stand-alone
filler character (Bug#3651).
@ -11169,8 +11716,8 @@
(verilog-auto-ascii-enum): Support one-hot state machines in
AUTOASCIIENUM. Suggested by Lloyd Gomez.
(verilog-auto-inst, verilog-auto-inst-port): Include interface
modport in AUTOINST and add vl-modport for users. Reported by
David Rogoff.
modport in AUTOINST and add vl-modport for users.
Reported by David Rogoff.
(verilog-auto-inout-module, verilog-auto-inst)
(verilog-decls-get-interfaces, verilog-insert-definition)
(verilog-insert-one-definition, verilog-read-decls)

4
lisp/ChangeLog.12
View file

@ -12997,8 +12997,8 @@
2006-02-13 Mathias Dahl <mathias.dahl@gmail.com>
* tumme.el: Remove history section. If someone needs the it, it
can always be found in CVS.
* tumme.el: Remove history section. If someone needs it, it can
always be found in CVS.
2006-02-12 Mathias Dahl <mathias.dahl@gmail.com>

8
lisp/ChangeLog.13
View file

@ -6680,8 +6680,9 @@
buffer if the parent buffer is in vc-dired-mode.
2007-11-23 Mark A. Hershberger <mah@everybody.org>
James Clark <none@example.com>
* nxml: Initial merge of nxml. Kept nxml/char-name subdir for now.
* nxml/: Initial merge of nxml. Kept nxml/char-name subdir for now.
2007-11-23 Juri Linkov <juri@jurta.org>
@ -16693,10 +16694,9 @@ See ChangeLog.12 for earlier changes.
;; Local Variables:
;; coding: utf-8
;; add-log-time-zone-rule: t
;; End:
Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -16712,5 +16712,3 @@ See ChangeLog.12 for earlier changes.
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;; arch-tag: 1e8aa93a-fc6c-4ac3-9b10-1f445e1840af

4
lisp/ChangeLog.9
View file

@ -1034,8 +1034,8 @@
2001-09-18 Eli Zaretskii <eliz@is.elta.co.il>
* dired.el (dired-move-to-filename-regexp): Allow one digit in the
numeric month value, and allow the Kanji character after the it to
be missing (happens with ls-lisp's output on Japanese versions of
numeric month value, and allow the Kanji character after it to be
missing (happens with ls-lisp's output on Japanese versions of
MS-Windows).
2001-09-18 Miles Bader <miles@gnu.org>

1
lisp/Makefile.in
View file

@ -559,6 +559,7 @@ ELCFILES = \
$(lisp)/emacs-lisp/ring.elc \
$(lisp)/emacs-lisp/rx.elc \
$(lisp)/emacs-lisp/shadow.elc \
$(lisp)/emacs-lisp/smie.elc \
$(lisp)/emacs-lisp/sregex.elc \
$(lisp)/emacs-lisp/syntax.elc \
$(lisp)/emacs-lisp/tcover-ses.elc \

4
lisp/add-log.el
View file

@ -701,7 +701,7 @@ current buffer to the complete file name.
Optional arg BUFFER-FILE overrides `buffer-file-name'."
;; If we are called from a diff, first switch to the source buffer;
;; in order to respect buffer-local settings of change-log-default-name, etc.
(with-current-buffer (let ((buff (if (eq major-mode 'diff-mode)
(with-current-buffer (let ((buff (if (derived-mode-p 'diff-mode)
(car (ignore-errors
(diff-find-source-location))))))
(if (buffer-live-p buff) buff
@ -1173,7 +1173,7 @@ Has a preference of looking backwards."
((apply 'derived-mode-p add-log-c-like-modes)
(or (c-cpp-define-name)
(c-defun-name)))
((memq major-mode add-log-tex-like-modes)
((apply #'derived-mode-p add-log-tex-like-modes)
(if (re-search-backward
"\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)"
nil t)

13
lisp/calendar/calendar.el
View file

@ -736,14 +736,16 @@ calendar package is already loaded). Rather, use either
(defcustom diary-iso-date-forms
'((month "[-/]" day "[^-/0-9]")
(year "[-/]" month "[-/]" day "[^0-9]")
(monthname "-" day "[^-0-9]")
(year "-" monthname "-" day "[^0-9]")
;; Cannot allow [-/] as separators here, since it would also match
;; the first element (bug#7377).
(monthname " *" day "[^-0-9]")
(year " *" monthname " *" day "[^0-9]")
(dayname "\\W"))
"List of pseudo-patterns describing the ISO style of dates.
The defaults are: MONTH[-/]DAY; YEAR[-/]MONTH[-/]DAY; MONTHNAME-DAY;
YEAR-MONTHNAME-DAY; DAYNAME. Normally you should not customize this,
The defaults are: MONTH[-/]DAY; YEAR[-/]MONTH[-/]DAY; MONTHNAME DAY;
YEAR MONTHNAME DAY; DAYNAME. Normally you should not customize this,
but `diary-date-forms' (which see)."
:version "23.1"
:version "23.3" ; bug#7377
:type '(repeat (choice (cons :tag "Backup"
:value (backup . nil)
(const backup)
@ -2570,5 +2572,4 @@ If called by a mouse-event, pops up a menu with the result."
;; byte-compile-dynamic: t
;; End:
;; arch-tag: 19c61596-c8fb-4c69-bcf1-7dd739919cd8
;;; calendar.el ends here

8
lisp/cedet/ChangeLog
View file

@ -1,3 +1,11 @@
2010-10-29 Glenn Morris <rgm@gnu.org>
* mode-local.el (mode-local-augment-function-help):
* semantic/analyze/debug.el (semantic-analyzer-debug-add-buttons):
* semantic/symref/list.el (semantic-symref-results-dump)
(semantic-symref-rb-toggle-expand-tag): Replace inappropriate uses
of toggle-read-only.
2010-10-12 Juanma Barranquero <lekktu@gmail.com>
* semantic/symref/list.el (semantic-symref-list-rename-open-hits):

27
lisp/cedet/mode-local.el
View file

@ -1,6 +1,7 @@
;;; mode-local.el --- Support for mode local facilities
;;
;; Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010
;; Free Software Foundation, Inc.
;;
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>
@ -610,19 +611,16 @@ PROMPT, INITIAL, HIST, and DEFAULT are the same as for `completing-read'."
SYMBOL is a function that can be overridden."
(with-current-buffer "*Help*"
(pop-to-buffer (current-buffer))
(unwind-protect
(progn
(toggle-read-only -1)
(goto-char (point-min))
(unless (re-search-forward "^$" nil t)
(goto-char (point-max))
(beginning-of-line)
(forward-line -1))
(insert (overload-docstring-extension symbol) "\n")
;; NOTE TO SELF:
;; LIST ALL LOADED OVERRIDES FOR SYMBOL HERE
)
(toggle-read-only 1))))
(goto-char (point-min))
(unless (re-search-forward "^$" nil t)
(goto-char (point-max))
(beginning-of-line)
(forward-line -1))
(let ((inhibit-read-only t))
(insert (overload-docstring-extension symbol) "\n")
;; NOTE TO SELF:
;; LIST ALL LOADED OVERRIDES FOR SYMBOL HERE
)))
;; Help for mode-local bindings.
(defun mode-local-print-binding (symbol)
@ -782,5 +780,4 @@ invoked interactively."
(provide 'mode-local)
;; arch-tag: 14b77823-f93c-4b3d-9116-495f69a6ec07
;;; mode-local.el ends here

44
lisp/cedet/semantic/analyze/debug.el
View file

@ -586,34 +586,28 @@ Look for key expressions, and add push-buttons near them."
(set-marker orig-buffer (point) (current-buffer))
;; Get a buffer ready.
(with-current-buffer "*Help*"
(toggle-read-only -1)
(goto-char (point-min))
(set (make-local-variable 'semantic-analyzer-debug-orig) orig-buffer)
;; First, add do-in buttons to recommendations.
(while (re-search-forward "^\\s-*M-x \\(\\(\\w\\|\\s_\\)+\\) " nil t)
(let ((fcn (match-string 1)))
(when (not (fboundp (intern-soft fcn)))
(error "Help Err: Can't find %s" fcn))
(end-of-line)
(insert " ")
(insert-button "[ Do It ]"
'mouse-face 'custom-button-pressed-face
'do-fcn fcn
'action `(lambda (arg)
(let ((M semantic-analyzer-debug-orig))
(set-buffer (marker-buffer M))
(goto-char M))
(call-interactively (quote ,(intern-soft fcn))))
)
))
(let ((inhibit-read-only t))
(goto-char (point-min))
(set (make-local-variable 'semantic-analyzer-debug-orig) orig-buffer)
;; First, add do-in buttons to recommendations.
(while (re-search-forward "^\\s-*M-x \\(\\(\\w\\|\\s_\\)+\\) " nil t)
(let ((fcn (match-string 1)))
(when (not (fboundp (intern-soft fcn)))
(error "Help Err: Can't find %s" fcn))
(end-of-line)
(insert " ")
(insert-button "[ Do It ]"
'mouse-face 'custom-button-pressed-face
'do-fcn fcn
'action `(lambda (arg)
(let ((M semantic-analyzer-debug-orig))
(set-buffer (marker-buffer M))
(goto-char M))
(call-interactively (quote ,(intern-soft fcn))))))))
;; Do something else?
;; Clean up the mess
(toggle-read-only 1)
(set-buffer-modified-p nil)
)))
(set-buffer-modified-p nil))))
(provide 'semantic/analyze/debug)
;; arch-tag: 943db1e5-47e6-4bec-9989-78ebfadf0358
;;; semantic/analyze/debug.el ends here

148
lisp/cedet/semantic/symref/list.el
View file

@ -221,49 +221,38 @@ Some useful functions are found in `semantic-format-tag-functions'."
(defun semantic-symref-results-dump (results)
"Dump the RESULTS into the current buffer."
;; Get ready for the insert.
(toggle-read-only -1)
(erase-buffer)
;; Insert the contents.
(let ((lastfile nil)
)
(dolist (T (oref results :hit-tags))
(when (not (equal lastfile (semantic-tag-file-name T)))
(setq lastfile (semantic-tag-file-name T))
(insert-button lastfile
'mouse-face 'custom-button-pressed-face
'action 'semantic-symref-rb-goto-file
(let ((inhibit-read-only t))
(erase-buffer)
;; Insert the contents.
(let ((lastfile nil))
(dolist (T (oref results :hit-tags))
(unless (equal lastfile (semantic-tag-file-name T))
(setq lastfile (semantic-tag-file-name T))
(insert-button lastfile
'mouse-face 'custom-button-pressed-face
'action 'semantic-symref-rb-goto-file
'tag T)
(insert "\n"))
(insert " ")
(insert-button "[+]"
'mouse-face 'highlight
'face nil
'action 'semantic-symref-rb-toggle-expand-tag
'tag T
)
(insert "\n"))
(insert " ")
(insert-button "[+]"
'mouse-face 'highlight
'face nil
'action 'semantic-symref-rb-toggle-expand-tag
'tag T
'state 'closed)
(insert " ")
(insert-button (funcall semantic-symref-results-summary-function
T nil t)
'mouse-face 'custom-button-pressed-face
'face nil
'action 'semantic-symref-rb-goto-tag
'tag T)
(insert "\n")
))
;; Auto expand
(when semantic-symref-auto-expand-results
(semantic-symref-list-expand-all))
;; Clean up the mess
(toggle-read-only 1)
(set-buffer-modified-p nil)
)
'state 'closed)
(insert " ")
(insert-button (funcall semantic-symref-results-summary-function
T nil t)
'mouse-face 'custom-button-pressed-face
'face nil
'action 'semantic-symref-rb-goto-tag
'tag T)
(insert "\n")))
;; Auto expand
(when semantic-symref-auto-expand-results
(semantic-symref-list-expand-all)))
;; Clean up the mess
(set-buffer-modified-p nil))
;;; Commands for semantic-symref-results
;;
@ -283,11 +272,9 @@ BUTTON is the button that was clicked."
(buff (semantic-tag-buffer tag))
(hits (semantic--tag-get-property tag :hit))
(state (button-get button 'state))
(text nil)
)
(text nil))
(cond
((eq state 'closed)
(toggle-read-only -1)
(with-current-buffer buff
(dolist (H hits)
(goto-char (point-min))
@ -295,48 +282,42 @@ BUTTON is the button that was clicked."
(beginning-of-line)
(back-to-indentation)
(setq text (cons (buffer-substring (point) (point-at-eol)) text)))
(setq text (nreverse text))
)
(setq text (nreverse text)))
(goto-char (button-start button))
(forward-char 1)
(delete-char 1)
(insert "-")
(button-put button 'state 'open)
(save-excursion
(end-of-line)
(while text
(insert "\n")
(insert " ")
(insert-button (car text)
'mouse-face 'highlight
'face nil
'action 'semantic-symref-rb-goto-match
'tag tag
'line (car hits))
(setq text (cdr text)
hits (cdr hits))))
(toggle-read-only 1)
)
(let ((inhibit-read-only t))
(delete-char 1)
(insert "-")
(button-put button 'state 'open)
(save-excursion
(end-of-line)
(while text
(insert "\n")
(insert " ")
(insert-button (car text)
'mouse-face 'highlight
'face nil
'action 'semantic-symref-rb-goto-match
'tag tag
'line (car hits))
(setq text (cdr text)
hits (cdr hits))))))
((eq state 'open)
(toggle-read-only -1)
(button-put button 'state 'closed)
;; Delete the various bits.
(goto-char (button-start button))
(forward-char 1)
(delete-char 1)
(insert "+")
(save-excursion
(end-of-line)
(let ((inhibit-read-only t))
(button-put button 'state 'closed)
;; Delete the various bits.
(goto-char (button-start button))
(forward-char 1)
(delete-region (point)
(save-excursion
(forward-char 1)
(forward-line (length hits))
(point))))
(toggle-read-only 1)
)
))
)
(delete-char 1)
(insert "+")
(save-excursion
(end-of-line)
(forward-char 1)
(delete-region (point)
(save-excursion
(forward-char 1)
(forward-line (length hits))
(point)))))))))
(defun semantic-symref-rb-goto-file (&optional button)
"Go to the file specified in the symref results buffer.
@ -554,5 +535,4 @@ Return the number of occurrences FUNCTION was operated upon."
;; generated-autoload-load-name: "semantic/symref/list"
;; End:
;; arch-tag: e355d9c6-26e0-42d1-9bf1-f4801a54fffa
;;; semantic/symref/list.el ends here

4
lisp/comint.el
View file

@ -340,13 +340,14 @@ This variable is buffer-local."
;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
;; Something called "perforce" uses "Enter password:".
(defcustom comint-password-prompt-regexp
"\\(\\(Enter \\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
"\\(\\([Ee]nter \\(?:same \\|the \\)?\\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\
\[Pp]assword\\( (again)\\)?\\|\
pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\
\\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'"
"Regexp matching prompts for passwords in the inferior process.
This is used by `comint-watch-for-password-prompt'."
:version "23.3"
:type 'regexp
:group 'comint)
@ -2640,6 +2641,7 @@ updated using `comint-update-fence', if necessary."
(let ((inhibit-read-only t))
(kill-region beg end yank-handler)
(comint-update-fence))))))
(set-advertised-calling-convention 'comint-kill-region '(beg end) "23.3")
;; Support for source-file processing commands.

4
lisp/diff-mode.el
View file

@ -97,6 +97,9 @@ when editing big diffs)."
:options '(diff-delete-empty-files diff-make-unified)
:group 'diff-mode)
(defvar diff-vc-backend nil
"The VC backend that created the current Diff buffer, if any.")
(defvar diff-outline-regexp
"\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")
@ -138,6 +141,7 @@ when editing big diffs)."
;; Standard M-r is useful, so don't change M-r or M-R.
;;("r" . diff-restrict-view)
;;("R" . diff-reverse-direction)
("g" . revert-buffer)
("q" . quit-window))
"Basic keymap for `diff-mode', bound to various prefix keys.")

10
lisp/emacs-lisp/autoload.el
View file

@ -1,7 +1,8 @@
;; autoload.el --- maintain autoloads in loaddefs.el
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002,
;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
;; Free Software Foundation, Inc.
;; Author: Roland McGrath <roland@gnu.org>
;; Keywords: maint
@ -525,8 +526,8 @@ removes any prior now out-of-date autoload entries."
(autoload-ensure-default-file (autoload-generated-file)))
;; This is to make generated-autoload-file have Unix EOLs, so
;; that it is portable to all platforms.
(unless (zerop (coding-system-eol-type buffer-file-coding-system))
(set-buffer-file-coding-system 'unix))
(or (eq 0 (coding-system-eol-type buffer-file-coding-system))
(set-buffer-file-coding-system 'unix))
(or (> (buffer-size) 0)
(error "Autoloads file %s does not exist" buffer-file-name))
(or (file-writable-p buffer-file-name)
@ -735,5 +736,4 @@ Calls `update-directory-autoloads' on the command line arguments."
(provide 'autoload)
;; arch-tag: 00244766-98f4-4767-bf42-8a22103441c6
;;; autoload.el ends here

17
lisp/emacs-lisp/bytecomp.el
View file

@ -294,21 +294,12 @@ suppress. For example, (not mapcar) will suppress warnings about mapcar."
(set :menu-tag "Some"
,@(mapcar (lambda (x) `(const ,x))
byte-compile-warning-types))))
;;;###autoload(put 'byte-compile-warnings 'safe-local-variable 'byte-compile-warnings-safe-p)
;;;###autoload
(defun byte-compile-warnings-safe-p (x)
"Return non-nil if X is valid as a value of `byte-compile-warnings'."
(or (booleanp x)
(and (listp x)
(if (eq (car x) 'not) (setq x (cdr x))
t)
(equal (mapcar
(lambda (e)
(when (memq e byte-compile-warning-types)
e))
x)
x))))
(put 'byte-compile-warnings 'safe-local-variable
(lambda (v)
(or (symbolp v)
(null (delq nil (mapcar (lambda (x) (not (symbolp x))) v))))))
(defun byte-compile-warning-enabled-p (warning)
"Return non-nil if WARNING is enabled, according to `byte-compile-warnings'."

1546
lisp/emacs-lisp/smie.el Normal file
View file

File diff suppressed because it is too large Load diff

7
lisp/erc/ChangeLog
View file

@ -1,3 +1,10 @@
2010-10-23 Julien Danjou <julien@danjou.info>
* erc-backend.el (erc-server-JOIN): Set the correct target list on join.
* erc-backend.el (erc-process-sentinel): Check that buffer is alive
before setting it as current buffer.
2010-10-12 Juanma Barranquero <lekktu@gmail.com>
* erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring.

51
lisp/erc/erc-backend.el
View file

@ -652,30 +652,31 @@ Conditionally try to reconnect and take appropriate action."
(defun erc-process-sentinel (cproc event)
"Sentinel function for ERC process."
(with-current-buffer (process-buffer cproc)
(erc-log (format
"SENTINEL: proc: %S status: %S event: %S (quitting: %S)"
cproc (process-status cproc) event erc-server-quitting))
(if (string-match "^open" event)
;; newly opened connection (no wait)
(erc-login)
;; assume event is 'failed
(let ((buf (process-buffer cproc)))
(erc-with-all-buffers-of-server cproc nil
(setq erc-server-connected nil))
(when erc-server-ping-handler
(progn (erc-cancel-timer erc-server-ping-handler)
(setq erc-server-ping-handler nil)))
(run-hook-with-args 'erc-disconnected-hook
(erc-current-nick) (system-name) "")
;; Remove the prompt
(goto-char (or (marker-position erc-input-marker) (point-max)))
(forward-line 0)
(erc-remove-text-properties-region (point) (point-max))
(delete-region (point) (point-max))
;; Decide what to do with the buffer
;; Restart if disconnected
(erc-process-sentinel-1 event buf)))))
(let ((buf (process-buffer cproc)))
(when (buffer-live-p buf)
(with-current-buffer buf
(erc-log (format
"SENTINEL: proc: %S status: %S event: %S (quitting: %S)"
cproc (process-status cproc) event erc-server-quitting))
(if (string-match "^open" event)
;; newly opened connection (no wait)
(erc-login)
;; assume event is 'failed
(erc-with-all-buffers-of-server cproc nil
(setq erc-server-connected nil))
(when erc-server-ping-handler
(progn (erc-cancel-timer erc-server-ping-handler)
(setq erc-server-ping-handler nil)))
(run-hook-with-args 'erc-disconnected-hook
(erc-current-nick) (system-name) "")
;; Remove the prompt
(goto-char (or (marker-position erc-input-marker) (point-max)))
(forward-line 0)
(erc-remove-text-properties-region (point) (point-max))
(delete-region (point) (point-max))
;; Decide what to do with the buffer
;; Restart if disconnected
(erc-process-sentinel-1 event buf))))))
;;;; Sending messages
@ -1194,7 +1195,7 @@ add things to `%s' instead."
(setq buffer (erc-open erc-session-server erc-session-port
nick erc-session-user-full-name
nil nil
erc-default-recipients chnl
(list chnl) chnl
erc-server-process))
(when buffer
(set-buffer buffer)

6
lisp/files.el
View file

@ -123,6 +123,7 @@ the default for a new file created there by you.
This variable is relevant only if `backup-by-copying' is nil."
:type 'boolean
:group 'backup)
(put 'backup-by-copying-when-mismatch 'permanent-local t)
(defcustom backup-by-copying-when-privileged-mismatch 200
"Non-nil means create backups by copying to preserve a privileged owner.
@ -3133,7 +3134,10 @@ It is safe if any of these conditions are met:
evaluates to a non-nil value with VAL as an argument."
(or (member (cons sym val) safe-local-variable-values)
(let ((safep (get sym 'safe-local-variable)))
(and (functionp safep) (funcall safep val)))))
(and (functionp safep)
;; If the function signals an error, that means it
;; can't assure us that the value is safe.
(with-demoted-errors (funcall safep val))))))
(defun risky-local-variable-p (sym &optional ignored)
"Non-nil if SYM could be dangerous as a file-local variable.

5
lisp/gnus/ChangeLog
View file

@ -1,3 +1,8 @@
2010-11-19 Yuri Karaban <tech@askold.net> (tiny change)
* pop3.el (pop3-open-server): Read server greeting before starting TLS
negotiation.
2010-10-12 Juanma Barranquero <lekktu@gmail.com>
* nnmail.el (nnmail-fancy-expiry-targets): Fix typo in docstring.

3
lisp/gnus/ChangeLog.2
View file

@ -3828,8 +3828,7 @@
that Gnus will render it as html if the user wants that.
Implemented the ability to save nnrss-group-alist so that any new
feeds the you subscribe to will be found the next time you start
up.
feeds you subscribe to will be found the next time you start up.
Implemented support for RSS 2.0 elements (author, pubDate).

21
lisp/gnus/pop3.el
View file

@ -259,21 +259,22 @@ Returns the process associated with the connection."
;; gnutls-cli, openssl don't accept service names
(if (equal port "pop3")
(setq port 110))
(let ((process (starttls-open-stream "POP" (current-buffer)
mailhost (or port 110))))
(pop3-send-command process "STLS")
(let ((response (pop3-read-response process t)))
(if (and response (string-match "+OK" response))
(starttls-negotiate process)
(pop3-quit process)
(error "POP server doesn't support starttls")))
process))
(t
;; Delay STLS until server greeting is read (Bug#7438).
(starttls-open-stream "POP" (current-buffer)
mailhost (or port 110)))
(t
(open-network-stream "POP" (current-buffer) mailhost port))))
(let ((response (pop3-read-response process t)))
(setq pop3-timestamp
(substring response (or (string-match "<" response) 0)
(+ 1 (or (string-match ">" response) -1)))))
(when (eq pop3-stream-type 'starttls)
(pop3-send-command process "STLS")
(let ((response (pop3-read-response process t)))
(if (and response (string-match "+OK" response))
(starttls-negotiate process)
(pop3-quit process)
(error "POP server doesn't support starttls"))))
process)))
;; Support functions

3
lisp/international/mule-cmds.el
View file

@ -2034,10 +2034,11 @@ See `set-language-info-alist' for use in programs."
"Do various unibyte-mode setups for language environment LANGUAGE-NAME."
(set-display-table-and-terminal-coding-system language-name))
(defsubst princ-list (&rest args)
(defun princ-list (&rest args)
"Print all arguments with `princ', then print \"\\n\"."
(while args (princ (car args)) (setq args (cdr args)))
(princ "\n"))
(make-obsolete 'princ-list "use mapc and princ instead" "23.3")
(put 'describe-specified-language-support 'apropos-inhibit t)

1679
lisp/ldefs-boot.el
View file

File diff suppressed because it is too large Load diff

17
lisp/locate.el
View file

@ -270,7 +270,7 @@ that is, with a prefix arg, you get the default behavior."
(defun locate (search-string &optional filter arg)
"Run the program `locate', putting results in `*Locate*' buffer.
Pass it SEARCH-STRING as argument. Interactively, prompt for SEARCH-STRING.
With prefix arg, prompt for the exact shell command to run instead.
With prefix arg ARG, prompt for the exact shell command to run instead.
This program searches for those file names in a database that match
SEARCH-STRING and normally outputs all matching absolute file names,
@ -286,7 +286,8 @@ the variables `locate-command' or `locate-make-command-line'.
The main use of FILTER is to implement `locate-with-filter'. See
the docstring of that function for its meaning.
ARG is the interactive prefix arg."
After preparing the results buffer, this runs `dired-mode-hook' and
then `locate-post-command-hook'."
(interactive
(list
(locate-prompt-for-search-string)
@ -300,8 +301,7 @@ ARG is the interactive prefix arg."
(locate-cmd-args (cdr locate-cmd-list))
(run-locate-command
(or (and arg (not locate-prompt-for-command))
(and (not arg) locate-prompt-for-command)))
)
(and (not arg) locate-prompt-for-command))))
;; Find the Locate buffer
(save-window-excursion
@ -323,16 +323,13 @@ ARG is the interactive prefix arg."
(and filter
(locate-filter-output filter))
(locate-do-setup search-string)
))
(locate-do-setup search-string)))
(and (not (string-equal (buffer-name) locate-buffer-name))
(switch-to-buffer-other-window locate-buffer-name))
(run-hooks 'dired-mode-hook)
(dired-next-line 3) ;move to first matching file.
(run-hooks 'locate-post-command-hook)
)
)
(run-hooks 'locate-post-command-hook)))
;;;###autoload
(defun locate-with-filter (search-string filter &optional arg)
@ -447,6 +444,7 @@ file name or is inside a subdirectory."
\\<locate-mode-map>\
In that buffer, you can use almost all the usual dired bindings.
\\[locate-find-directory] visits the directory of the file on the current line.
This function runs `locate-mode-hook' before returning.
Operating on listed files works, but does not always
automatically update the buffer as in ordinary Dired.
@ -687,5 +685,4 @@ the database on the command line."
(provide 'locate)
;; arch-tag: 60c4d098-b5d5-4b3c-a3e0-51a2e9f43898
;;; locate.el ends here

259
lisp/log-edit.el
View file

@ -125,6 +125,7 @@ If SETUP is 'force, this variable has no effect."
:type 'boolean)
(defcustom log-edit-hook '(log-edit-insert-cvs-template
log-edit-show-files
log-edit-insert-changelog)
"Hook run at the end of `log-edit'."
:group 'log-edit
@ -188,6 +189,7 @@ when this variable is set to nil.")
(defvar log-edit-callback nil)
(defvar log-edit-diff-function nil)
(defvar log-edit-listfun nil)
(defvar log-edit-parent-buffer nil)
;;; Originally taken from VC-Log mode
@ -312,15 +314,59 @@ automatically."
;;; Actual code
;;;
(defface log-edit-summary '((t :inherit font-lock-function-name-face))
"Face for the summary in `log-edit-mode' buffers.")
(defface log-edit-header '((t :inherit font-lock-keyword-face))
"Face for the headers in `log-edit-mode' buffers.")
(defface log-edit-unknown-header '((t :inherit font-lock-comment-face))
"Face for unknown headers in `log-edit-mode' buffers.")
(defvar log-edit-headers-alist '(("Summary" . log-edit-summary)
("Fixes") ("Author"))
"AList of known headers and the face to use to highlight them.")
(defconst log-edit-header-contents-regexp
"[ \t]*\\(.*\\(\n[ \t].*\\)*\\)\n?")
(defun log-edit-match-to-eoh (limit)
;; FIXME: copied from message-match-to-eoh.
(let ((start (point)))
(rfc822-goto-eoh)
;; Typical situation: some temporary change causes the header to be
;; incorrect, so EOH comes earlier than intended: the last lines of the
;; intended headers are now not considered part of the header any more,
;; so they don't have the multiline property set. When the change is
;; completed and the header has its correct shape again, the lack of the
;; multiline property means we won't rehighlight the last lines of
;; the header.
(if (< (point) start)
nil ;No header within start..limit.
;; Here we disregard LIMIT so that we may extend the area again.
(set-match-data (list start (point)))
(point))))
(defvar log-edit-font-lock-keywords
'(("\\`\\(Summary:\\)\\(.*\\)"
(1 font-lock-keyword-face)
(2 font-lock-function-name-face))))
;; Copied/inspired by message-font-lock-keywords.
`((log-edit-match-to-eoh
(,(concat "^\\(\\([a-z]+\\):\\)" log-edit-header-contents-regexp
"\\|\\(.*\\)")
(progn (goto-char (match-beginning 0)) (match-end 0)) nil
(1 (if (assoc (match-string 2) log-edit-headers-alist)
'log-edit-header
'log-edit-unknown-header)
nil lax)
(3 (or (cdr (assoc (match-string 2) log-edit-headers-alist))
'log-edit-header)
nil lax)
(4 font-lock-warning-face)))))
;;;###autoload
(defun log-edit (callback &optional setup params buffer &rest ignore)
(defun log-edit (callback &optional setup params buffer mode &rest ignore)
"Setup a buffer to enter a log message.
\\<log-edit-mode-map>The buffer will be put in `log-edit-mode'.
\\<log-edit-mode-map>The buffer will be put in mode MODE or `log-edit-mode'
if MODE is nil.
If SETUP is non-nil, the buffer is then erased and `log-edit-hook' is run.
Mark and point will be set around the entire contents of the buffer so
that it is easy to kill the contents of the buffer with \\[kill-region].
@ -340,8 +386,13 @@ uses the current buffer."
(if buffer (pop-to-buffer buffer))
(when (and log-edit-setup-invert (not (eq setup 'force)))
(setq setup (not setup)))
(when setup (erase-buffer))
(log-edit-mode)
(when setup
(erase-buffer)
(insert "Summary: ")
(save-excursion (insert "\n\n")))
(if mode
(funcall mode)
(log-edit-mode))
(set (make-local-variable 'log-edit-callback) callback)
(if (listp params)
(dolist (crt params)
@ -367,7 +418,7 @@ commands (under C-x v for VC, for example).
\\{log-edit-mode-map}"
(set (make-local-variable 'font-lock-defaults)
'(log-edit-font-lock-keywords t))
'(log-edit-font-lock-keywords t t))
(make-local-variable 'log-edit-comment-ring-index))
(defun log-edit-hide-buf (&optional buf where)
@ -380,6 +431,17 @@ commands (under C-x v for VC, for example).
"Finish editing the log message and commit the files.
If you want to abort the commit, simply delete the buffer."
(interactive)
;; Clean up empty headers.
(goto-char (point-min))
(while (looking-at (concat "^[a-z]*:" log-edit-header-contents-regexp))
(let ((beg (match-beginning 0)))
(goto-char (match-end 0))
(if (string-match "\\`[ \n\t]*\\'" (match-string 1))
(delete-region beg (point)))))
;; Get rid of leading empty lines.
(goto-char (point-min))
(when (looking-at "\\([ \t]*\n\\)+")
(delete-region (match-beginning 0) (match-end 0)))
;; Get rid of trailing empty lines
(goto-char (point-max))
(skip-syntax-backward " ")
@ -437,12 +499,13 @@ If you want to abort the commit, simply delete the buffer."
"(Un)Indent the current buffer rigidly to `log-edit-common-indent'."
(save-excursion
(let ((common (point-max)))
(goto-char (point-min))
(rfc822-goto-eoh)
(while (< (point) (point-max))
(if (not (looking-at "^[ \t]*$"))
(setq common (min common (current-indentation))))
(forward-line 1))
(indent-rigidly (point-min) (point-max)
(rfc822-goto-eoh)
(indent-rigidly (point) (point-max)
(- log-edit-common-indent common)))))
(defun log-edit-show-diff ()
@ -508,6 +571,16 @@ can thus take some time."
(log-edit-comment-to-change-log)))))
(defvar log-edit-changelog-use-first nil)
(defvar log-edit-rewrite-fixes nil
"Rule to rewrite bug numbers into Fixes: headers.
The value should be of the form (REGEXP . REPLACEMENT)
where REGEXP should match the expression referring to a bug number
in the text, and REPLACEMENT is an expression to pass to `replace-match'
to build the Fixes: header.")
(put 'log-edit-rewrite-fixes 'safe-local-variable
(lambda (v) (and (stringp (car-safe v)) (stringp (cdr v)))))
(defun log-edit-insert-changelog (&optional use-first)
"Insert a log message by looking at the ChangeLog.
The idea is to write your ChangeLog entries first, and then use this
@ -525,18 +598,38 @@ If the optional prefix arg USE-FIRST is given (via \\[universal-argument]),
or if the command is repeated a second time in a row, use the first log entry
regardless of user name or time."
(interactive "P")
(let ((log-edit-changelog-use-first
(or use-first (eq last-command 'log-edit-insert-changelog))))
(log-edit-insert-changelog-entries (log-edit-files)))
(log-edit-set-common-indentation)
(goto-char (point-min))
(when (and log-edit-strip-single-file-name (looking-at "\\*\\s-+"))
(forward-line 1)
(when (not (re-search-forward "^\\*\\s-+" nil t))
(goto-char (point-min))
(skip-chars-forward "^():")
(skip-chars-forward ": ")
(delete-region (point-min) (point)))))
(let ((eoh (save-excursion (rfc822-goto-eoh) (point))))
(when (<= (point) eoh)
(goto-char eoh)
(if (looking-at "\n") (forward-char 1))))
(let ((author
(let ((log-edit-changelog-use-first
(or use-first (eq last-command 'log-edit-insert-changelog))))
(log-edit-insert-changelog-entries (log-edit-files)))))
(log-edit-set-common-indentation)
;; Add an Author: field if appropriate.
(when author
(rfc822-goto-eoh)
(insert "Author: " author "\n" (if (looking-at "\n") "" "\n")))
;; Add a Fixes: field if applicable.
(when (consp log-edit-rewrite-fixes)
(rfc822-goto-eoh)
(when (re-search-forward (car log-edit-rewrite-fixes) nil t)
(let ((start (match-beginning 0))
(end (match-end 0))
(fixes (match-substitute-replacement
(cdr log-edit-rewrite-fixes))))
(delete-region start end)
(rfc822-goto-eoh)
(insert "Fixes: " fixes "\n" (if (looking-at "\n") "" "\n")))))
(goto-char (point-min))
(when (and log-edit-strip-single-file-name (looking-at "\\*\\s-+"))
(forward-line 1)
(when (not (re-search-forward "^\\*\\s-+" nil t))
(goto-char (point-min))
(skip-chars-forward "^():")
(skip-chars-forward ": ")
(delete-region (point-min) (point))))))
;;;;
;;;; functions for getting commit message from ChangeLog a file...
@ -602,6 +695,9 @@ for more details."
(defvar user-full-name)
(defvar user-mail-address)
(defvar log-edit-author) ;Dynamically scoped.
(defun log-edit-changelog-ours-p ()
"See if ChangeLog entry at point is for the current user, today.
Return non-nil if it is."
@ -616,14 +712,28 @@ Return non-nil if it is."
(functionp add-log-time-format)
(funcall add-log-time-format))
(format-time-string "%Y-%m-%d"))))
(looking-at (if log-edit-changelog-use-first
"[^ \t]"
(regexp-quote (format "%s %s <%s>" time name mail))))))
(if (null log-edit-changelog-use-first)
(looking-at (regexp-quote (format "%s %s <%s>" time name mail)))
;; Check the author, to potentially add it as a "Author: " header.
(when (looking-at "[^ \t]")
(when (and (boundp 'log-edit-author)
(not (looking-at (format ".+ .+ <%s>"
(regexp-quote mail))))
(looking-at ".+ \\(.+ <.+>\\)"))
(let ((author (replace-regexp-in-string " " " "
(match-string 1))))
(unless (and log-edit-author
(string-match (regexp-quote author) log-edit-author))
(setq log-edit-author
(if log-edit-author
(concat log-edit-author ", " author)
author)))))
t))))
(defun log-edit-changelog-entries (file)
"Return the ChangeLog entries for FILE, and the ChangeLog they came from.
The return value looks like this:
(LOGBUFFER (ENTRYSTART . ENTRYEND) ...)
(LOGBUFFER (ENTRYSTART ENTRYEND) ...)
where LOGBUFFER is the name of the ChangeLog buffer, and each
\(ENTRYSTART . ENTRYEND\) pair is a buffer region."
(let ((changelog-file-name
@ -681,34 +791,87 @@ where LOGBUFFER is the name of the ChangeLog buffer, and each
(cons (current-buffer) texts))))))))
(defun log-edit-changelog-insert-entries (buffer regions)
"Insert those regions in BUFFER specified in REGIONS.
Sort REGIONS front-to-back first."
(let ((regions (sort regions 'car-less-than-car))
(last))
(dolist (region regions)
(when (and last (< last (car region))) (newline))
(setq last (elt region 1))
(apply 'insert-buffer-substring buffer region))))
(defun log-edit-changelog-insert-entries (buffer beg end &rest files)
"Insert the text from BUFFER between BEG and END.
Rename relative filenames in the ChangeLog entry as FILES."
(let ((opoint (point))
(log-name (buffer-file-name buffer))
(case-fold-search nil)
bound)
(insert-buffer-substring buffer beg end)
(setq bound (point-marker))
(when log-name
(dolist (f files)
(save-excursion
(goto-char opoint)
(when (re-search-forward
(concat "\\(^\\|[ \t]\\)\\("
(file-relative-name f (file-name-directory log-name))
"\\)[, :\n]")
bound t)
(replace-match f t t nil 2)))))
;; Eliminate tabs at the beginning of the line.
(save-excursion
(goto-char opoint)
(while (re-search-forward "^\\(\t+\\)" bound t)
(replace-match "")))))
(defun log-edit-insert-changelog-entries (files)
"Given a list of files FILES, insert the ChangeLog entries for them."
(let ((buffer-entries nil))
;; Add each buffer to buffer-entries, and associate it with the list
;; of entries we want from that file.
(let ((log-entries nil)
(log-edit-author nil))
;; Note that any ChangeLog entry can apply to more than one file.
;; Here we construct a log-entries list with elements of the form
;; ((LOGBUFFER ENTRYSTART ENTRYEND) FILE1 FILE2...)
(dolist (file files)
(let* ((entries (log-edit-changelog-entries file))
(pair (assq (car entries) buffer-entries)))
(if pair
(setcdr pair (cvs-union (cdr pair) (cdr entries)))
(push entries buffer-entries))))
(buf (car entries))
key entry)
(dolist (region (cdr entries))
(setq key (cons buf region))
(if (setq entry (assoc key log-entries))
(setcdr entry (append (cdr entry) (list file)))
(push (list key file) log-entries)))))
;; Now map over log-entries, and extract the strings.
(dolist (log-entry (nreverse log-entries))
(apply 'log-edit-changelog-insert-entries
(append (car log-entry) (cdr log-entry)))
(insert "\n"))
log-edit-author))
;; Now map over each buffer in buffer-entries, sort the entries for
;; each buffer, and extract them as strings.
(dolist (buffer-entry buffer-entries)
(log-edit-changelog-insert-entries (car buffer-entry) (cdr buffer-entry))
(when (cdr buffer-entry) (newline)))))
(defun log-edit-extract-headers (headers comment)
"Extract headers from COMMENT to form command line arguments.
HEADERS should be an alist with elements of the form (HEADER . CMDARG)
associating header names to the corresponding cmdline option name and the
result is then a list of the form (MSG CMDARG1 HDRTEXT1 CMDARG2 HDRTEXT2...).
where MSG is the remaining text from STRING.
If \"Summary\" is not in HEADERS, then the \"Summary\" header is extracted
anyway and put back as the first line of MSG."
(with-temp-buffer
(insert comment)
(rfc822-goto-eoh)
(narrow-to-region (point-min) (point))
(let ((case-fold-search t)
(summary ())
(res ()))
(dolist (header (if (assoc "Summary" headers) headers
(cons '("Summary" . t) headers)))
(goto-char (point-min))
(while (re-search-forward (concat "^" (car header)
":" log-edit-header-contents-regexp)
nil t)
(if (eq t (cdr header))
(setq summary (match-string 1))
(push (match-string 1) res)
(push (or (cdr header) (car header)) res))
(replace-match "" t t)))
;; Remove header separator if the header is empty.
(widen)
(goto-char (point-min))
(when (looking-at "\\([ \t]*\n\\)+")
(delete-region (match-beginning 0) (match-end 0)))
(if summary (insert summary "\n"))
(cons (buffer-string) res))))
(provide 'log-edit)

1
lisp/log-view.el
View file

@ -128,6 +128,7 @@
(easy-mmode-defmap log-view-mode-map
'(("z" . kill-this-buffer)
("q" . quit-window)
("g" . revert-buffer)
("m" . log-view-toggle-mark-entry)
("e" . log-view-modify-change-comment)
("d" . log-view-diff)

18
lisp/lpr.el
View file

@ -152,7 +152,9 @@ The variable `lpr-page-header-program' specifies the program to use."
"Print buffer contents without pagination or page headers.
See the variables `lpr-switches' and `lpr-command'
for customization of the printer command."
(interactive)
(interactive
(unless (y-or-n-p "Send current buffer to default printer? ")
(error "Cancelled")))
(print-region-1 (point-min) (point-max) lpr-switches nil))
;;;###autoload
@ -169,7 +171,9 @@ in the print command itself; we expect them to request pagination.
See the variables `lpr-switches' and `lpr-command'
for further customization of the printer command."
(interactive)
(interactive
(unless (y-or-n-p "Send current buffer to default printer? ")
(error "Cancelled")))
(print-region-1 (point-min) (point-max) lpr-switches t))
;;;###autoload
@ -177,7 +181,10 @@ for further customization of the printer command."
"Print region contents without pagination or page headers.
See the variables `lpr-switches' and `lpr-command'
for customization of the printer command."
(interactive "r")
(interactive
(if (y-or-n-p "Send selected text to default printer? ")
(list (region-beginning) (region-end))
(error "Cancelled")))
(print-region-1 start end lpr-switches nil))
;;;###autoload
@ -194,7 +201,10 @@ in the print command itself; we expect them to request pagination.
See the variables `lpr-switches' and `lpr-command'
for further customization of the printer command."
(interactive "r")
(interactive
(if (y-or-n-p "Send selected text to default printer? ")
(list (region-beginning) (region-end))
(error "Cancelled")))
(print-region-1 start end lpr-switches t))
(defun print-region-1 (start end switches page-headers)

76
lisp/ls-lisp.el
View file

@ -86,10 +86,16 @@ option will have no effect until you restart Emacs."
(const UNIX))
:group 'ls-lisp)
;; Only made an obsolete alias in 23.3. Before that, the initial
;; value was set according to:
;; (or (memq ls-lisp-emulation '(MS-Windows MacOS))
;; (and (boundp 'ls-lisp-dired-ignore-case) ls-lisp-dired-ignore-case))
;; Which isn't the right thing to do.
(define-obsolete-variable-alias 'ls-lisp-dired-ignore-case
'ls-lisp-ignore-case "21.1")
(defcustom ls-lisp-ignore-case
;; Name change for consistency with other option names.
(or (memq ls-lisp-emulation '(MS-Windows MacOS))
(and (boundp 'ls-lisp-dired-ignore-case) ls-lisp-dired-ignore-case))
(memq ls-lisp-emulation '(MS-Windows MacOS))
"Non-nil causes ls-lisp alphabetic sorting to ignore case."
:type 'boolean
:group 'ls-lisp)
@ -219,7 +225,8 @@ The Lisp emulation does not run any external programs or shells. It
supports ordinary shell wildcards if `ls-lisp-support-shell-wildcards'
is non-nil; otherwise, it interprets wildcards as regular expressions
to match file names. It does not support all `ls' switches -- those
that work are: A a c i r S s t u U X g G B C R n and F partly."
that work are: A a B C c F G g h i n R r S s t U u X. The l switch
is assumed to be always present and cannot be turned off."
(if ls-lisp-use-insert-directory-program
(funcall original-insert-directory
file switches wildcard full-directory-p)
@ -235,7 +242,7 @@ that work are: A a c i r S s t u U X g G B C R n and F partly."
(if (string-match "--dired " switches)
(setq switches (replace-match "" nil nil switches)))
;; Convert SWITCHES to a list of characters.
(setq switches (delete ?- (append switches nil)))
(setq switches (delete ?\ (delete ?- (append switches nil))))
;; Sometimes we get ".../foo*/" as FILE. While the shell and
;; `ls' don't mind, we certainly do, because it makes us think
;; there is no wildcard, only a directory name.
@ -405,7 +412,11 @@ not contain `d', so that a full listing is expected."
(setq file (substring file 0 -1)))
(let ((fattr (file-attributes file 'string)))
(if fattr
(insert (ls-lisp-format file fattr (nth 7 fattr)
(insert (ls-lisp-format
(if (memq ?F switches)
(ls-lisp-classify-file file fattr)
file)
fattr (nth 7 fattr)
switches time-index (current-time)))
(message "%s: doesn't exist or is inaccessible" file)
(ding) (sit-for 2))))) ; to show user the message!
@ -522,29 +533,40 @@ SWITCHES is a list of characters. Default sorting is alphabetic."
(nreverse file-alist)
file-alist))
(defun ls-lisp-classify (filedata)
"Append a character to each file name indicating the file type.
Also, for regular files that are executable, append `*'.
(defun ls-lisp-classify-file (filename fattr)
"Append a character to FILENAME indicating the file type.
FATTR is the file attributes returned by `file-attributes' for the file.
The file type indicators are `/' for directories, `@' for symbolic
links, `|' for FIFOs, `=' for sockets, and nothing for regular files.
\[But FIFOs and sockets are not recognized.]
FILEDATA has the form (filename . `file-attributes'). Its `cadr' is t
for directory, string (name linked to) for symbolic link, or nil."
links, `|' for FIFOs, `=' for sockets, `*' for regular files that
are executable, and nothing for other types of files."
(let* ((type (car fattr))
(modestr (nth 8 fattr))
(typestr (substring modestr 0 1)))
(cond
(type
(concat filename (if (eq type t) "/" "@")))
((string-match "x" modestr)
(concat filename "*"))
((string= "p" typestr)
(concat filename "|"))
((string= "s" typestr)
(concat filename "="))
(t filename))))
(defun ls-lisp-classify (filedata)
"Append a character to file name in FILEDATA indicating the file type.
FILEDATA has the form (FILENAME . ATTRIBUTES), where ATTRIBUTES is the
structure returned by `file-attributes' for that file.
The file type indicators are `/' for directories, `@' for symbolic
links, `|' for FIFOs, `=' for sockets, `*' for regular files that
are executable, and nothing for other types of files."
(let ((file-name (car filedata))
(type (cadr filedata)))
(cond (type
(cons
(concat (propertize file-name 'dired-filename t)
(if (eq type t) "/" "@"))
(cdr filedata)))
((string-match "x" (nth 9 filedata))
(cons
(concat (propertize file-name 'dired-filename t) "*")
(cdr filedata)))
(t
(cons
(propertize file-name 'dired-filename t)
(cdr filedata))))))
(fattr (cdr filedata)))
(setq file-name (propertize file-name 'dired-filename t))
(cons (ls-lisp-classify-file file-name fattr) fattr)))
(defun ls-lisp-extension (filename)
"Return extension of FILENAME (ignoring any version extension)

5
lisp/menu-bar.el
View file

@ -55,8 +55,8 @@
(defvar menu-bar-file-menu (make-sparse-keymap "File"))
(define-key global-map [menu-bar file] (cons (purecopy "File") menu-bar-file-menu))
;; This alias is for compatibility with 19.28 and before.
(defvar menu-bar-files-menu menu-bar-file-menu)
;; Only declared obsolete (and only made a proper alias) in 23.3.
(define-obsolete-variable-alias 'menu-bar-files-menu 'menu-bar-file-menu "22.1")
;; This is referenced by some code below; it is defined in uniquify.el
(defvar uniquify-buffer-name-style)
@ -1997,5 +1997,4 @@ If FRAME is nil or not given, use the selected frame."
(provide 'menu-bar)
;; arch-tag: 6e6a3c22-4ec4-4d3d-8190-583f8ef94ced
;;; menu-bar.el ends here

13
lisp/minibuffer.el
View file

@ -41,7 +41,7 @@
;; provide the start info but not the end info in
;; completion-base-position.
;; - quoting is problematic. E.g. the double-dollar quoting used in
;; substitie-in-file-name (and hence read-file-name-internal) bumps
;; substitute-in-file-name (and hence read-file-name-internal) bumps
;; into various bugs:
;; - choose-completion doesn't know how to quote the text it inserts.
;; E.g. it fails to double the dollars in file-name completion, or
@ -1075,6 +1075,7 @@ variables.")
(interactive)
(message "Making completion list...")
(lexical-let* ((start (field-beginning))
(end (field-end))
(string (field-string))
(completions (completion-all-completions
string
@ -1106,10 +1107,12 @@ variables.")
completions)))
(with-current-buffer standard-output
(set (make-local-variable 'completion-base-position)
;; FIXME: We should provide the END part as well, but
;; currently completion-all-completions does not give
;; us the necessary information.
(list (+ start base-size) nil)))
(list (+ start base-size)
;; FIXME: We should pay attention to completion
;; boundaries here, but currently
;; completion-all-completions does not give us the
;; necessary information.
end)))
(display-completion-list completions)))
;; If there are no completions, or if the current input is already the

7
lisp/mouse-sel.el
View file

@ -1,7 +1,7 @@
;;; mouse-sel.el --- multi-click selection support for Emacs 19
;;; mouse-sel.el --- multi-click selection support
;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006,
;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Mike Williams <mdub@bigfoot.com>
;; Keywords: mouse
@ -755,5 +755,4 @@ If `mouse-yank-at-point' is non-nil, insert at point instead."
(provide 'mouse-sel)
;; arch-tag: 86e6c73f-deaa-48d3-a24e-c565fda1f7d7
;;; mouse-sel.el ends here

3
lisp/mouse.el
View file

@ -886,8 +886,7 @@ at the same position."
(let (mp pos)
(if (and mouse-1-click-follows-link
(stringp msg)
(save-match-data
(string-match "^mouse-2" msg))
(string-match-p "\\`mouse-2" msg)
(setq mp (mouse-pixel-position))
(consp (setq pos (cdr mp)))
(car pos) (>= (car pos) 0)

2
lisp/net/tramp-fish.el
View file

@ -37,7 +37,7 @@
;; "xxx" stands for 3 digits, representing a return code. Return
;; codes "# 000" and "# 001" are reserved for fallback implementation
;; with native shell commands; they are not used inside the server. See
;; <http://cvs.savannah.gnu.org/viewcvs/mc/vfs/README.fish?root=mc&view=markup>
;; <http://cvs.savannah.gnu.org/viewvc/mc/vfs/README.fish?root=mc&view=markup>
;; for details of original specification.
;; The GNU Midnight Commander implements the original fish protocol

114
lisp/net/tramp.el
View file

@ -814,9 +814,9 @@ empty string for the user name.
See `tramp-methods' for a list of possibilities for METHOD."
:group 'tramp
:type '(repeat (list (regexp :tag "Host regexp")
(regexp :tag "User regexp")
(string :tag "Method"))))
:type '(repeat (list (choice :tag "Host regexp" regexp sexp)
(choice :tag "User regexp" regexp sexp)
(choice :tag "Method name" string (const nil)))))
(defcustom tramp-default-user
nil
@ -842,9 +842,9 @@ matches, the variable `tramp-default-user' takes effect.
If the file name does not specify the method, lookup is done using the
empty string for the method name."
:group 'tramp
:type '(repeat (list (regexp :tag "Method regexp")
(regexp :tag "Host regexp")
(string :tag "User"))))
:type '(repeat (list (choice :tag "Method regexp" regexp sexp)
(choice :tag " Host regexp" regexp sexp)
(choice :tag " User name" string (const nil)))))
(defcustom tramp-default-host
(system-name)
@ -870,7 +870,7 @@ interpreted as a regular expression which always matches."
:group 'tramp
:type '(repeat (list (choice :tag "Host regexp" regexp sexp)
(choice :tag "User regexp" regexp sexp)
(choice :tag "Proxy remote name" string (const nil)))))
(choice :tag " Proxy name" string (const nil)))))
(defconst tramp-local-host-regexp
(concat
@ -5008,7 +5008,10 @@ coding system might not be determined. This function repairs it."
(setq buffer-file-name filename)
(setq buffer-read-only (not (file-writable-p filename)))
(set-visited-file-modtime)
(set-buffer-modified-p nil))
(set-buffer-modified-p nil)
;; For root, preserve owner and group when editing files.
(when (string-equal (file-remote-p filename 'user) "root")
(set (make-local-variable 'backup-by-copying-when-mismatch) t)))
(when (and (stringp local-copy)
(or remote-copy (null tramp-temp-buffer-file-name)))
(delete-file local-copy))
@ -7159,7 +7162,11 @@ and end of region, and are expected to replace the region contents
with the encoded or decoded results, respectively.")
(defconst tramp-remote-coding-commands
'((b64 "base64" "base64 -d")
'((b64 "base64" "base64 -d -i")
;; "-i" is more robust with older base64 from GNU coreutils.
;; However, I don't know whether all base64 versions do supports
;; this option.
(b64 "base64" "base64 -d")
(b64 "mimencode -b" "mimencode -u -b")
(b64 "mmencode -b" "mmencode -u -b")
(b64 "recode data..base64" "recode base64..data")
@ -8578,54 +8585,57 @@ If no corresponding command is found, nil is returned.
Otherwise, either a string is returned which contains a `%s' mark
to be used for the respective input or output file; or a Lisp
function cell is returned to be applied on a buffer."
(let ((coding
(with-connection-property vec prop
(tramp-find-inline-encoding vec)
(tramp-get-connection-property vec prop nil)))
(prop1 (if (string-match "encoding" prop)
"inline-compress" "inline-decompress"))
compress)
;; The connection property might have been cached. So we must send
;; the script to the remote side - maybe.
(when (and coding (symbolp coding) (string-match "remote" prop))
(let ((name (symbol-name coding)))
(while (string-match (regexp-quote "-") name)
(setq name (replace-match "_" nil t name)))
(tramp-maybe-send-script vec (symbol-value coding) name)
(setq coding name)))
(when coding
;; Check for the `compress' command.
(setq compress (tramp-get-inline-compress vec prop1 size))
;; Return the value.
(cond
((and compress (symbolp coding))
(if (string-match "decompress" prop1)
;; We must catch the errors, because we want to return `nil', when
;; no inline coding is found.
(ignore-errors
(let ((coding
(with-connection-property vec prop
(tramp-find-inline-encoding vec)
(tramp-get-connection-property vec prop nil)))
(prop1 (if (string-match "encoding" prop)
"inline-compress" "inline-decompress"))
compress)
;; The connection property might have been cached. So we must
;; send the script to the remote side - maybe.
(when (and coding (symbolp coding) (string-match "remote" prop))
(let ((name (symbol-name coding)))
(while (string-match (regexp-quote "-") name)
(setq name (replace-match "_" nil t name)))
(tramp-maybe-send-script vec (symbol-value coding) name)
(setq coding name)))
(when coding
;; Check for the `compress' command.
(setq compress (tramp-get-inline-compress vec prop1 size))
;; Return the value.
(cond
((and compress (symbolp coding))
(if (string-match "decompress" prop1)
`(lambda (beg end)
(,coding beg end)
(let ((coding-system-for-write 'binary)
(coding-system-for-read 'binary))
(apply
'call-process-region (point-min) (point-max)
(car (split-string ,compress)) t t nil
(cdr (split-string ,compress)))))
`(lambda (beg end)
(,coding beg end)
(let ((coding-system-for-write 'binary)
(coding-system-for-read 'binary))
(apply
'call-process-region (point-min) (point-max)
'call-process-region beg end
(car (split-string ,compress)) t t nil
(cdr (split-string ,compress)))))
`(lambda (beg end)
(let ((coding-system-for-write 'binary)
(coding-system-for-read 'binary))
(apply
'call-process-region beg end
(car (split-string ,compress)) t t nil
(cdr (split-string ,compress))))
(,coding (point-min) (point-max)))))
((symbolp coding)
coding)
((and compress (string-match "decoding" prop))
(format "(%s | %s >%%s)" coding compress))
(compress
(format "(%s <%%s | %s)" compress coding))
((string-match "decoding" prop)
(format "%s >%%s" coding))
(t
(format "%s <%%s" coding))))))
(cdr (split-string ,compress))))
(,coding (point-min) (point-max)))))
((symbolp coding)
coding)
((and compress (string-match "decoding" prop))
(format "(%s | %s >%%s)" coding compress))
(compress
(format "(%s <%%s | %s)" compress coding))
((string-match "decoding" prop)
(format "%s >%%s" coding))
(t
(format "%s <%%s" coding)))))))
(defun tramp-get-method-parameter (method param)
"Return the method parameter PARAM.

4
lisp/net/trampver.el
View file

@ -30,14 +30,14 @@
;; version check is defined in macro AC_EMACS_INFO of aclocal.m4;
;; should be changed only there.
(defconst tramp-version "2.1.19"
(defconst tramp-version "2.1.20"
"This version of Tramp.")
(defconst tramp-bug-report-address "tramp-devel@gnu.org"
"Email address to send bug reports to.")
;; Check for (X)Emacs version.
(let ((x (if (or (>= emacs-major-version 22) (and (featurep 'xemacs) (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" (format "Tramp 2.1.19 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version)))))))
(let ((x (if (or (>= emacs-major-version 22) (and (featurep 'xemacs) (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" (format "Tramp 2.1.20 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version)))))))
(unless (string-match "\\`ok\\'" x) (error "%s" x)))
(provide 'trampver)

11
lisp/novice.el
View file

@ -1,7 +1,7 @@
;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
;; Copyright (C) 1985, 1986, 1987, 1994, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 1985, 1986, 1987, 1994, 2001, 2002, 2003, 2004, 2005,
;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal, help
@ -110,9 +110,9 @@ SPC to try the command just this once, but leave it disabled.
(not (string= "" user-init-file))
(y-or-n-p "Enable command for future editing sessions also? "))
(enable-command cmd)
(put cmd 'disabled nil)))
(?n nil)
(t (call-interactively cmd)))))
(put cmd 'disabled nil))))
(or (char-equal char ?n)
(call-interactively cmd))))
(defun en/disable-command (command disable)
(unless (commandp command)
@ -169,5 +169,4 @@ to future sessions."
(provide 'novice)
;; arch-tag: f83c0f96-497e-4db6-a430-8703716c6dd9
;;; novice.el ends here

6
lisp/org/ChangeLog
View file

@ -1,3 +1,7 @@
2010-10-22 Juanma Barranquero <lekktu@gmail.com>
* org-exp.el (org-export-visible): Fix typo in docstring.
2010-10-12 Juanma Barranquero <lekktu@gmail.com>
* org-agenda.el (org-prefix-category-length)
@ -5191,7 +5195,7 @@
2008-10-26 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-add-log-setup): Only skip drawers if the are
* org.el (org-add-log-setup): Only skip drawers if they are
immediately after the scheduling keywords.
* org-clock.el (org-clock-in-switch-to-state): Allow this to be a

8
lisp/org/org-exp.el
View file

@ -2540,10 +2540,10 @@ INDENT was the original indentation of the block."
The copy is created in a temporary buffer and removed after use.
TYPE is the final key (as a string) that also select the export command in
the `C-c C-e' export dispatcher.
As a special case, if the you type SPC at the prompt, the temporary
org-mode file will not be removed but presented to you so that you can
continue to use it. The prefix arg ARG is passed through to the exporting
command."
As a special case, if you type SPC at the prompt, the temporary org-mode
file will not be removed but presented to you so that you can continue to
use it. The prefix arg ARG is passed through to the exporting command."
(interactive
(list (progn
(message "Export visible: [a]SCII [h]tml [b]rowse HTML [H/R]uffer with HTML [D]ocBook [x]OXO [ ]keep buffer")

43
lisp/play/fortune.el
View file

@ -1,7 +1,7 @@
;;; fortune.el --- use fortune to create signatures
;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
;; 2008, 2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
;; 2009, 2010 Free Software Foundation, Inc.
;; Author: Holger Schauer <Holger.Schauer@gmx.de>
;; Keywords: games utils mail
@ -285,48 +285,41 @@ and choose the directory as the fortune-file."
;;; Display fortune
(defun fortune-in-buffer (interactive &optional file)
"Put a fortune cookie in the *fortune* buffer.
INTERACTIVE is ignored. Optional argument FILE,
when supplied, specifies the file to choose the fortune from."
INTERACTIVE is ignored. Optional argument FILE, when supplied,
specifies the file to choose the fortune from."
(let ((fortune-buffer (or (get-buffer fortune-buffer-name)
(generate-new-buffer fortune-buffer-name)))
(fort-file (expand-file-name
(substitute-in-file-name
(or file fortune-file)))))
(with-current-buffer fortune-buffer
(toggle-read-only 0)
(erase-buffer)
(if fortune-always-compile
(fortune-compile fort-file))
(apply 'call-process
fortune-program ; program to call
nil fortune-buffer nil ; INFILE BUFFER DISPLAY
(append (if (stringp fortune-program-options)
(split-string fortune-program-options)
fortune-program-options) (list fort-file))))))
(let ((inhibit-read-only t))
(erase-buffer)
(if fortune-always-compile
(fortune-compile fort-file))
(apply 'call-process
fortune-program ; program to call
nil fortune-buffer nil ; INFILE BUFFER DISPLAY
(append (if (stringp fortune-program-options)
(split-string fortune-program-options)
fortune-program-options) (list fort-file)))))))
;;;###autoload
(defun fortune (&optional file)
"Display a fortune cookie.
If called with a prefix asks for the FILE to choose the fortune from,
otherwise uses the value of `fortune-file'. If you want to have fortune
choose from a set of files in a directory, call interactively with prefix
and choose the directory as the fortune-file."
(interactive
(list
(if current-prefix-arg
(fortune-ask-file)
fortune-file)))
(interactive (list (if current-prefix-arg
(fortune-ask-file)
fortune-file)))
(fortune-in-buffer t file)
(switch-to-buffer (get-buffer fortune-buffer-name))
(toggle-read-only 1))
(setq buffer-read-only t))
;;; Provide ourselves.
(provide 'fortune)
;; arch-tag: a1e4cb8a-3792-40e7-86a7-fc75ce094bcc
;;; fortune.el ends here

9
lisp/play/gomoku.el
View file

@ -1,7 +1,7 @@
;;; gomoku.el --- Gomoku game between you and Emacs
;; Copyright (C) 1988, 1994, 1996, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 1988, 1994, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
;; Maintainer: FSF
@ -201,8 +201,8 @@ is non-nil."
(gomoku-display-statistics)
(use-local-map gomoku-mode-map)
(make-local-variable 'font-lock-defaults)
(setq font-lock-defaults '(gomoku-font-lock-keywords t))
(toggle-read-only t)
(setq font-lock-defaults '(gomoku-font-lock-keywords t)
buffer-read-only t)
(run-mode-hooks 'gomoku-mode-hook))
;;;
@ -1213,5 +1213,4 @@ If the game is finished, this command requests for another game."
(provide 'gomoku)
;; arch-tag: b1b8205e-77fc-4597-b373-3ea2c04311eb
;;; gomoku.el ends here

5
lisp/play/landmark.el
View file

@ -255,8 +255,8 @@ is non-nil. One interesting value is `turn-on-font-lock'."
(lm-display-statistics)
(use-local-map lm-mode-map)
(make-local-variable 'font-lock-defaults)
(setq font-lock-defaults '(lm-font-lock-keywords t))
(toggle-read-only t)
(setq font-lock-defaults '(lm-font-lock-keywords t)
buffer-read-only t)
(run-mode-hooks 'lm-mode-hook))
@ -1700,5 +1700,4 @@ Use \\[describe-mode] for more info."
(provide 'landmark)
;; arch-tag: ae5031be-96e6-459e-a3df-1df53117d3f2
;;; landmark.el ends here

12
lisp/printing.el
View file

@ -1,7 +1,7 @@
;;; printing.el --- printing utilities
;; Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
;; Free Software Foundation, Inc.
;; Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
;; 2010 Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
@ -3453,12 +3453,7 @@ See `pr-ps-printer-alist'.")
(defun pr-menu-bind ()
"Install `printing' menu in the menubar.
On Emacs 20, it replaces the Tools/Print menu by Tools/Printing menu.
On Emacs 21 and 22, it replaces the File/Print* menu entries by File/Print
menu.
This replaces the File/Print* menu entries with a File/Print sub-menu.
Calls `pr-update-menus' to adjust menus."
(interactive)
(pr-global-menubar pr-menu-spec)
@ -6685,5 +6680,4 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order."
(provide 'printing)
;; arch-tag: 9ce9ac3f-0f60-4370-900b-1943215d9d18
;;; printing.el ends here

2
lisp/progmodes/dcl-mode.el
View file

@ -409,7 +409,7 @@ A list of regexps that will trigger a reindent if the last letter
is defined as dcl-electric-character.
E.g.: if this list contains `endif', the key `f' is defined as
dcl-electric-character and the you have just typed the `f' in
dcl-electric-character and you have just typed the `f' in
`endif', the line will be reindented."
:type '(repeat regexp)
:group 'dcl)

160
lisp/progmodes/python.el
View file

@ -170,18 +170,9 @@
;; Make outer chars of matching triple-quote sequences into generic
;; string delimiters. Fixme: Is there a better way?
;; First avoid a sequence preceded by an odd number of backslashes.
`((,(rx (not (any ?\\))
?\\ (* (and ?\\ ?\\))
(group (syntax string-quote))
(backref 1)
(group (backref 1)))
(2 ,(string-to-syntax "\""))) ; dummy
(,(rx (group (optional (any "uUrR"))) ; prefix gets syntax property
(optional (any "rR")) ; possible second prefix
(group (syntax string-quote)) ; maybe gets property
(backref 2) ; per first quote
(group (backref 2))) ; maybe gets property
(1 (python-quote-syntax 1))
`((,(concat "\\(?:\\([RUru]\\)[Rr]?\\|^\\|[^\\]\\(?:\\\\.\\)*\\)" ;Prefix.
"\\(?:\\('\\)'\\('\\)\\|\\(?2:\"\\)\"\\(?3:\"\\)\\)")
(1 (python-quote-syntax 1) nil lax)
(2 (python-quote-syntax 2))
(3 (python-quote-syntax 3)))
;; This doesn't really help.
@ -219,9 +210,9 @@ Used for syntactic keywords. N is the match number (1, 2 or 3)."
(eval-when-compile (string-to-syntax "|"))))))
;; Consider property for initial char, accounting for prefixes.
((or (and (= n 2) ; leading quote (not prefix)
(= (match-beginning 1) (match-end 1))) ; prefix is null
(not (match-end 1))) ; prefix is null
(and (= n 1) ; prefix
(/= (match-beginning 1) (match-end 1)))) ; non-empty
(match-end 1))) ; non-empty
(let ((font-lock-syntactic-keywords nil))
(unless (eq 'string (syntax-ppss-context (syntax-ppss)))
(eval-when-compile (string-to-syntax "|")))))
@ -579,6 +570,33 @@ having to restart the program."
"Queue of Python temp files awaiting execution.
Currently-active file is at the head of the list.")
(defcustom python-shell-prompt-alist
'(("ipython" . "^In \\[[0-9]+\\]: *")
(t . "^>>> "))
"Alist of Python input prompts.
Each element has the form (PROGRAM . REGEXP), where PROGRAM is
the value of `python-python-command' for the python process and
REGEXP is a regular expression matching the Python prompt.
PROGRAM can also be t, which specifies the default when no other
element matches `python-python-command'."
:type 'string
:group 'python
:version "24.1")
(defcustom python-shell-continuation-prompt-alist
'(("ipython" . "^ [.][.][.]+: *")
(t . "^[.][.][.] "))
"Alist of Python continued-line prompts.
Each element has the form (PROGRAM . REGEXP), where PROGRAM is
the value of `python-python-command' for the python process and
REGEXP is a regular expression matching the Python prompt for
continued lines.
PROGRAM can also be t, which specifies the default when no other
element matches `python-python-command'."
:type 'string
:group 'python
:version "24.1")
(defvar python-pdbtrack-is-tracking-p nil)
(defconst python-pdbtrack-stack-entry-regexp
@ -1311,13 +1329,9 @@ See `python-check-command' for the default."
;;;; Inferior mode stuff (following cmuscheme).
;; Fixme: Make sure we can work with IPython.
(defcustom python-python-command "python"
"Shell command to run Python interpreter.
Any arguments can't contain whitespace.
Note that IPython may not work properly; it must at least be used
with the `-cl' flag, i.e. use `ipython -cl'."
Any arguments can't contain whitespace."
:group 'python
:type 'string)
@ -1395,6 +1409,23 @@ local value.")
;; Autoloaded.
(declare-function compilation-shell-minor-mode "compile" (&optional arg))
(defvar python--prompt-regexp nil)
(defun python--set-prompt-regexp ()
(let ((prompt (cdr-safe (or (assoc python-python-command
python-shell-prompt-alist)
(assq t python-shell-prompt-alist))))
(cprompt (cdr-safe (or (assoc python-python-command
python-shell-continuation-prompt-alist)
(assq t python-shell-continuation-prompt-alist)))))
(set (make-local-variable 'comint-prompt-regexp)
(concat "\\("
(mapconcat 'identity
(delq nil (list prompt cprompt "^([Pp]db) "))
"\\|")
"\\)"))
(set (make-local-variable 'python--prompt-regexp) prompt)))
;; Fixme: This should inherit some stuff from `python-mode', but I'm
;; not sure how much: at least some keybindings, like C-c C-f;
;; syntax?; font-locking, e.g. for triple-quoted strings?
@ -1417,14 +1448,12 @@ For running multiple processes in multiple buffers, see `run-python' and
\\{inferior-python-mode-map}"
:group 'python
(require 'ansi-color) ; for ipython
(setq mode-line-process '(":%s"))
(set (make-local-variable 'comint-input-filter) 'python-input-filter)
(add-hook 'comint-preoutput-filter-functions #'python-preoutput-filter
nil t)
;; Still required by `comint-redirect-send-command', for instance
;; (and we need to match things like `>>> ... >>> '):
(set (make-local-variable 'comint-prompt-regexp)
(rx line-start (1+ (and (or (repeat 3 (any ">.")) "(Pdb)") " "))))
(python--set-prompt-regexp)
(set (make-local-variable 'compilation-error-regexp-alist)
python-compilation-regexp-alist)
(compilation-shell-minor-mode 1))
@ -1435,6 +1464,16 @@ Default ignores all inputs of 0, 1, or 2 non-blank characters."
:type 'regexp
:group 'python)
(defcustom python-remove-cwd-from-path t
"Whether to allow loading of Python modules from the current directory.
If this is non-nil, Emacs removes '' from sys.path when starting
an inferior Python process. This is the default, for security
reasons, as it is easy for the Python process to be started
without the user's realization (e.g. to perform completion)."
:type 'boolean
:group 'python
:version "23.3")
(defun python-input-filter (str)
"`comint-input-filter' function for inferior Python.
Don't save anything for STR matching `inferior-python-filter-regexp'."
@ -1521,34 +1560,39 @@ Don't save anything for STR matching `inferior-python-filter-regexp'."
cmd)))
(unless (shell-command-to-string cmd)
(error "Can't run Python command `%s'" cmd))
(let* ((res (shell-command-to-string (concat cmd " --version"))))
(string-match "Python \\([0-9]\\)\\.\\([0-9]\\)" res)
(unless (and (equal "2" (match-string 1 res))
(match-beginning 2)
(>= (string-to-number (match-string 2 res)) 2))
(error "Only Python versions >= 2.2 and < 3.0 supported")))
(let* ((res (shell-command-to-string
(concat cmd
" -c \"from sys import version_info;\
print version_info >= (2, 2) and version_info < (3, 0)\""))))
(unless (string-match "True" res)
(error "Only Python versions >= 2.2 and < 3.0 are supported")))
(setq python-version-checked t)))
;;;###autoload
(defun run-python (&optional cmd noshow new)
"Run an inferior Python process, input and output via buffer *Python*.
CMD is the Python command to run. NOSHOW non-nil means don't show the
buffer automatically.
CMD is the Python command to run. NOSHOW non-nil means don't
show the buffer automatically.
Normally, if there is a process already running in `python-buffer',
switch to that buffer. Interactively, a prefix arg allows you to edit
the initial command line (default is `python-command'); `-i' etc. args
will be added to this as appropriate. A new process is started if:
one isn't running attached to `python-buffer', or interactively the
default `python-command', or argument NEW is non-nil. See also the
documentation for `python-buffer'.
Interactively, a prefix arg means to prompt for the initial
Python command line (default is `python-command').
Runs the hook `inferior-python-mode-hook' \(after the
`comint-mode-hook' is run). \(Type \\[describe-mode] in the process
buffer for a list of commands.)"
A new process is started if one isn't running attached to
`python-buffer', or if called from Lisp with non-nil arg NEW.
Otherwise, if a process is already running in `python-buffer',
switch to that buffer.
This command runs the hook `inferior-python-mode-hook' after
running `comint-mode-hook'. Type \\[describe-mode] in the
process buffer for a list of commands.
By default, Emacs inhibits the loading of Python modules from the
current working directory, for security reasons. To disable this
behavior, change `python-remove-cwd-from-path' to nil."
(interactive (if current-prefix-arg
(list (read-string "Run Python: " python-command) nil t)
(list python-command)))
(require 'ansi-color) ; for ipython
(unless cmd (setq cmd python-command))
(python-check-version cmd)
(setq python-command cmd)
@ -1558,16 +1602,19 @@ buffer for a list of commands.)"
(when (or new (not (comint-check-proc python-buffer)))
(with-current-buffer
(let* ((cmdlist
(append (python-args-to-list cmd)
'("-i" "-c" "import sys; sys.path.remove('')")))
(append (python-args-to-list cmd) '("-i")
(if python-remove-cwd-from-path
'("-c" "import sys; sys.path.remove('')"))))
(path (getenv "PYTHONPATH"))
(process-environment ; to import emacs.py
(cons (concat "PYTHONPATH="
(if path (concat path path-separator))
data-directory)
process-environment))
;; Suppress use of pager for help output:
(process-connection-type nil))
;; If we use a pipe, unicode characters are not printed
;; correctly (Bug#5794) and IPython does not work at
;; all (Bug#5390).
(process-connection-type t))
(apply 'make-comint-in-buffer "Python"
(generate-new-buffer "*Python*")
(car cmdlist) nil (cdr cmdlist)))
@ -1623,7 +1670,12 @@ buffer for a list of commands.)"
;; non-ASCII.
(interactive "r")
(let* ((f (make-temp-file "py"))
(command (format "emacs.eexecfile(%S)" f))
(command
;; IPython puts the FakeModule module into __main__ so
;; emacs.eexecfile becomes useless.
(if (string-match "^ipython" python-command)
(format "execfile %S" f)
(format "emacs.eexecfile(%S)" f)))
(orig-start (copy-marker start)))
(when (save-excursion
(goto-char start)
@ -1823,7 +1875,9 @@ If there isn't, it's probably not appropriate to send input to return Eldoc
information etc. If PROC is non-nil, check the buffer for that process."
(with-current-buffer (process-buffer (or proc (python-proc)))
(save-excursion
(save-match-data (re-search-backward ">>> \\=" nil t)))))
(save-match-data
(re-search-backward (concat python--prompt-regexp " *\\=")
nil t)))))
;; Fixme: Is there anything reasonable we can do with random methods?
;; (Currently only works with functions.)
@ -2539,9 +2593,7 @@ Runs `jython-mode-hook' after `python-mode-hook'."
"Watch output for Python prompt and exec next file waiting in queue.
This function is appropriate for `comint-output-filter-functions'."
;; TBD: this should probably use split-string
(when (and (or (string-equal string ">>> ")
(and (>= (length string) 5)
(string-equal (substring string -5) "\n>>> ")))
(when (and (string-match python--prompt-regexp string)
python-file-queue)
(condition-case nil
(delete-file (car python-file-queue))
@ -2753,6 +2805,7 @@ comint believe the user typed this string so that
(funcall (process-filter proc) proc msg))
(set-buffer curbuf))
(process-send-string proc cmd)))
;;;###autoload
(defun python-shell (&optional argprompt)
"Start an interactive Python interpreter in another window.
@ -2767,7 +2820,7 @@ command is used to switch to an existing process, only when a new
process is started. If you use this, you will probably want to ensure
that the current arguments are retained (they will be included in the
prompt). This argument is ignored when this function is called
programmatically, or when running in Emacs 19.34 or older.
programmatically.
Note: You can toggle between using the CPython interpreter and the
JPython interpreter by hitting \\[python-toggle-shells]. This toggles
@ -2792,6 +2845,7 @@ interaction between undo and process filters; the same problem exists in
non-Python process buffers using the default (Emacs-supplied) process
filter."
(interactive "P")
(require 'ansi-color) ; For ipython
;; Set the default shell if not already set
(when (null python-which-shell)
(python-toggle-shells python-default-interpreter))
@ -2808,10 +2862,9 @@ filter."
))))
(switch-to-buffer-other-window
(apply 'make-comint python-which-bufname python-which-shell nil args))
(make-local-variable 'comint-prompt-regexp)
(set-process-sentinel (get-buffer-process (current-buffer))
'python-sentinel)
(setq comint-prompt-regexp "^>>> \\|^[.][.][.] \\|^(pdb) ")
(python--set-prompt-regexp)
(add-hook 'comint-output-filter-functions
'python-comint-output-filter-function nil t)
;; pdbtrack
@ -2844,5 +2897,4 @@ filter."
(provide 'python)
(provide 'python-21)
;; arch-tag: 6fce1d99-a704-4de9-ba19-c6e4912b0554
;;; python.el ends here

3
lisp/progmodes/sql.el
View file

@ -7,7 +7,7 @@
;; Maintainer: Michael Mauger <mmaug@yahoo.com>
;; Version: 2.0.2
;; Keywords: comm languages processes
;; URL: http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/progmodes/sql.el
;; URL: http://savannah.gnu.org/projects/emacs/
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode
;; This file is part of GNU Emacs.
@ -2885,5 +2885,4 @@ parameters and command options."
(provide 'sql)
;; arch-tag: 7e1fa1c4-9ca2-402e-87d2-83a5eccb7ac3
;;; sql.el ends here

10
lisp/progmodes/tcl.el
View file

@ -606,15 +606,11 @@ Commands:
(set (make-local-variable 'dabbrev-abbrev-skip-leading-regexp) "[$!]")
(set (make-local-variable 'dabbrev-abbrev-char-regexp) "\\sw\\|\\s_")
;; This can only be set to t in Emacs 19 and XEmacs.
;; Emacs 18 and Epoch lose.
(set (make-local-variable 'parse-sexp-ignore-comments) t)
;; XEmacs has defun-prompt-regexp, but I don't believe
;; that it works for end-of-defun -- only for
;; beginning-of-defun.
(set (make-local-variable 'defun-prompt-regexp) tcl-omit-ws-regexp)
;; The following doesn't work in Lucid Emacs 19.6, but maybe
;; it will appear in later versions.
(set (make-local-variable 'add-log-current-defun-function)
'tcl-add-log-defun)
@ -1200,11 +1196,7 @@ semicolon, opening brace, or opening bracket on the same line."
"Determine if point is in a comment.
Returns a list of the form `(FLAG . STATE)'. STATE can be used
as input to future invocations. FLAG is nil if not in comment,
t otherwise. If in comment, leaves point at beginning of comment.
This function does not work in Emacs 18.
See also `tcl-simple-scan-for-comment', a
simpler version that is often right, and works in Emacs 18."
t otherwise. If in comment, leaves point at beginning of comment."
(let ((bol (save-excursion
(goto-char end)
(beginning-of-line)

2539
lisp/progmodes/verilog-mode.el
View file

File diff suppressed because it is too large Load diff

8
lisp/progmodes/which-func.el
View file

@ -154,7 +154,7 @@ mouse-3: go to end")
:type 'sexp)
;;;###autoload (put 'which-func-format 'risky-local-variable t)
(defvar which-func-imenu-joiner-function #'last
(defvar which-func-imenu-joiner-function (lambda (x) (car (last x)))
"Function to join together multiple levels of imenu nomenclature.
Called with a single argument, a list of strings giving the names
of the menus we had to traverse to get to the item. Returns a
@ -242,6 +242,9 @@ continuously displayed in the mode line, in certain major modes.
With prefix ARG, turn Which Function mode on if arg is positive,
and off otherwise."
:global t :group 'which-func
(when (timerp which-func-update-timer)
(cancel-timer which-func-update-timer))
(setq which-func-update-timer nil)
(if which-function-mode
;;Turn it on
(progn
@ -253,9 +256,6 @@ and off otherwise."
(or (eq which-func-modes t)
(member major-mode which-func-modes))))))
;; Turn it off
(when (timerp which-func-update-timer)
(cancel-timer which-func-update-timer))
(setq which-func-update-timer nil)
(dolist (buf (buffer-list))
(with-current-buffer buf (setq which-func-mode nil)))))

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