1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00

Merged in changes from CVS trunk. Plus added lisp/term tweaks.

Patches applied:

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
   tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
   Add CVS metadata files.

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
   Update from CVS.


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393
This commit is contained in:
Karoly Lorentey 2005-09-04 03:48:17 +00:00
commit fbf3497344
1502 changed files with 23319 additions and 13290 deletions

3
.gitignore vendored
View file

@ -39,6 +39,9 @@ config.cache
config.log
config.status
configure
data
emacs*.tar.gz
leim*.tar.gz
lock
site-lisp
update.log

View file

@ -1,3 +1,23 @@
2005-08-03 Juanma Barranquero <lekktu@gmail.com>
* .cvsignore: Add `lock'.
2005-07-28 Juanma Barranquero <lekktu@gmail.com>
* .cvsignore: Add `data' and `site-lisp' (for in-place installs).
2005-07-26 Paul Eggert <eggert@cs.ucla.edu>
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
2005-07-06 Lute Kamstra <lute@gnu.org>
* configure.in: Fix capitalization.

View file

@ -2,7 +2,7 @@
# DIST: make most of the changes to this file you might want, so try
# DIST: that first.
# Copyright (C) 1992,93,94,95,96,97,98,1999,2000,01,02,03,2004
# Copyright (C) 1992,93,94,95,96,97,98,1999,2000,01,02,03,04,2005
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
@ -302,12 +302,14 @@ Makefile: $(srcdir)/Makefile.in config.status
config.status: ${srcdir}/configure
./config.status --recheck
${srcdir}/configure: @MAINT@ ${srcdir}/configure.in
AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/m4/getopt.m4
$(srcdir)/configure: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoconf
$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
@true
$(srcdir)/src/stamp-h.in: @MAINT@ ${srcdir}/configure.in
$(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoheader
rm -f $(srcdir)/src/stamp-h.in
echo timestamp > $(srcdir)/src/stamp-h.in

View file

@ -1,3 +1,12 @@
2005-08-31 Romain Francoise <romain@orebokech.com>
* FOR-RELEASE: (New features): Remove vhdl-mode.el update
item (Done).
2005-08-27 Romain Francoise <romain@orebokech.com>
* FOR-RELEASE (Bugs): Remove compile-internal item (Done).
2005-07-04 Lute Kamstra <lute@gnu.org>
Update FSF's address in GPL notices.

View file

@ -21,6 +21,10 @@ face name prefixes should be in it for good results.
** Regenerate the postscript files of the reference cards in etc.
** Ask maintainers of refcard translations to update them.
** Check what should be deleted or updated in MORE.STUFF.
* NEW FEATURES
** Make VC-over-Tramp work where possible, or at least fail
@ -29,11 +33,10 @@ To be done by Andre Spiegel <spiegel@gnu.org>.
** Update Speedbar.
** Update vhdl-mode.el based on changes in
http://opensource.ethz.ch/emacs/vhdl-mode.html.
** Debug custom themes.
** Get rid of the defadvice calls in org.el.
* FATAL ERRORS
** Investigate reported crashes in compact_small_strings.
@ -41,9 +44,44 @@ To be done by Andre Spiegel <spiegel@gnu.org>.
** Investigate reported crashes related to using an
invalid pointer from string_free_list.
** Emacs on Windows crashes reading JPEG images from files.
The problem is caused by the Emacs executable and the image library
having multiple, incompatible copies of the run-time code, which can
happen when mixing a MSVC build of Emacs with a MinGW build of the
jpeg library (or the other way around). The fix is straightforward
and has already been posted on the developers' list, but it is on the
back burner waiting for a legal comment or an alternate implementation
(around 30 lines of code).
* BUGS
** Fix those modes that still use compile-internal, to not use it.
** The header-line buttons in the buffer list buffer
should respond to Mouse-1.
** Fix recognition of shell's `dirs' command.
Is his change right?
Date: Wed, 29 Jun 2005 18:21:28 -0500 (CDT)
From: kevin.gal@verizon.net
When I use tcsh (which echoes command input) in a shell buffer,
entering "M-x dirs" fails because it mistakens the echoed "dirs"
string as the directory string to use as input when changing the
buffers default directory. The attached gziped patch file contains a
fix. The patch also binds the "dirs" command to "\e\C-m" in
shell-mode-map (previously unbound) to make it easy to invoke.
Finally, a test has been added to see if "shell-dirstack-query" is
non-nil. If so, it is not overwritten.
To enable the fix, the user must set comint-process-echoes to t.
** TCP server processes do not work on Windows.
TCP/IP server processes created with `make-network-process' consume
excesive CPU on some Windows environments. Usages of 50% and 100%
CPU time have been observed on different Window XP configurations.
** Bug in ebrowse
@ -75,63 +113,52 @@ The *Tree* is then displayed as
The class A seems to be missing.
** Ange-ftp should ignore irrelevant IPv6 errors:
Message-Id: <4121-Tue23Mar2004165249+0100-piet@cs.uu.nl>
From: "Piet van Oostrum" <piet@cs.uu.nl>
To: emacs-pretest-bug@gnu.org
Subject: Ange-ftp can't deal with IPV6/IPV4 fallback
Symptoms:
C-x C-f /ftp.nluug.nl:/
The problem is that the DNS first gives an IPV6 address. However our
router doesn't do IPV6. Ftp then falls back to IPV4:
ftp> open ftp.nluug.nl
Trying 2001:610:1:80aa:192:87:102:36...
ftp: connect to address 2001:610:1:80aa:192:87:102:36: No route to host
Trying 192.87.102.36...
Connected to ftp.nluug.nl.
Ange-ftp chokes on the `No route to host' message and doesn't look any
further.
I think in the near future we will see more of this problem, so it might be
time to make anfe-ftp more intelligent.
* DOCUMENTATION
** Document Custom Themes.
** Update lispref/README.
** Update man/info.texi.
** Add missing years in copyright notices of all files.
Policy document admin/notes/years must be updated before
making further progress on this task!!!
Please record your name here and say which part of the distribution
you're going to handle.
DIRECTORY STATUS IN CHARGE
--------- ------ ---------
etc (and subdirs) done Thien-Thi Nguyen (ttn(@gnu.org))
leim working Kenichi Handa
lisp/calc working Thien-Thi Nguyen
lib-src done ttn
lisp done ttn
lisp/calc done ttn
lisp/calendar working Glenn Morris
lisp/emulation working Thien-Thi Nguyen
lisp/eshell working Thien-Thi Nguyen
lisp/emacs-lisp done ttn
lisp/emulation done ttn
lisp/eshell done ttn
lisp/gnus done ttn
lisp/international done Kenichi Handa
lisp/languages done Kenichi Handa
lisp/mh-e working Thien-Thi Nguyen
lisp/net working Thien-Thi Nguyen
lisp/play working Thien-Thi Nguyen
lisp/term working Thien-Thi Nguyen
lisp/toolbar working Thien-Thi Nguyen
lisp/url working Thien-Thi Nguyen
lisp/language done Kenichi Handa
lisp/mail done ttn
lisp/mh-e working Bill Wohler
lisp/net done ttn
lisp/obsolete done ttn
lisp/play done ttn
lisp/progmodes done Nick Roberts
lisp/term done ttn
lisp/textmodes done ttn
lisp/toolbar done ttn
lisp/url done ttn
lispintro done ttn
lispref done ttn
lwlib done ttn
m4 done ttn
mac (and subdirs) done ttn
man done ttn
msdos done ttn
nt (and subdirs) done ttn
oldXMenu done ttn
src (and subdirs) done ttn
vms done ttn
** Check the Emacs manual.
@ -231,7 +258,7 @@ lispref/numbers.texi "Luc Teirlinck" Chong Yidong
lispref/objects.texi "Luc Teirlinck" Chong Yidong
lispref/os.texi "Luc Teirlinck" Chong Yidong
lispref/positions.texi "Luc Teirlinck" Chong Yidong
lispref/processes.texi Chong Yidong Thien-Thi Nguyen
lispref/processes.texi Chong Yidong ttn
lispref/searching.texi "Luc Teirlinck" Chong Yidong
lispref/sequences.texi "Luc Teirlinck" Chong Yidong
lispref/streams.texi "Luc Teirlinck" Chong Yidong
@ -261,8 +288,8 @@ etc/TUTORIAL.cn
etc/TUTORIAL.cs Pavel Janík <Pavel@Janik.cz>
etc/TUTORIAL.de Werner LEMBERG <wl@gnu.org>
etc/TUTORIAL.es Marcelo Toledo
etc/TUTORIAL.fr Thien-Thi Nguyen
etc/TUTORIAL.it Thien-Thi Nguyen
etc/TUTORIAL.fr ttn
etc/TUTORIAL.it ttn
etc/TUTORIAL.ja Kenichi Handa <handa@m17n.org>
etc/TUTORIAL.ko
etc/TUTORIAL.nl Lute Kamstra

View file

@ -1,13 +1,31 @@
THIS DOCUMENT IS UNDER REVIEW.
DO NOT FOLLOW THESE INSTRUCTIONS -- THEY ARE NOT CORRECT.
How to Maintain Copyright Years for GNU Emacs
"Our lawyer says it is ok if we add, to each file that has been in Emacs
since Emacs 21 came out in 2001, all the subsequent years. We don't
need to check whether *that file* was changed in those years.
It's sufficient that *Emacs* was changed in those years (and it was!).
For those files that have been added since then, we should add
the year it was added to Emacs, and all subsequent years."
--RMS, 2005-07-13
For the refcards under etc/, it's ok to simply use the latest year
(typically in a `\def\year{YEAR}' expression) for the rendered copyright
notice, while maintaining the full list of years in the copyright notice
in the comments.
------------------------------------------------------------------------------
Following is the policy that we tried to write down one time (mid 2005).
Although it is incorrect, we keep it around to remind us how complicated
things used to be (and may become in the future).
Principle: Individual files need to have the year of the release
in the copyright notice if there is significant change.

488
configure vendored
View file

@ -310,7 +310,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INSTALL_INFO EGREP LIBSOUND SET_MAKE PKG_CONFIG GTK_CFLAGS GTK_LIBS ALLOCA liblockfile LIBOBJS NEED_SETGID KMEM_GROUP GETLOADAVG_LIBS version configuration canonical srcdir lispdir locallisppath lisppath x_default_search_path etcdir archlibdir docdir bitmapdir gamedir gameuser c_switch_system c_switch_machine LD_SWITCH_X_SITE LD_SWITCH_X_SITE_AUX C_SWITCH_X_SITE X_TOOLKIT_TYPE machfile opsysfile carbon_appdir LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INSTALL_INFO EGREP LIBSOUND SET_MAKE PKG_CONFIG GTK_CFLAGS GTK_LIBS ALLOCA liblockfile LIBOBJS NEED_SETGID KMEM_GROUP GETLOADAVG_LIBS GETOPT_H GETOPTOBJS version configuration canonical srcdir lispdir locallisppath lisppath x_default_search_path etcdir archlibdir docdir bitmapdir gamedir gameuser c_switch_system c_switch_machine LD_SWITCH_X_SITE LD_SWITCH_X_SITE_AUX C_SWITCH_X_SITE X_TOOLKIT_TYPE machfile opsysfile carbon_appdir LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -16828,6 +16828,490 @@ _ACEOF
fi
# Configure getopt.
# getopt.m4 serial 10
# The getopt module assume you want GNU getopt, with getopt_long etc,
# rather than vanilla POSIX getopt. This means your your code should
# always include <getopt.h> for the getopt prototypes.
# Prerequisites of lib/getopt*.
GETOPT_H=
for ac_header in getopt.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
else
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
## Report this to the AC_PACKAGE_NAME lists. ##
## ------------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
else
GETOPT_H=getopt.h
fi
done
if test -z "$GETOPT_H"; then
for ac_func in getopt_long_only
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
char (*f) () = $ac_func;
#endif
#ifdef __cplusplus
}
#endif
int
main ()
{
return f != $ac_func;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
else
GETOPT_H=getopt.h
fi
done
fi
if test -z "$GETOPT_H"; then
echo "$as_me:$LINENO: checking whether optreset is declared" >&5
echo $ECHO_N "checking whether optreset is declared... $ECHO_C" >&6
if test "${ac_cv_have_decl_optreset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <getopt.h>
int
main ()
{
#ifndef optreset
char *p = (char *) optreset;
#endif
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_have_decl_optreset=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_decl_optreset=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5
echo "${ECHO_T}$ac_cv_have_decl_optreset" >&6
if test $ac_cv_have_decl_optreset = yes; then
GETOPT_H=getopt.h
fi
fi
if test -z "$GETOPT_H"; then
echo "$as_me:$LINENO: checking for working GNU getopt function" >&5
echo $ECHO_N "checking for working GNU getopt function... $ECHO_C" >&6
if test "${gl_cv_func_gnu_getopt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: checking whether getopt_clip is declared" >&5
echo $ECHO_N "checking whether getopt_clip is declared... $ECHO_C" >&6
if test "${ac_cv_have_decl_getopt_clip+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <getopt.h>
int
main ()
{
#ifndef getopt_clip
char *p = (char *) getopt_clip;
#endif
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_have_decl_getopt_clip=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_decl_getopt_clip=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_have_decl_getopt_clip" >&5
echo "${ECHO_T}$ac_cv_have_decl_getopt_clip" >&6
if test $ac_cv_have_decl_getopt_clip = yes; then
gl_cv_func_gnu_getopt=no
else
gl_cv_func_gnu_getopt=yes
fi
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <getopt.h>
int
main ()
{
char *myargv[3];
myargv[0] = "conftest";
myargv[1] = "-+";
myargv[2] = 0;
return getopt (2, myargv, "+a") != '?';
;
return 0;
}
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
gl_cv_func_gnu_getopt=yes
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
gl_cv_func_gnu_getopt=no
fi
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
echo "$as_me:$LINENO: result: $gl_cv_func_gnu_getopt" >&5
echo "${ECHO_T}$gl_cv_func_gnu_getopt" >&6
if test "$gl_cv_func_gnu_getopt" = "no"; then
GETOPT_H=getopt.h
fi
fi
if test -n "$GETOPT_H"; then
GETOPT_H=getopt.h
cat >>confdefs.h <<\_ACEOF
#define __GETOPT_PREFIX rpl_
_ACEOF
:
GETOPTOBJS='getopt.o getopt1.o'
fi
echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6
if test "${ac_cv_func_getpgrp_void+set}" = set; then
@ -22646,6 +23130,8 @@ s,@LIBOBJS@,$LIBOBJS,;t t
s,@NEED_SETGID@,$NEED_SETGID,;t t
s,@KMEM_GROUP@,$KMEM_GROUP,;t t
s,@GETLOADAVG_LIBS@,$GETLOADAVG_LIBS,;t t
s,@GETOPT_H@,$GETOPT_H,;t t
s,@GETOPTOBJS@,$GETOPTOBJS,;t t
s,@version@,$version,;t t
s,@configuration@,$configuration,;t t
s,@canonical@,$canonical,;t t

View file

@ -2353,7 +2353,7 @@ if test "${HAVE_CARBON}" = "yes"; then
CFLAGS="$CFLAGS -framework Carbon"
AC_CHECK_FUNC(CancelMenuTracking, have_cmt=yes, have_cmt=no)
if test "$have_cmt" = yes; then
AC_DEFINE(HAVE_CANCELMENUTRACKING, 1,
AC_DEFINE(HAVE_CANCELMENUTRACKING, 1,
[Define to 1 if CancelMenuTracking is available (Mac OSX).])
fi
CFLAGS="$tmp_CFLAGS"
@ -2434,6 +2434,15 @@ AC_FUNC_GETLOADAVG
AC_FUNC_FSEEKO
# Configure getopt.
m4_include([m4/getopt.m4])
gl_GETOPT_IFELSE([
gl_GETOPT_SUBSTITUTE_HEADER
gl_PREREQ_GETOPT
GETOPTOBJS='getopt.o getopt1.o'
])
AC_SUBST(GETOPTOBJS)
AC_FUNC_GETPGRP
AC_FUNC_STRFTIME

1
etc/.gitignore vendored
View file

@ -1,4 +1,5 @@
fns-*
icons
*.ps
*.log
*.dvi

View file

@ -1,3 +1,52 @@
2005-08-31 Michael Albinus <michael.albinus@gmx.de>
* NEWS: Add entry for `make-auto-save-file-name'.
2005-08-19 Emilio C. Lopes <eclig@gmx.net>
* emacsclient.1 (DESCRIPTION): Reflect inclusion in the
Emacs distribution. Make role of EDITOR clearer.
(OPTIONS): Document `-s', `-V' and `-h'
as well as their long name counterparts.
(BUGS): Remove.
2005-08-26 Romain Francoise <romain@orebokech.com>
* PROBLEMS: Fix capitalization of "Gnus".
2005-08-20 Chong Yidong <cyd@stupidchicken.com>
* MORE.STUFF: Update links and URLs.
2005-08-05 Kenichi Handa <handa@m17n.org>
* NEWS: Fix the entry describing code-pages.
2005-07-28 Juanma Barranquero <lekktu@gmail.com>
* .cvsignore: Add `icons' (for in-place installs).
2005-07-19 Juri Linkov <juri@jurta.org>
* grep.txt: New file.
2005-07-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* PROBLEMS (Fedora Core 4 GNU/Linux: Segfault during dumping):
-R comes after i386 in setarch command.
2005-07-12 Juri Linkov <juri@jurta.org>
* refcard.tex (Files): Change description of `C-x C-q' from
`checkin/checkout' to `toggle read-only'.
(Getting Help): Replace `C-h c' with `C-h k'.
(Error Recovery): Replace `recover-file' with `recover-session'.
(Info): Replace key binding `C-h C-i' with `C-h S'. Add `t'.
2005-07-07 Richard M. Stallman <rms@gnu.org>
* GNU: Update how to help. Improve footnote 7.
2005-07-07 Lute Kamstra <lute@gnu.org>
* tasks.texi: Delete file. The GNU Task List is obsolete and has
@ -2146,7 +2195,7 @@
;; End:
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
Free Software Foundation, Inc.
2002, 2003, 2004, 2005 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.

View file

@ -1,5 +1,6 @@
Debugging GNU Emacs
Copyright (c) 1985, 2000, 2001, 2005 Free Software Foundation, Inc.
Copyright (C) 1985, 2000, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the

View file

@ -3,8 +3,9 @@ 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
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998, 2000
Free Software Foundation, Inc.
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998,
2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute
verbatim copies of this document provided that the

20
etc/GNU
View file

@ -1,4 +1,5 @@
Copyright (C) 1985, 1993, 2003, 2005 Free Software Foundation, Inc.
Copyright (C) 1985, 1993, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document, in any medium, provided that the copyright notice and
@ -22,8 +23,9 @@ The GNU Manifesto
Footnotes added in 1993 help clarify these points.
For up-to-date information about the available GNU software,
please see the latest issue of the GNU's Bulletin. The list is
much too long to include here.
please see www.gnu.org. For software tasks to work on, see
http://savannah.gnu.org/projects/tasklist. For other ways
to contribute, see http://www.gnu.org/help.
What's GNU? Gnu's Not Unix!
============================
@ -531,13 +533,13 @@ biased; more subtle is the fact that it lumps together various
disparate laws which raise very different issues. Nowadays I urge
people to reject the term "intellectual property" entirely, lest it
lead others to suppose that those laws form one coherent issue. The way to be
clear is to to discuss patents, copyrights, and trademarks separately.
clear is to discuss patents, copyrights, and trademarks separately.
See http://www.gnu.org/philosophy/not-ipr.xhtml for more explanation
of how this term spreads confusion and bias.
(7) In 1985 I had not yet recognized the importance of distinguishing
between "free software" and "freeware". The term "freeware" means
software you are free to redistribute, but usually you are not free to study
and change the source code, so most of it is not free software.
See http://www.gnu.org/philosophy/words-to-avoid.html for more
(7) Subsequently we have learned to distinguish between "free
software" and "freeware". The term "freeware" means software you are
free to redistribute, but usually you are not free to study and change
the source code, so most of it is not free software. See
http://www.gnu.org/philosophy/words-to-avoid.html for more
explanation.

View file

@ -1,5 +1,6 @@
GNUS NEWS -- history of user-visible changes.
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
See the end for copying conditions.
Please send Gnus bug reports to bugs@gnus.org.
@ -62,7 +63,7 @@ picons, install the picons database from
and point `gnus-picon-databases' to that location.
** If the new option `gnus-treat-body-boundary' is `head', a boundary
** If the new option `gnus-treat-body-boundary' is `head', a boundary
line is drawn at the end of the headers.
** Retrieval of charters and control messages
@ -77,7 +78,7 @@ for sending yourself reminders. Setup with (gnus-delay-initialize).
** If `auto-compression-mode' is enabled, attachments are automatically
decompressed when activated.
** If the new option `nnml-use-compressed-files' is non-nil,
** If the new option `nnml-use-compressed-files' is non-nil,
the nnml back end allows compressed message files.
** Signed article headers (X-PGP-Sig) can be verified with `W p'.
@ -91,24 +92,24 @@ Do you often find yourself replying to news by email by mistake? Then
the new option `gnus-confirm-mail-reply-to-news' is just the thing for
you.
** If the new option `gnus-summary-display-while-building' is non-nil,
** If the new option `gnus-summary-display-while-building' is non-nil,
the summary buffer is shown and updated as it's being built.
** The new `recent' mark "." indicates newly arrived messages (as
opposed to old but unread messages).
** The new option `gnus-gcc-mark-as-read' automatically marks
** The new option `gnus-gcc-mark-as-read' automatically marks
Gcc articles as read.
** The nndoc back end now supports mailman digests and exim bounces.
** Gnus supports RFC 2369 mailing list headers, and adds a number of
** Gnus supports RFC 2369 mailing list headers, and adds a number of
related commands in mailing list groups.
** The Date header can be displayed in a format that can be read aloud
in English, see `gnus-treat-date-english'.
** The envelope sender address can be customized when using Sendmail, see
** The envelope sender address can be customized when using Sendmail, see
`message-sendmail-envelope-from'.
** diffs are automatically highlighted in groups matching
@ -488,7 +489,7 @@ If you used procmail like in
(setq nnmail-procmail-directory "~/mail/incoming/")
(setq nnmail-procmail-suffix "\\.in")
this now has changed to
this now has changed to
(setq mail-sources
'((directory :path "~/mail/incoming/"
@ -527,7 +528,8 @@ ever-changing layouts.
----------------------------------------------------------------------
Copyright information:
Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the

View file

@ -16,7 +16,7 @@ Please submit a bug report if you find that any of the addresses
listed here fail.
* The `Emacs Lisp List' at
<URL:http://www.anc.ed.ac.uk/%7Estephen/emacs/ell.html> has pointers
<URL:http://www.damtp.cam.ac.uk/user/eglen/emacs/ell.html> has pointers
to sources of a large number of packages.
* gnu.emacs.sources
@ -47,26 +47,19 @@ You might find bug-fixes or enhancements in these places.
* CC mode: <URL:http://cc-mode.sourceforge.net/>
* CPerl: <URL:ftp://ftp.math.ohio-state.edu/pub/users/ilya>
* CPerl: <URL:http://www.cpan.org/modules/by-module/CPAN/ILYAZ/cperl-mode/>
* Ediff and Viper: <URL:http://www.cs.sunysb.edu/~kifer/emacs.html>
* Eldoc and Rlogin:
<URL:ftp://ftp.splode.com/pub/users/friedman/packages/>
<URL:http://www.splode.com/~friedman/software/emacs-lisp/>
* EShell: <URL:http://www.gci-net.com/users/j/johnw/emacs.html>
* EShell: <URL:http://www.newartisans.com/johnw/emacs.html>
* Etags: <URL:ftp://pot.potorti.it/pub/software/unix/etags.tar.gz>
* EUDC: <URL:http://lspwww.epfl.ch/%7Efigueire/Software/eudc/>
* Expand: <URL:http://w3.teaser.fr/%7Eflepied/expand.el.gz>
* Find Func:
<URL:http://www.kurims.kyoto-u.ac.jp/%7Epetersen/emacs/find-func.el>
* Flyspell: <URL:http://kaolin.unice.fr/%7Eserrano/emacs/flyspell>
* Fortune: <URL:http://www.coling.uni-freiburg.de/%7Eschauer/emacs.html>
* Gnus: <URL:http://www.gnus.org/>
@ -78,26 +71,20 @@ You might find bug-fixes or enhancements in these places.
* Ispell: <URL:http://www.kdstevens.com/%7Estevens/ispell-page.html>
* Iswitchb: <URL:http://www.anc.ed.ac.uk/%7Estephen/emacs/iswitchb.el>
* MH-E: <URL:http://mh-e.sourceforge.net/>
* PC Selection: <URL:ftp://ftp.thp.uni-duisburg.de/pub/source/elisp/>
* PS mode: <URL:http://odur.let.rug.nl/%7Ekleiweg/postscript/>
* PS-print: <URL:ftp://ftp.cpqd.com.br/pub/users/vinicius/>
* PS-print: <URL:http://www.cpqd.com.br/~vinicius/emacs/>
* QuickURL: <URL:http://www.acemake.com/hagbard/archives/quickurl.el>
* QuickURL: <URL:http://www.davep.org/emacs/>
* RefTeX: <URL:http://zon.astro.uva.nl/~dominik/Tools/>
* RefTeX: <URL:http://staff.science.uva.nl/~dominik/Tools/reftex/>
* Speedbar, Checkdoc etc: <URL:http://cedet.sourceforge.net/>
* SQL: <URL:http://www.geocities.com/TimesSquare/6120/emacs.html>
* Sregex: <URL:http://www.zanshin.com/%7Ebobg/sregex.html>
* Tramp: Remote file access via rsh/ssh
<URL:http://savannah.gnu.org/projects/tramp/>
@ -146,7 +133,7 @@ Several are for Debian GNU/Linux in particular.
mirrors of the `CTAN' TeX archives.
* Dismal: spreadsheet:
<URL:http://acs.ist.psu.edu/dismal/dismal.html>
<URL:http://www.gnu.org/software/dismal/dismal.html>
* ECB: Emacs Code Browser: <URL:http://ecb.sourceforge.net/>
@ -166,7 +153,7 @@ Several are for Debian GNU/Linux in particular.
* EMacro: <URL:http://emacro.sourceforge.net/>
EMacro is a portable configuration file that configures itself.
* Emacs statistical system (ESS): statistical programming within Emacs
* Emacs speaks statistics (ESS): statistical programming within Emacs
<URL:http://ess.r-project.org>
* Emacspeak -- A Speech Output Subsystem For Emacs:
@ -183,26 +170,18 @@ Several are for Debian GNU/Linux in particular.
<URL:http://www.emacswiki.org/cgi-bin/wiki?EmacsIRCClient>
* Gnuserv:
<URL:ftp://ftp.splode.com/pub/users/friedman/packages/fgnuserv-1.0.tar.gz>
Enhanced emacsclient/emacsserver. See also
<URL:http://www.splode.com/users/friedman/software/emacs-lisp/> for
other Friedman Emacs hacks.
The latest versions of gnuserv are maintained by Martin Schwenke,
and are available from <URL:http://meltin.net/hacks/emacs/>. Also
available from this Web page: eiffel-mode.el.
<URL:http://meltin.net/hacks/emacs/>
Enhanced emacsclient/emacsserver. Also available from this Web
page: eiffel-mode.el.
* hm--html-menus:
<URL:ftp://ftp.tnt.uni-hannover.de/pub/editors/xemacs/contrib>
HTML-specific editing. Can work with PSGML.
* Hyperbole: `Hyperbole is an open, efficient, programmable
information management and hypertext system.'
From GNU distribution mirrors.
* ILISP: <URL:http://ilisp.cons.org/>
Provides an interactive environment for manipulating an inferior
process running some form of Lisp.
* Hyperbole:
<URL:http://ftp.gnu.org/pub/gnu/hyperbole/hyperbole-4.01.tar.gz>
Hyperbole is an open, efficient, programmable information
management and hypertext system.
* JDEE: <URL:http://jdee.sunsite.dk/>
Provides a Java development environment for Emacs.
@ -234,9 +213,6 @@ Several are for Debian GNU/Linux in particular.
* Planner Mode:
<URL:http://sacha.free.net.ph/notebook/wiki/PlannerMode.php>
* Pointers to MIME packages:
<URL:http://bmrc.berkeley.edu/%7Etrey/emacs/mime.html>
* Preview LaTeX: embed preview LaTeX images in source buffer.
<URL:http://preview-latex.sourceforge.net/>

143
etc/NEWS
View file

@ -813,6 +813,9 @@ black or white default foreground color. This generic shadow face
allows customization of the appearance of shadowed text in one place,
so package-specific faces can inherit from it.
+++
*** `vertical-border' face is used for the vertical divider between windows.
** Font-Lock changes:
+++
@ -882,8 +885,7 @@ This menu allows you to turn various display features on and off (such
as the fringes, the tool bar, the speedbar, and the menu bar itself).
You can also move the vertical scroll bar to either side here or turn
it off completely. There is also a menu-item to toggle displaying of
current date and time, current line and column number in the
mode-line.
current date and time, current line and column number in the mode-line.
---
*** Speedbar has moved from the "Tools" top level menu to "Show/Hide".
@ -921,12 +923,10 @@ the new dialog.
** Mouse changes:
+++
*** New display feature: focus follows the mouse from one Emacs window
to another, even within a frame. If you set the variable
mouse-autoselect-window to non-nil value, moving the mouse to a
different Emacs window will select that window (minibuffer window can
be selected only when it is active). The default is nil, so that this
feature is not enabled.
*** If you set the new variable `mouse-autoselect-window' to a non-nil
value, windows are automatically selected as you move the mouse from
one Emacs window to another, even within a frame. A minibuffer window
can be selected only when it is active.
+++
*** On X, when the window manager requires that you click on a frame to
@ -994,7 +994,7 @@ mouse-wheel-inhibit-click-time variables.
+++
*** Under X, mouse-wheel-mode is turned on by default.
** Mule changes:
** Multilingual Environment (Mule) changes:
---
*** Language environment and various default coding systems are setup
@ -1126,12 +1126,11 @@ in CNS encoding; it accepts both Big 5 and CNS as input; on saving,
Big 5 is then converted to CNS.
---
*** Many new coding systems are available by loading the `code-pages'
library. These include complete versions of most of those in
codepage.el, based on Unicode mappings. `codepage-setup' is now
obsolete and is used only in the MS-DOS port of Emacs. windows-1252
and windows-1251 are preloaded since the former is so common and the
latter is used by GNU locales.
*** Many new coding systems are available in the `code-pages' library.
These include complete versions of most of those in codepage.el, based
on Unicode mappings. `codepage-setup' is now obsolete and is used
only in the MS-DOS port of Emacs. All coding systems defined in
`code-pages' are auto-loaded.
---
*** New variable `utf-translate-cjk-unicode-range' controls which
@ -1299,6 +1298,10 @@ This option allows you to specify environment variables for inferior
compilation processes without affecting the environment that all
subprocesses inherit.
+++
*** New user option `compilation-disable-input'.
If this is non-nil, send end-of-file as compilation process input.
+++
*** New options `next-error-highlight' and `next-error-highlight-no-select'
specify the method of highlighting of the corresponding source line
@ -1631,7 +1634,7 @@ before calling it, if used while defining a macro.
In addition, when ending or calling a macro with C-x e, the macro can
be repeated immediately by typing just the `e'. You can customize
this behavior via the variable kmacro-call-repeat-key and
this behavior via the variables kmacro-call-repeat-key and
kmacro-call-repeat-with-arg.
Keyboard macros can now be debugged and edited interactively.
@ -1748,9 +1751,31 @@ recognized.
---
** The TCL package tcl-mode.el was replaced by tcl.el.
This was actually done in Emacs-21.1, and was not documented.
** The new package scroll-lock.el provides the Scroll Lock minor mode
for pager-like scrolling. Keys which normally move point by line or
paragraph will scroll the buffer by the respective amount of lines
instead and point will be kept vertically fixed relative to window
boundaries during scrolling.
* Changes in Specialized Modes and Packages in Emacs 22.1:
---
** Changes to cmuscheme
*** Emacs now offers to start Scheme if the user tries to
evaluate a Scheme expression but no Scheme subprocess is running.
*** If a file `.emacs_NAME' (where NAME is the name of the Scheme interpreter)
exists in the user's home directory or in ~/.emacs.d, its
contents are sent to the Scheme subprocess upon startup.
*** There are new commands to instruct the Scheme interpreter to trace
procedure calls (`scheme-trace-procedure') and to expand syntactic forms
(`scheme-expand-current-form'). The commands actually sent to the Scheme
subprocess are controlled by the user options `scheme-trace-command',
`scheme-untrace-command' and `scheme-expand-current-form'.
---
** Makefile mode has submodes for automake, gmake, makepp and BSD make.
@ -1813,7 +1838,7 @@ when Emacs visits them.
*** A numeric prefix argument of `info' selects an Info buffer
with the number appended to the `*info*' buffer name (e.g. "*info*<2>").
---
+++
*** isearch in Info uses Info-search and searches through multiple nodes.
Before leaving the initial Info node isearch fails once with the error
@ -1824,31 +1849,38 @@ aroung the whole manual to the top/final node. The user option
or the default isearch search function that wraps around the current
Info node.
---
*** New search commands: `Info-search-case-sensitively' (bound to S),
`Info-search-backward', and `Info-search-next' which repeats the last
search without prompting for a new search string.
+++
*** New command `Info-history-forward' (bound to r and new toolbar icon)
moves forward in history to the node you returned from after using
`Info-history-back' (renamed from `Info-last').
---
*** New command `Info-history' (bound to L) displays a menu of visited nodes.
---
*** New command `Info-toc' (bound to T) creates a node with table of contents
from the tree structure of menus of the current Info file.
+++
*** New command `info-apropos' searches the indices of the known
Info files on your system for a string, and builds a menu of the
possible matches.
---
*** New command `Info-copy-current-node-name' (bound to w) copies
the current Info node name into the kill ring. With a zero prefix
arg, puts the node name inside the `info' function call.
---
+++
*** New face `info-xref-visited' distinguishes visited nodes from unvisited
and a new option `Info-fontify-visited-nodes' to control this.
---
*** http and ftp links in Info are now operational: they look like cross
references and following them calls `browse-url'.
@ -2181,6 +2213,9 @@ line is left untouched.
The function `c-toggle-syntactic-indentation' can be used to toggle
syntactic indentation.
** In sh-script, a continuation line is only indented if the backslash was
preceded by a SPC or a TAB.
---
** Perl mode has a new variable `perl-indent-continued-arguments'.
@ -2395,7 +2430,7 @@ GDB. You can interact with GDB through the GUD buffer in the usual way, but
there are also further buffers which control the execution and describe the
state of your program. It can separate the input/output of your program from
that of GDB and watches expressions in the speedbar. It also uses features of
Emacs 21/22 such as the the toolbar, and bitmaps in the fringe to indicate
Emacs 21/22 such as the toolbar, and bitmaps in the fringe to indicate
breakpoints.
Use M-x gdb to start GDB-UI.
@ -2750,6 +2785,10 @@ See the documentation of the user option
---
*** Rmail now displays 5-digit message ids in its summary buffer.
*** The new commands rmail-end-of-message and rmail-summary end-of-message,
by default bound to `/', go to the end of the current mail message in
Rmail and Rmail summary buffers.
+++
*** Support for `movemail' from GNU mailutils was added to Rmail.
@ -2780,6 +2819,10 @@ version 5.0.2; see MH-E-NEWS for details.
** Calendar changes:
+++
*** You can now use < and >, instead of C-x < and C-x >, to scroll
the calendar left or right. (The old key bindings still work too.)
+++
*** There is a new calendar package, icalendar.el, that can be used to
convert Emacs diary entries to/from the iCalendar format.
@ -3041,6 +3084,21 @@ variable `calculator-radix-grouping-mode'.
* Changes in Emacs 22.1 on non-free operating systems
+++
** The HOME directory defaults to Application Data under the user profile.
If you used a previous version of Emacs without setting the HOME
environment variable and a `.emacs' was saved, then Emacs will continue
using C:/ as the default HOME. But if you are installing Emacs afresh,
the default location will be the "Application Data" (or similar
localized name) subdirectory of your user profile. A typical location
of this directory is "C:\Documents and Settings\USERNAME\Application Data",
where USERNAME is your user name.
This change means that users can now have their own `.emacs' files on
shared computers, and the default HOME directory is less likely to be
read-only on computers that are administered by someone else.
+++
** Passing resources on the command line now works on MS Windows.
@ -3159,6 +3217,10 @@ the command `undefined'. (In earlier Emacs versions, it used
** General Lisp changes:
*** The function `expt' handles negative exponents differently.
The value for `(expt A B)', if both A and B are integers and B is
negative, is now a float. For example: (expt 2 -2) => 0.25.
+++
*** The function `eql' is now available without requiring the CL package.
@ -3581,6 +3643,25 @@ binding of VARIABLE (a symbol) in buffer BUFFER. If VARIABLE does not
have a buffer-local binding in buffer BUFFER, it returns the default
value of VARIABLE instead.
*** The function `frame-or-buffer-changed-p' now lets you maintain
various status records in parallel.
It take a variable (a symbol) as argument. If the variable is non-nil,
then its value should be a vector installed previously by
`frame-or-buffer-changed-p'. If the frame names, buffer names, buffer
order, or their read-only or modified flags have changed, since the
time the vector's contents were recorded by a previous call to
`frame-or-buffer-changed-p', then the function returns t. Otherwise
it returns nil.
On the first call to `frame-or-buffer-changed-p', the variable's
value should be nil. `frame-or-buffer-changed-p' stores a suitable
vector into the variable and returns t.
If the variable is itself nil, then `frame-or-buffer-changed-p' uses,
for compatibility, an internal variable which exists only for this
purpose.
** Local variables lists:
+++
@ -3827,6 +3908,10 @@ operations.
This is useful for autoloaded handlers, to prevent them from being
autoloaded when not really necessary.
+++
*** The function `make-auto-save-file-name' is now handled by file
name handlers. This will be exploited for remote files mainly.
** Input changes:
+++
@ -3848,7 +3933,8 @@ using the text properties (esp. the face) of the prompt string.
*** (while-no-input BODY...) runs BODY, but only so long as no input
arrives. If the user types or clicks anything, BODY stops as if a
quit had occurred. `while-no-input' returns the value of BODY, if BODY
finishes. It returns nil if BODY was aborted.
finishes. It returns nil if BODY was aborted by a quit, and t if
BODY was aborted by arrival of input.
** Minibuffer changes:
@ -4076,8 +4162,7 @@ emacs tries to read it.
*** The new function `call-process-shell-command'.
This executes a shell command command synchronously in a separate
process.
This executes a shell command synchronously in a separate process.
*** The new function `process-file' is similar to `call-process', but
obeys file handlers. The file handler is chosen based on
@ -4644,6 +4729,13 @@ releases of Emacs, the order was the opposite. This change was made
so that :inherit face lists operate identically to face lists in text
`face' properties.
---
*** On terminals, faces with the :inverse-video attribute are displayed
with swapped foreground and background colors even when one of them is
not specified. In previous releases of Emacs, if either foreground
or background color was unspecified, colors were not swapped. This
was inconsistent with the face behavior under X.
---
*** `set-fontset-font', `fontset-info', `fontset-font' now operate on
the default fontset if the argument NAME is nil..
@ -5011,6 +5103,10 @@ running under X.
** GC changes:
+++
*** New variable `gc-cons-percentage' automatically grows the GC cons threshold
as the heap size increases.
+++
*** New variables `gc-elapsed' and `gcs-done' provide extra information
on garbage collection.
@ -14418,7 +14514,8 @@ select one of those items.
----------------------------------------------------------------------
Copyright information:
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the

View file

@ -338,7 +338,7 @@ The solution is to use gawk (GNU awk).
*** Emacs fails to understand most Internet host names, even though
the names work properly with other programs on the same system.
*** Emacs won't work with X-windows if the value of DISPLAY is HOSTNAME:0.
*** GNUs can't make contact with the specified host for nntp.
*** Gnus can't make contact with the specified host for nntp.
This typically happens on Suns and other systems that use shared
libraries. The cause is that the site has installed a version of the
@ -2418,11 +2418,11 @@ address space of a process. As the result dumping may fail even if
you turn off exec-shield. In this case, use the -R option to the setarch
command:
setarch -R i386 ./temacs --batch --load loadup [dump|bootstrap]
setarch i386 -R ./temacs --batch --load loadup [dump|bootstrap]
or
setarch -R i386 make bootstrap
setarch i386 -R make bootstrap
*** Fatal signal in the command temacs -l loadup inc dump.
@ -3561,8 +3561,8 @@ This problem will not happen if the m-...h file for your type
of machine defines NO_UNION_TYPE.
Copyright 1987,88,89,93,94,95,96,97,98,1999,2001,2002,2004
Free Software Foundation, Inc.
Copyright 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
Copying and redistribution of this file with or without modification
are permitted without royalty provided this notice is preserved.

View file

@ -93,6 +93,12 @@ to the FSF.
* Other features we would like:
** Create a category of errors called `process-error'
for some or all errors associated with using subprocesses.
** Maybe reinterpret `parse-error' as a category of errors
and put some other errors under it.
** A function to check for customizable options that have been
set but not saved, and ask the user whether to save them.
This could go in kill-emacs-query-functions, to remind people
@ -153,6 +159,8 @@ to the FSF.
which gives the same information through a menu structure. [Dave
Love started on this.]
** Add a cpio mode, more or less like tar mode.
** Implement a variant of uncompress.el or jka-compr.el that works with
GNU Privacy Guard for encryption. [Code exists but isn't assigned.
See the Gnus development sources for assigned code concerning GPG
@ -268,6 +276,9 @@ to the FSF.
** Provide portable undumping using mmap (per gerd design).
** Make byte-compile avoid binding an expanded defsubst's args
when the body only calls primitives.
** Use the XIE X extension, if available, for image display.
** Make monochrome images display using the foreground and background

View file

@ -1,5 +1,4 @@
Emacs tutorial. See end for copying conditions.
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
Emacs commands generally involve the CONTROL key (sometimes labeled
CTRL or CTL) or the META key (sometimes labeled EDIT or ALT). Rather than
@ -1104,7 +1103,8 @@ starting with the one written by Stuart Cracraft for the original Emacs.
This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the

View file

@ -1,5 +1,4 @@
Âúâåäåíèå â Emacs. Óñëîâèÿòà çà êîïèðàíå ñà â êðàÿ íà òåêñòà.
Copyright (c) 1985,1996,1998,2001,2002,2003,2005 Free Software Foundation.
Êîìàíäèòå íà Emacs íàé-÷åñòî âêëþ÷âàò êëàâèøèòå CONTROL (ïîíÿêîãà
îòáåëÿçâàí ñ CTRL èëè CTL) è META (ïîíÿêîãà îòáåëÿçâàí ñ EDIT èëè
@ -1170,7 +1169,8 @@ Dired
This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the

View file

@ -1,5 +1,4 @@
Emacs 快速指南.
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
Emacs 指令通常包含有 CONTROL 键(有时候以 CTRL 或 CTL 来标示)或是
META 键(有时候以 EDIT 或 ALT 来标示)。为了避免每一次都要写出其全名,
@ -1050,7 +1049,8 @@ issue here>
这个版本的快速指南和 GNU Emacs 一样都是版权化的,并且允许在某些条件下
散布其拷贝:
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Chinese Translation by Chao-Hong Liu (2002, 2003)
Permission is granted to anyone to make or distribute verbatim copies

View file

@ -1,5 +1,4 @@
Tutoriál k Emacsu. Podmínky viz na konci.
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
Do češtiny přeložil Milan Zamazal <pdm@zamazal.org>.
Máte před sebou tutoriál k Emacsu.
@ -1023,7 +1022,8 @@ tutori
Tato verze tutoriálu je, podobně jako GNU Emacs, chráněna copyrightem a
je šířena se svolením distribuovat kopie za jistých podmínek:
Copyright (c) 1985, 1996 Free Software Foundation
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Každému je zaručeno právo vytvářet a distribuovat přesné kopie tohoto
dokumentu tak, jak jej obdržel, na jakémkoliv médiu, s tím, že bude

View file

@ -1,5 +1,4 @@
Einführung in Emacs. Siehe Dateiende für Vervielfältigungsbedingungen.
(c) 2002, 2003, 2005 Free Software Foundation, Inc.
Emacs-Befehle beinhalten im allgemeinen die CONTROL-Taste (manchmal
auch als CTRL, CTL oder STRG beschriftet) sowie die META-Taste (auch
@ -1461,7 +1460,8 @@ geschrieben.
Beachten Sie bitte, daß im Zweifelsfalle das englische Original dieser
Urheberrechtsnotiz gültig ist (zu finden in der Datei TUTORIAL).
Copyright (c) 1985, 1996, 1997 Free Software Foundation
Copyright (C) 1985, 1996, 1997, 2002, 2003, 2004,
2005 Free Software Foundation
Hiermit wird für jedermann die Erlaubnis erteilt, wörtliche,
unveränderte Kopien dieses Dokumentes für jegliches Medium zu

View file

@ -1,5 +1,4 @@
Tutorial de Emacs. Vea al final las condiciones de copiado.
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
Generalmente los comandos de Emacs involucran la tecla CONTROL
(algunas veces llamada CTRL O CTL) o la tecla meta (algunas veces
@ -1188,7 +1187,8 @@ Por favor, en caso de duda, s
siguiente nota de derechos de reproducción (que puede encontrar en el
archivo TUTORIAL).
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Se permite a cualquiera hacer o distribuir copias literales de este
documento como se recibe, en cualquier medio, siempre que la nota

View file

@ -1,5 +1,4 @@
Didacticiel d'Emacs. Voir la fin de ce document pour les conditions.
Copyright (c) 1985, 2001, 2002 Free Software Foundation, Inc.
Les commandes Emacs utilisent généralement la touche CONTROLE (souvent
désignée par CTRL ou CTL) ou la touche META (souvent désignée par EDIT
@ -1171,7 +1170,8 @@ Cette version du didacticiel, comme GNU Emacs, est plac
copyright, et vous pouvez en distribuer des copies sous certaines
conditions :
Copyright (c) 1985, 1996, 2001, 2002 Free Software Foundation
Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Chacun peut créer ou distribuer des copies de ce document tel qu'il
l'a reçu, sur n'importe quel support, pourvu que la note de

View file

@ -1,5 +1,4 @@
Esercitazione di Emacs. Condizioni d'uso alla fine del file.
Copyright (c) 2003 Free Software Foundation, Inc.
I comandi di Emacs comportano generalmente l'uso del tasto CONTROL (a
volte indicato con CTRL o CTL) o del tasto META (a volte indicato con EDIT
@ -1094,7 +1093,7 @@ distribuito con il permesso di farne copie a determinate condizioni:
indicativo, restando comunque inteso il fatto che è quella originale a
fare fede.
Copyright (c) 2003 Free Software Foundation
Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
È permesso a chiunque copiare e distribuire attraverso ogni mezzo copie
fedeli di questo documento così come viene ricevuto, a condizione che

View file

@ -1,5 +1,4 @@
Emacs $BF~Lg%,%$%I(B. $BK\%U%!%$%k$NCx:n8"$K$D$$$F$O:G8e$r8fMw2<$5$$!#(B
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
Emacs $B$N%3%^%s%I$rF~NO$9$k$K$O!"0lHL$K%3%s%H%m!<%k%-!<!J%-!<%H%C%W$K(B
CONTROL $B$H$+(B CTRL $B$H$+(B CTL $B$H=q$$$F$"$k!K$d%a%?%-!<!J%-!<%H%C%W$K(B META
@ -1048,7 +1047,8 @@ starting with the one written by Stuart Cracraft for the original Emacs.
This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the

View file

@ -1,5 +1,5 @@
$(C@L8F=:(B(Emacs) $(CAvD'<-@T4O4Y(B.
$(C@z@[1G(B (c) 1985, 2001 Free Software Foundation, Inc; $(C3!?!4B(B $(C:9;g(B $(CA60G@L(B
$(C3!?!4B(B $(C:9;g(B $(CA60G@L(B
$(C@V=@4O4Y(B. $(CAv1](B $(C@P0m(B $(C@V4B(B $(C@L(B $(C1[@:(B $(C@L8F=:(B(Emacs) $(CAvD'<-@T4O4Y(B.
$(C@L8F=:(B $(C8m7I5i@:(B $(C4k03(B $(CA&>n<h(B (CTRL$(C@L3*(B CTL$(C@L6s0m55(B $(CG%=C(B) $(CH$@:(B
@ -989,7 +989,8 @@ C-x C-s$(C?M(B (META$(C<h3*(B EDIT$(C<h(B $(CH$@:(B $(C13C<<h0!(B $(C
GNU $(C@L8F=:?M(B $(C00@L(B $(C@L(B $(CAvD'<-(B $(CFG@:(B $(C@z@[1G@L(B $(C@V@88g(B $(CF/A$GQ(B $(CA60G@;(B $(C88A7GR(B
$(C6'?!(B $(C:9;g:;@;(B $(C9hFwGR(B $(C<v(B $(C@V4B(B $(CGc0!8&(B $(C0.0m(B $(C3*?B(B $(C0M@L4Y(B:
$(C@z@[1G(B (c) 1985, 1996 Free Software Foundation
Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
$(C@L(B $(C9.<-4B(B $(C@L(B $(C@z@[1G(B $(C0x0m?M(B $(CGc?k(B $(C0x0m0!(B $(C1W4k7N(B $(C@/Av5G0m(B, $(C9hFw@Z0!(B
$(C<vCk@Z?!0T(B $(C@L(B $(C0x0m?!(B $(C5{6s(B $(CGc?k5G4B(B $(C0MC373(B $(C6G(B $(C@g:P9hGO4B(B $(C0M@;(B

View file

@ -1,5 +1,4 @@
Emacs-inleiding. De kopieervoorwaarden staan onderaan.
Copyright (c) 1985, 1996, 1997, 2003, 2004, 2005 Free Software Foundation
De meeste Emacs-commando's gebruiken de CONTROL-toets (soms CTRL of CTL
genaamd) en/of de META-toets (soms genaamd EDIT of ALT). In plaats van
@ -1205,7 +1204,8 @@ het Engelse origineel.)
Deze versie van de inleiding valt onder copyright, net als GNU Emacs.
Je mag deze inleiding verspreiden onder bepaalde voorwaarden:
Copyright (c) 1985, 1996, 1997, 2003, 2004, 2005 Free Software Foundation
Copyright (C) 1985, 1996, 1997, 2003, 2004,
2005 Free Software Foundation, Inc.
Iedereen mag letterlijke kopieën van dit document, zowel ontvangen
als verspreiden, op elk medium, vooropgesteld dat de
@ -1229,7 +1229,8 @@ software te gebruiken, te schrijven en te delen!
This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (c) 1985, 1996, 1997, 2003, 2004, 2005 Free Software Foundation
Copyright (C) 1985, 1996, 1997, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim
copies of this document as received, in any medium, provided that

View file

@ -1,5 +1,4 @@
Krótki samouczek Emacsa. Warunki kopiowania znajdują sie na końcu pliku.
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
Polecenia Emacsa wymagają na ogół wciśnięcia klawisza CONTROL (oznaczanego
czasami Ctrl lub CTL) lub klawisza META (oznaczanego czasami EDIT
@ -1218,7 +1217,8 @@ z pomoc
Ta wersja samouczka, podobnie jak GNU Emacs, jest chroniona prawem
autorskim, ale wolno kopiować pod następującymi warunkami:
Copyright (c) 1985, 1994, 2001 Free Software Foundation
Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Zezwala się na wykonywanie lub rozpowszechnianie
wiernych kopii tego dokumentu w otrzymanej formie, na dowolnym

View file

@ -1,5 +1,4 @@
Tutorial do Emacs. Veja no fim as condições para cópia.
Copyright (c) 2004, 2005 Free Software Foundation.
Os comandos do Emacs geralmente envolvem a tecla CONTROL (algumas vezes
nomeada CTRL ou CTL) ou a tecla META (algumas vezes nomeada EDIT ou
@ -1064,7 +1063,7 @@ Essa vers
<marcelo@gnu.org> e como o GNU Emacs, tem um copyright, e vem
com uma permissão de distribuição de cópias nas seguintes condições:
Copyright (c) 1985, 1996 Free Software Foundation
Copyright (C) 2004, 2005 Free Software Foundation, Inc.
Permissão é garantida a qualquer um para fazer ou distribuir copias
integrais deste documento como recebido, em qualquer meio, deixando

View file

@ -1,5 +1,4 @@
Tutorialului de Emacs. A se citi sfârºitul pentru condiþii.
Copyright (c) 1998 Free Software Foundation
Traducere din englezã de Tudor Hulubei <tudor@gnu.org>.
Mulþumiri Aidei Hulubei <aida@chang.pub.ro> pentru corecturi ºi sugestii.
@ -1092,7 +1091,7 @@ continuare no
This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (c) 1985, 1996 Free Software Foundation
Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the

View file

@ -1,5 +1,4 @@
Учебник Emacs. Условия распространения приведены в конце файла
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation, Inc.
Для управления Emacs обычно используется ключ (key -- сочетание клавиш
клавиатуры и/или кнопок мыши), включающий в себя клавишу CONTROL (иногда
@ -669,7 +668,7 @@ meta-
C-x Расширение с помощью ввода префикса. За ним следуем один символ.
M-x Расширение набора команд с помощью их наименования. За ним следует имя
ËÏÍÁÎÄÙ.
команды.
Это полезные команды, но они используются менее часто, чем те команды,
которые мы изучили. Вы уже видели некоторые из них: команды работы с файлами
@ -1132,7 +1131,8 @@ Dired
(copyrighted), и приходит с ограничениями распространения копий со
следующими соглашениями:
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
@ -1151,7 +1151,7 @@ Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
обеспечения ("владение"), используя, создавая и распространяя свободное
программное обеспечение!
// ÚÁÍÅÞÁÎÉÑ, ÉÓÐÒÁ×ÌÅÎÉÑ ÏÛÉÂÏË Ó ÖÄÕ ÐÏ ÁÄÒÅÓÕ alexott@gmail.com.
// замечания, исправления ошибок с жду по адресу alexott@gmail.com.
// Alex Ott.
;;; Local Variables:

View file

@ -1,5 +1,4 @@
Tútorial k Emacsu. Podmienky pozri na konci.
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
Do češtiny preložil Milan Zamazal <pdm@zamazal.org>, do slovenčiny Miroslav
Vaško <zemiak@zoznam.sk>.
@ -1082,7 +1081,8 @@ t
Táto verzia tútorialu je, podobne ako GNU Emacs, chránená copyrightom
a je šírená s povolením distribuovať kópie za istých podmienok:
Copyright (c) 1985, 1996 Free Software Foundation
Copyright (C) 1985, 1996, 1998, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Každému je zaručené právo vytvárať a distribuovať presné kópie tohto
dokumentu tak, ako ho dostal, na akomkoľvek médiu, s tým, že bude

View file

@ -1,5 +1,4 @@
Prvo berilo za Emacs. Pogoji uporabe in raz¹irjanja so navedeni na koncu.
Copyright (c) 1985, 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
Ukazi v Emacsu v splo¹nem vkljuèujejo tipki CONTROL (vèasih oznaèeni
CTRL ali CTL) in META (vèasih oznaèena EDIT ali ALT). Namesto, da bi ju
@ -1115,7 +1114,8 @@ Emacs. V sloven
To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo
razmno¾evanje in raz¹irjanje je dovoljeno pod naslednjimi pogoji:
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Dovoljeno je izdelovati in raz¹irjati neokrnjene kopije tega spisa
v kakr¹nikoli obliki pod pogojem, da je ohranjena navedba o

View file

@ -1,6 +1,4 @@
Emacs användarhandledning. I slutet finns kopieringsvillkoren.
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software
Foundation, Inc.
Emacs användarhandledning. I slutet finns kopieringsvillkoren.
Emacs-kommandon innebär ofta användning av kontrolltangenten (vanligen
märkt CTRL eller CTL) eller META-tangenten ( vissa tangentbord märkt
@ -310,9 +308,9 @@ texten. Tecken som du kan se, s
sätts in direkt. Skriv <Return> (retur-tangenten) för att sätta in en
radbrytning.
Du kan radera det sista tecknet du skrev genom att trycka <Delback>.
Du kan radera det sista tecknet du skrev genom att trycka <Delback>.
<Delback> är en tangent tangentbordet -- samma som du normalt
använder utanför Emacs för att ta bort det senaste tecknet du skrivit.
använder utanför Emacs för att ta bort det senaste tecknet du skrivit.
Det är vanligen en stor tangent några rader ovanför retur-tangenten,
och den är vanligtvis märkt "Delete, "Del" eller "Backspace".
@ -325,7 +323,7 @@ mark
>> Gör detta nu: Skriv in några tecken och ta bort dem genom att
använda <Delback>. Var inte rädd för att skriva i den här filen,
du kommer inte att kunna förändra originalet till vägledningen.
du kommer inte att kunna förändra originalet till vägledningen.
Detta är bara en lokal kopia.
När en rad blir för lång för att rymmas en skärmbredd fortsätter
@ -408,7 +406,7 @@ raderar s
en repetition av kommandot. C-u 2 C-k raderar två rader samt de tomma
raderna, medan C-k två gånger inte kommer att göra det.
Att sätta in borttagen text kallas att "återhämta" den (yanking).
Att sätta in borttagen text kallas att "återhämta" den (yanking).
(Tänk det som att du rycker, eller drar, tillbaka någon text som
tagits bort.) Du kan antingen hämta tillbaka borttagen text till samma
plats som där den blev borttagen, eller kan du sätta in den en
@ -593,7 +591,7 @@ Emacs-f
>> Skriv C-x 1 för att bli kvitt buffertlistan.
När du har flera buffertar är bara en av dem "gällande" åt gången.
När du har flera buffertar är bara en av dem "gällande" åt gången.
Det är den buffert du redigerar. Om du vill redigera en annan buffert
måste du byta till den. Om du vill byta till en buffert som
motsvarar en fil kan du göra det genom att besöka den igen med C-x
@ -615,7 +613,7 @@ skapades med C-x C-b. Bufferten "*Messages*" motsvarar inte heller
någon fil. Den innehåller de meddelanden som visas den nedersta
raden i Emacs sessionen.
>> Skriv C-x b *Messages* <Return> för att se meddelandebufferten.
>> Skriv C-x b *Messages* <Return> för att se meddelandebufferten.
Skriv sedan C-x b TUTORIAL.sv <Return> för att återgå till den här
handledningen.
@ -979,7 +977,7 @@ Ibland kan du hamna i n
huvudläget i lägesraden. Till exempel kan det stå [(Fundamental)]
istället för (Fundamental).
För att komma ur rekursiv redigering trycker du <ESC> <ESC> <ESC>.
För att komma ur rekursiv redigering trycker du <ESC> <ESC> <ESC>.
Detta är ett generellt brytkommando. Du kan också använda det för att
bli kvitt extra fönster och för att komma ut ur minibufferten.
@ -1099,7 +1097,7 @@ ett mail och klaga!
----------------
Du kan lära dig mer om Emacs genom att läsa dess manual, antingen i
bokform eller on-line i Info (använd Hjälp-menyn eller skriv F10 h r).
bokform eller on-line i Info (använd Hjälp-menyn eller skriv F10 h r).
Två finesser som du kan komma att gilla speciellt är komplettering
(completion), som spar tangenttryckningar, och dired, som förenklar
filhantering.
@ -1128,7 +1126,8 @@ Lidell
This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the

View file

@ -970,7 +970,8 @@ starting with the one written by Stuart Cracraft for the original Emacs.
This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (c) 1985, 1996 Free Software Foundation
Copyright (C) 1985, 1996, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the

View file

@ -1,7 +1,6 @@
Emacs 快速指南(.
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
Emacs 指令通常包含有 CONTROL 鍵(有時候以 CTRL 或 CTL 來標示)或是
Emacs 指令通常包含有 CONTROL 鍵(有時候以 CTRL 或 CTL 來標示)或是
META 鍵(有時候以 EDIT 或 ALT 來標示)。為了避免每一次都要寫出其全名,
我們將會使用下述的縮寫:
@ -15,7 +14,7 @@ META
重要備忘錄:要離開 Emacs 作業階段( session ),鍵入 C-x C-c (兩個字
元)。位在左側邊界的「>>」字元是讓您可以試著使用的指令的提示。舉例來說:
<<Blank lines inserted around following line by help-with-tutorial>>
[Middle of page left blank for didactic purposes. Text continues below]
[Middle of page left blank for didactic purposes. Text continues below]
>> 現在鍵入 C-v View next screen )以移到下個螢幕。
(試試看,鍵入字元 v 時,按住 CONTROL 鍵)
從現在開始,您應該在每次閱讀完目前的螢幕時做一次這個動作。
@ -24,7 +23,7 @@ META
提供一些連續性,讓您可以接續地閱讀文字。
您需要知道的第一件事是如何在文字中移動。您已經知道了可以 C-v 來向前移
動一個螢幕。要向後移動一個螢幕,則鍵入 M-v (按住 META 鍵,然後鍵入 v
動一個螢幕。要向後移動一個螢幕,則鍵入 M-v (按住 META 鍵,然後鍵入 v
,或是如果您沒有 META 、 EDIT 或 ALT 鍵時鍵入 <ESC>v )。
>> 試著鍵入 M-v 然後 C-v ,連續個幾次。
@ -74,7 +73,7 @@ META
>> 以 C-n 或 C-p 將游標移到圖形的中央。
鍵入 C-l 會看到整個圖形顯示在螢幕的中央。
您會發現用字母所代表的意義來記憶它們很容易P 表示 previous 、 N 表示
您會發現用字母所代表的意義來記憶它們很容易P 表示 previous 、 N 表示
next 、 B 表示 backward 、而 F 則表示 forward 。您將「總是」用到這些游
標移動指令。
@ -172,9 +171,9 @@ META
然後再重複地使用 M-v 回到這裡。
如果您的終端機有方向鍵的話,您也可以用方向鍵移動游標。我們有三個理由建
議您學習 C-b 、 C-f 、 C-n 、 和 C-p (1) 任何的終端機都能使用。(2)
議您學習 C-b 、 C-f 、 C-n 、 和 C-p (1) 任何的終端機都能使用。(2)
一旦您使用 Emacs 相當熟練了,您會發現鍵入這些 CONTROL 字元,比起使用方
向鍵快多了(因為您不需要將手移開打字區)。(3) 一旦您使用這些 CONTROL
向鍵快多了(因為您不需要將手移開打字區)。(3) 一旦您使用這些 CONTROL
字元指令成為習慣,您也可以很容易地學會其他進階的游標動作指令。
大部份的 Emacs 指令接受數字參數;對大部份的指令而言,它的作用是指定重
@ -194,7 +193,7 @@ META
出現,而不管其值為何,它們讓這指令做些不一樣的事。
C-v 和 M-v 則是另一類的例外。當給定一個參數時,它們捲動「所指定的數量
的行以行為單位而不是以「螢幕」為單位捲動。舉例來說C-u 8 C-v
的行以行為單位而不是以「螢幕」為單位捲動。舉例來說C-u 8 C-v
將顯示螢幕捲動 8 行。
>> 現在試著鍵入 C-u 8 C-v。
@ -261,25 +260,25 @@ Emacs
>> 鍵入 C-x 1 以使文件列表窗格消失。
這個指令並不像您先前所學過的指令那般,它包括了兩個字元。它是以字元
這個指令並不像您先前所學過的指令那般,它包括了兩個字元。它是以字元
CONTROL-x 作為開始。有一整個系列的指令是以 CONTROL-x 作為開始;它們之
中有許多是與「窗格、檔案、暫存區以及相關事物」有關的。這些指令有 2 、
中有許多是與「窗格、檔案、暫存區以及相關事物」有關的。這些指令有 2 、
3 或 4 個字元長。
* 插入與刪除( INSERTING AND DELETING
----------------------------------------
如果您想要插入文字,把它鍵入就是了。您可以看到的字元,像是 A 、 7 、 *
等,被 Emacs 視為文字並且可以直接插入。鍵入 <Return>
如果您想要插入文字,把它鍵入就是了。您可以看到的字元,像是 A 、 7 、 *
等,被 Emacs 視為文字並且可以直接插入。鍵入 <Return>
carriage-return 鍵)以插入一個 Newline 字元。
您可以鍵入 <Delback> 以刪除您最後鍵入的字元。<Delback> 是一個的鍵盤鍵
您可以鍵入 <Delback> 以刪除您最後鍵入的字元。<Delback> 是一個的鍵盤鍵
-- 就是您通常在 Emacs 外,使用來「刪除您最後鍵入字元」的同一個。一般來
說是個在 <Return> 上方數行的大鍵通常標示為『Delete』、『Del』或
『Backspace』。
如果在那裡有個標示為『Backspace』的大鍵那麼那一個就是您使用來作為
如果在那裡有個標示為『Backspace』的大鍵那麼那一個就是您使用來作為
<Delback> 的鍵了。某個地方可能也會有另一個標示為『Delete』的鍵但那個
並不是 <Delback> 。
@ -325,13 +324,13 @@ CONTROL-x
C-k 刪除從游標所在到「行尾」間的字元
M-k 刪除從游標所在到「句尾」間的字元
注意「<Delback> 和 C-d」還有「M-<Delback> 和 M-d」是平行地自 C-f 和
注意「<Delback> 和 C-d」還有「M-<Delback> 和 M-d」是平行地自 C-f 和
M-f 擴充出來的(嗯,<Delback> 並不是控制字元,但是沒什麼好擔心的)。
C-k 和 M-k 在某種程度上與 C-e 和 M-e 一樣,如果把「一行」和「一句」作
為類比的話。
您也可以只以一種方法來刪除緩衝區內的任何部份,先移動到您想要刪除的部份
的一端,然後鍵入 C-@ 或 C-SPC (任一個即可)。( SPC 指的是 Space Bar
的一端,然後鍵入 C-@ 或 C-SPC (任一個即可)。( SPC 指的是 Space Bar
)再移到那部份的另一端,接著鍵入 C-w 。這樣就會把介於這兩個位置間的所
有文字刪除。
@ -368,7 +367,7 @@ C-k
>> 試試看;鍵入 C-y 將文字拉回。
如果您連續地做了數次 C-k所有被殺掉的文字都會被儲存在一起因此做一次
如果您連續地做了數次 C-k所有被殺掉的文字都會被儲存在一起因此做一次
C-y 就會把所有這些行都拉回來。
>> 現在做一下,鍵入 C-k 數次。
@ -401,7 +400,7 @@ C-y
如果您對文字做了一些改變,後來覺得它是個錯誤,您可以 Undo 指令取消這一
個改變C-x u。
通常 C-x u 會把一個指令所造成的改變取消掉;如果您在一行中重複了許多次
通常 C-x u 會把一個指令所造成的改變取消掉;如果您在一行中重複了許多次
C-x u每一個重複都會取消額外的指令。
但是有兩個例外:
@ -422,12 +421,12 @@ C-_
* 檔案( FILE
----------------
為了使您編輯的文字永久保存,您必須把它放到一個檔案中。不然,當您離開
為了使您編輯的文字永久保存,您必須把它放到一個檔案中。不然,當您離開
Emacs 後,它就會隨之消失。為了把您的文字放在檔案中,您必須在您鍵入這些
文字前「找( find )」檔案。(這也稱之為「拜訪( visiting )」檔案)
找一個檔案表示您可以在 Emacs 中看到檔案的內容。從許多方面來看,它就像
是您直接編輯那個檔案一樣。然而,直到您「儲存」這個檔案之前,您使用
是您直接編輯那個檔案一樣。然而,直到您「儲存」這個檔案之前,您使用
Emacs 編輯所做出的改變並不會保存下來。這就是為什麼當您不想要時,您可以
避免留下修改到一半的檔案在系統中。即使當您儲存了Emacs 也會把原本的檔
案以一個不同的名稱保留下來,若您稍後覺得您的改變是一個錯誤的話,就可以
@ -446,7 +445,7 @@ TUTORIAL.zh
C-x C-f 找一個檔案
Emacs 會要您鍵入檔名。您所鍵入的檔名會出現在螢幕的底行。在被用來作為這
種形式的輸入時,底行被稱為小緩衝區( minibuffer )。您可以使用正常的
種形式的輸入時,底行被稱為小緩衝區( minibuffer )。您可以使用正常的
Emacs 編輯指令來編輯這個檔名。
當您正在鍵入檔名時(或是任何的小緩衝區輸入時),您可以用 C-g 這個指令
@ -477,7 +476,7 @@ Emacs
注意:在某些系統中,鍵入 C-x C-s 將會把螢幕凍結,您將看不到從 Emacs 來
的任何輸出。這表示作業系統一個稱為「流程控制」的「功能」將 C-s 指令攔
截住,並且不讓它傳到 Emacs。要取消螢幕的凍結請鍵入 C-q。然後到 Emacs
截住,並且不讓它傳到 Emacs。要取消螢幕的凍結請鍵入 C-q。然後到 Emacs
使用手冊中看看對於「漸進式搜尋的同時進入( Spontaneous Entry to
Incremental Search )」這個主題,以取得處理這個「功能」的建議。
@ -528,7 +527,7 @@ Emacs
您在一個 Emacs 窗格中所見到的「任何」文字總是某個緩衝區的一部份。有一
些緩衝區並沒有連接到檔案。舉例來說,命名為「*Buffer List*」的緩衝區並
沒有任何檔案。它是包含有您以 C-x C-b 指令所製作出來的緩衝區列表的緩衝
區。命名為「*Messages*」的緩衝區也沒有連接到任何檔案;它在您的 Emacs
區。命名為「*Messages*」的緩衝區也沒有連接到任何檔案;它在您的 Emacs
作業階段中包含出現在底行的訊息。
>> 鍵入 C-x b *Messages* <Return> 來看看訊息的緩衝區。
@ -593,10 +592,10 @@ C-z
以擴充來命名的指令通常是不太常使用的指令,或是只在特定的模式下才會使用
的指令。一個例子是取代字串指令,它會全域地將一個字串以另一個來取代。當
您鍵入 M-x 時Emacs 會在螢幕的底端詢問您,然後您也應該鍵入這個指令的
名稱。在這個例子中是『replace-string』只要鍵入『repl s<TAB>』,然後
名稱。在這個例子中是『replace-string』只要鍵入『repl s<TAB>』,然後
Emacs 將會補齊這個名稱。以 <Return> 來結束這個指令名稱。
取代字串指令需要兩個參數 -- 被取代的字串以及用來取代它的字串。您必須以
取代字串指令需要兩個參數 -- 被取代的字串以及用來取代它的字串。您必須以
Newline 字元來結束每一個參數。
>> 將游標移到本行的下兩行空白,然後鍵入
@ -605,7 +604,7 @@ Newline
【為了說明的目的,於下保留一行原文。
Notice how this line has changed: you've replaced... 】
請注意這一行是怎麼改變的:在游標的起始位置之後,您已經將 c-h-a-n-g-e-d
請注意這一行是怎麼改變的:在游標的起始位置之後,您已經將 c-h-a-n-g-e-d
這個字 -- 不管它在哪裡出現 -- 以「altered」這個字來取代了。
@ -665,7 +664,7 @@ Emacs
一個主模式是一個延伸指令的名稱,使得您可以用來切換至那個模式。舉例來說,
M-x fundamental-mode 就是切換到 Fundamental 模式的一個指令。
如果您想要編輯人類語言的文字檔案 -- 像是現在的這一個,您應該使用 Text
如果您想要編輯人類語言的文字檔案 -- 像是現在的這一個,您應該使用 Text
模式。
>> 鍵入 M-x text mode<Return>。
@ -679,7 +678,7 @@ M-x fundamental-mode
子,接續上面所開的頭,以程式語言的註解來說。同樣一個插入註解的動作,因
為您使用的程式語言/主模式的不同而不同。若您使用 C 語言Emacs 插入
『/* 介於中間的為註解區塊 */』;若您使用的是 Fortran 語言Emacs 插入
『c 以字元 c 為首的為註解行』;若您使用的是 Basic 語言Emacs 則插入『'
『c 以字元 c 為首的為註解行』;若您使用的是 Basic 語言Emacs 則插入『'
撇號以後的為註解文字』。編輯器的彈性如此,實在沒有必要為了不同的語言、
目的或外觀,設計特殊化的編輯器。「求大同,存小異」在這裡也是成立的。】
@ -714,7 +713,7 @@ mode
然後鍵入一些文字,看看 Emacs 以 20 個字元,
在行與行之間進行 fill 動作。然後再用一次 C-x f 將邊界設回 70。
如果您在一個段落的中間做出改變Auto Fill 模式並不會為您重新進行 fill
如果您在一個段落的中間做出改變Auto Fill 模式並不會為您重新進行 fill
的動作( re-fill )。要 re-fill 這個段落,鍵入 M-q (META-q),而游標必
須處在其中。
@ -747,7 +746,7 @@ Emacs
>> 鍵入 <Return> 結束搜尋。
您有沒有看到發生了什麼在一個漸進式搜尋中Emacs 試著要走到您鍵入的字
串的下一個出現位置。要移動到游標所在的下一個出現位置,只要再鍵入 C-s
串的下一個出現位置。要移動到游標所在的下一個出現位置,只要再鍵入 C-s
一次。如果並沒有這樣的出現位置存在Emacs 會嗶一聲,並告訴您目前的搜尋
「失敗」。另外 C-g 也可以用來結束搜尋。
@ -799,7 +798,7 @@ Emacs
指令 C-M-v 在當您於一個窗格中編輯文字,並使用其他的窗格作為參考之用時,
是非常有用的。您可以將游標一直保持在您正在編輯的窗格中,並以 C-M-v 指
令在其他的窗格循序地前進。【驗證工作特別適合以這種方式來進行,如 GNU
令在其他的窗格循序地前進。【驗證工作特別適合以這種方式來進行,如 GNU
中譯小組:找一個原始英文檔案;再找它翻譯好的中文檔案,編輯這個「被選擇
的窗格」,以 C-M-v 指令跟上驗證中的段落……。】
@ -833,7 +832,7 @@ C-M-v
--------------------------------------------
有時候您會進入所謂的「遞迴編輯階層」。它是由位在狀態行的方括弧所指明,
並且包含住以小括弧來指明的模式名稱。舉例來說,您可能會看到
並且包含住以小括弧來指明的模式名稱。舉例來說,您可能會看到
[(Fundamental)],而不是 (Fundamental)。
要離開遞迴編輯階層,請鍵入 ESC ESC ESC。這是個全功能的「離開」指令。您
@ -848,7 +847,7 @@ C-M-v
* 取得更多的幫助( GETTING MORE HELP
---------------------------------------
在本快速指南中,我們試著僅提供剛剛好的資訊讓您可以開始使用 Emacs。在
在本快速指南中,我們試著僅提供剛剛好的資訊讓您可以開始使用 Emacs。在
Emacs 中有太多可取得的資訊,想要在這裡全部解釋是不可能的。然而,您也許
會想要學習更多 Emacs 相關的資訊因為它有許多其他有用的功能。Emacs 提
供了「閱讀有關 Emacs 指令」的指令。這些「help」指令都以 CONTROL-h 這個
@ -856,7 +855,7 @@ Emacs
要使用 Help 功能,鍵入 C-h 字元,然後再鍵入一個說明您所需要的幫助的字
元。如果您真的不知道要問什麼那麼請鍵入『C-h ?』,此時 Emacs 將會告訴
您它能夠提供的幫助。如果您已經鍵入 C-h但發現您並不需要任何幫助鍵入
您它能夠提供的幫助。如果您已經鍵入 C-h但發現您並不需要任何幫助鍵入
C-g 來取消掉它就是了。
(有些網站將 C-h 這個字元的意義改變了。他們真的不應該把它設為對所有使
@ -864,7 +863,7 @@ C-g
時,如果 C-h 並沒有在窗格的底部顯示任何有關幫助的訊息,試著鍵入 F1 鍵,
或是 M-x help <Return>。)
最基本的 HELP 功能是 C-h c。鍵入 C-h字元 c以及一個或一串字元然後
最基本的 HELP 功能是 C-h c。鍵入 C-h字元 c以及一個或一串字元然後
Emacs 會顯示一個非常簡短的有關這個指令的解釋。
>> 鍵入 C-h c C-p。
@ -877,7 +876,7 @@ Emacs
於函數名稱是由「用來指出這指令在做些什麼」而被選定,它們因此也可以作為
非常簡短的文件 -- 足夠提醒您已經學過的指令。
多字元指令像是 C-x C-s 和 (如果您沒有 META 或 EDIT 或 ALT 鍵)<ESC>v
多字元指令像是 C-x C-s 和 (如果您沒有 META 或 EDIT 或 ALT 鍵)<ESC>v
也可以在 C-h c 後面出現。
要取得更多有關一個指令的資訊,用 C-h k 來取代使用 C-h c 。
@ -933,13 +932,13 @@ find-file
可能會特別喜歡的功能特色是可以節省打字量的 completion 還有簡化檔案處理
的 dired 。
Completion 是一種避免不必要的打字的方式。舉例來說,如果您想要切換
Completion 是一種避免不必要的打字的方式。舉例來說,如果您想要切換
*Messages* 緩衝區,您可以鍵入 C-x b *M<Tab> ,只要可以從您已經鍵入的文
字中確定, Emacs 就會將剩下的緩衝區名稱補齊。 Completion 是在 Emacs 使
用手冊的 Info 中稱為「Completion」的節點中所解釋的。
Dired 使您可以在一個目錄中列出檔案(次目錄則是可選的)、在列表中到處移
動、拜訪、重新命名、刪除以及對檔案作操作。 Dired 是在 Emacs 使用手冊的
動、拜訪、重新命名、刪除以及對檔案作操作。 Dired 是在 Emacs 使用手冊的
Info 中稱為「Dired」的節點中所解釋的。
使用手冊也解釋了許多其它 Emacs 的功能特色。
@ -948,7 +947,7 @@ Info
* 結論( CONCLUSION
----------------------
記住,要完全離開 Emacs 請使用 C-x C-c 。要暫時離開到 shell稍後再回到
記住,要完全離開 Emacs 請使用 C-x C-c 。要暫時離開到 shell稍後再回到
Emacs請使用 C-z 。
本快速指南對於所有的新手應該都是易於理解的,所以如果您發現了什麼地方不
@ -958,9 +957,9 @@ Emacs
* 翻譯( TRANSLATION
-----------------------
本快速指南的翻譯人員列表如下,如果您在閱讀本文之前,「完全」對 Emacs
本快速指南的翻譯人員列表如下,如果您在閱讀本文之前,「完全」對 Emacs
沒有概念,請告訴我們您的意見以作為本文後續的改進依據。翻譯也提供了一份
《GNU Emacs 中文處理說明》在
《GNU Emacs 中文處理說明》在
http://www.gnu.org/software/chinese/guide/emacs-chinese.zh.html 〈部份
內容已經整理到本快速指南〉,也請您自行參閱。
@ -1050,7 +1049,8 @@ issue here>
這個版本的快速指南和 GNU Emacs 一樣都是版權化的,並且允許在某些條件下
散佈其拷貝:
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Chinese Translation by Chao-Hong Liu (2002, 2003)
Permission is granted to anyone to make or distribute verbatim copies

View file

@ -13,7 +13,8 @@
% Typical command to format: tex calccard.tex
% Typical command to print (3 cols): dvips -t landscape calccard.dvi
% Copyright (c) 1987, 1992, 2001 Free Software Foundation, Inc.
% Copyright (C) 1987, 1992, 2001, 2002, 2003, 2004,
% 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -60,7 +61,7 @@
\def\versionnumber{2.03}
\def\versiondate{November 2001}
\def\year{2001}
\def\year{2005}
\def\version{v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill

View file

@ -394,3 +394,10 @@ checking FONTCONFIG_CFLAGS...
g++ -o foo.o foo.cc
tool1 -output=foo foo.x
tool2 --outfile foo foo.y
Compilation started at Wed Jul 20 12:20:10
Compilation interrupt at Wed Jul 20 12:20:10
Compilation killed at Wed Jul 20 12:20:10
Compilation terminated at Wed Jul 20 12:20:10
Compilation exited abnormally with code 1 at Wed Jul 20 12:21:12
Compilation finished at Thu Jul 21 15:02:15

View file

@ -1,5 +1,5 @@
% Reference Card for Dired
% Copyright (C) 2000 Free Software Foundation, Inc.
% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
% Czech hyphenation rules applied
\chyph
@ -47,7 +47,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{0.1}
\def\year{2000}
\def\year{2005}
\def\version{May \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill

View file

@ -11,7 +11,8 @@
\columnsperpage=1
% Copyright (c) 1987, 1993, 1996, 1997, 2001 Free Software Foundation, Inc.
% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
% 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -65,7 +66,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{2.2}
\def\year{1997}
\def\year{2005}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.

View file

@ -21,7 +21,7 @@
\endinput
\fi
% Copyright (c) 2000, 2004 Free Software Foundation, Inc.
% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -49,7 +49,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{1.0}
\def\year{2000}
\def\year{2005}
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter

View file

@ -7,7 +7,8 @@
\columnsperpage=2
% Copyright (c) 1987, 1993, 1996, 2000 Free Software Foundation, Inc.
% Copyright (C) 1987, 1993, 1996, 2000, 2002, 2003, 2004,
% 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -52,7 +53,7 @@
% If there were room, it would be nice to see a section on Dired.
\def\versionnumber{2.1}
\def\year{1996}
\def\year{2005}
\def\version{March \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill

View file

@ -1,5 +1,6 @@
% Reference Card for Dired
% Copyright (C) 2000. 2001 Free Software Foundation, Inc.
% Copyright (C) 2000, 2001, 2002, 2003, 2004,
% 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -40,7 +41,7 @@
\def\versionnumber{0.1}
\def\year{2000}
\def\year{2005}
\def\version{May \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill

View file

@ -2,7 +2,8 @@ File: edt-user.doc --- EDT Emulation User Instructions
For GNU Emacs 19
Copyright (C) 1986, 1992, 1994, 1995, 1999, 2000 Free Software Foundation, Inc.
Copyright (C) 1986, 1992, 1994, 1995, 1999, 2000, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Author: Kevin Gallagher <kevingal@onramp.net>
Maintainer: Kevin Gallagher <kevingal@onramp.net>

View file

@ -1,4 +1,5 @@
.\" Copyright (C) 1995, 1999, 2000, 2001 Free Software Foundation, Inc.
.\" Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004,
.\" 2005 Free Software Foundation, Inc.
.\"
.\" This file is part of GNU Emacs.
.\"
@ -535,7 +536,7 @@ Joachim Martillo and Robert Krawitz added the X features.
Copyright
.if t \(co
.if n (c)
1995, 1999, 2000, 2001 Free Software Foundation, Inc.
1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
.PP
Permission is granted to make and distribute verbatim copies of this
document provided the copyright notice and this permission notice are

View file

@ -1,6 +1,6 @@
"""Definitions used by commands sent to inferior Python in python.el."""
# Copyright (C) 2004 Free Software Foundation, Inc.
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
# Author: Dave Love <d.love@dl.ac.uk>
# This file is part of GNU Emacs.

View file

@ -9,28 +9,30 @@ emacsclient \- tells a running Emacs to visit a file
.SH "DESCRIPTION"
This manual page documents briefly the
.BR emacsclient
command.
This manual page was written for the Debian GNU/Linux distribution
because the original program does not have a manual page.
Instead, it has documentation in the GNU Info format; see below.
command. Full documentation is available in the GNU Info format; see
below.
This manual page was originally written for the Debian GNU/Linux
distribution, but is not specific to that system.
.PP
.B emacsclient
works in conjunction with the built-in server of Emacs.
.B emacsclient
works in conjunction with the built-in Emacs server.
.PP
You typically do not call
You can either call
.B emacsclient
directly. Instead, you set the environment variable EDITOR
to
.B emacsclient
and let programs like 'vipw' or 'bug' or anything run
it for you, which will use an existing Emacs to visit the file.
directly or let other programs run it for you when necessary. On
GNU and Unix systems many programs consult the environment
variable EDITOR (sometimes also VISUAL) to obtain the command used for
editing. Thus, setting this environment variable to 'emacsclient'
will allow these programs to use an already running Emacs for editing.
Other operating systems might have their own methods for defining the
default editor.
For
.B emacsclient
to work, you need an already running Emacs with a server. Within Emacs, call
.B emacsclient
to work, you need an already running Emacs with a server. Within Emacs, call
the function
`server-start'. (Your `.emacs' file can do this automatically if you
add the expression `(server-start)' to it.)
add the expression `(server-start)' to it.)
When you've finished editing the buffer, type `C-x #'
(`server-edit'). This saves the file and sends a message back to the
@ -54,23 +56,25 @@ immediately without waiting for you to "finish" the buffer in Emacs.
do not visit files but instead evaluate the arguments as Emacs
Lisp expressions.
.TP
.B \-s, \-\-socket-name=FILENAME
Use socket named FILENAME for communication.
.TP
.B \-a, \-\-alternate-editor=EDITOR
if the Emacs server is not running, run the specified editor instead.
This can also be specified via the `ALTERNATE_EDITOR' environment variable.
.TP
.B \-d, \-\-display=DISPLAY
tell the server to display the files on the given display.
.TP
.B \-V, \-\-version
print version information and exit
.TP
.B \-h, \-\-help
print this usage information message and exit
.SH "SEE ALSO"
The program is documented fully in
.IR "Using Emacs as a Server"
available via the Info system.
.SH BUGS
If there is no running Emacs server,
.B emacsclient
cannot launch one. I use a small Perl script instead of raw
.B emacsclient
to do it (it works only with systems which have BSD sockets, which is fine
for Debian GNU/Linux).
.SH AUTHOR
This manual page was written by Stephane Bortzmeyer <bortzmeyer@debian.org>,
for the Debian GNU/Linux system (but may be used by others).

View file

@ -136,7 +136,7 @@ emacs(1)
Copyright
.if t \(co
.if n (c)
2001 Free Software Foundation, Inc.
2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
.PP
Permission is granted to make and distribute verbatim copies of this
document provided the copyright notice and this permission notice are

View file

@ -1,4 +1,5 @@
.\" Copyright (c) 1992, 2001 Free Software Foundation
.\" Copyright (C) 1992, 2001, 2002, 2003, 2004,
.\" 2005 Free Software Foundation, Inc.
.\" See section COPYING for conditions for redistribution
.TH etags 1 "23nov2001" "GNU Tools" "GNU Tools"
.de BP
@ -288,7 +289,7 @@ Stallman.
Copyright
.if t \(co
.if n (c)
1999, 2001 Free Software Foundation, Inc.
1999, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
.PP
Permission is granted to make and distribute verbatim copies of this
document provided the copyright notice and this permission notice are

View file

@ -1,6 +1,6 @@
% Reference Card for Dired
% Copyright (C) 2000 Free Software Foundation, Inc.
% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -41,7 +41,7 @@
\def\versionnumber{0.1}
\def\year{2000}
\def\year{2005}
\def\version{Mai \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill

View file

@ -8,7 +8,8 @@
\columnsperpage=1
% Copyright (c) 1987, 1993, 1996, 1997 Free Software Foundation, Inc.
% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
% 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -53,7 +54,7 @@
% If there were room, it would be nice to see a section on Dired.
\def\versionnumber{2.2}
\def\year{1997}
\def\year{2005}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.

View file

@ -22,7 +22,7 @@
\endinput
\fi
% Copyright (c) 2000, 2004 Free Software Foundation, Inc.
% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -44,7 +44,7 @@
% Translated to french by \'Eric Jacoboni <jaco@teaser.fr> in November 2001
\def\versionnumber{1.0}
\def\year{2000}
\def\year{2005}
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter

View file

@ -11,7 +11,7 @@ Version 1.1, March 2000
Copyright
.if t \(co
.if n (c)
2000 Free Software Foundation, Inc.
2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies

View file

@ -112,7 +112,8 @@
\newcommand{\Copyright}{%
\begin{center}
Copyright \copyright\ 1995 Free Software Foundation, Inc.\\*
Copyright \copyright\ 1995, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.\\*
Copyright \copyright\ 1995 Vladimir Alexiev
$<$vladimir@cs.ualberta.ca$>$.\\*
Copyright \copyright\ 2000 Felix Natter $<$fnatter@gmx.net$>$.\\*

View file

@ -24,7 +24,7 @@ was done by moi, yours truly, your humble servant, Lars Magne
Ingebrigtsen. If you have a WWW browser, you can investigate to your
heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
;; Copyright (C) 1995 Free Software Foundation, Inc.
;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
;; Keywords: news

87
etc/grep.txt Normal file
View file

@ -0,0 +1,87 @@
* Introduction -*-grep-*-
This shows the different kinds of messages grep recognizes by default and
how they are rendered. It is intended both to help you decide which matchers
you need and as a test of the matchers. Move the mouse over a colored part
to see how much text was actually matched.
Please do not edit this file in grep-mode, it may lose escape
sequences on saving. Visit this file literally for editing.
* GNU grep 2.5.1
grep -nH -e "INFO tree" ../info/*
../info/dir:6:File: dir Node: Top This is the top of the INFO tree
* GNU grep 2.5.1 with default colors
grep -nH --color=always -e "INFO tree" ../info/*
../info/dir:6:File: dir Node: Top This is the top of the INFO tree
* GNU grep 2.5.1-cvs with the specified matching color
GREP_COLORS='mt=01;31:fn=:ln=:bn=:se=:ml=:cx=:ne' grep -nH --color=always -e "INFO tree" ../info/*
../info/dir:6:File: dir Node: Top This is the top of the INFO tree
* GNU grep 2.5.1-cvs with colors for the file name, line number and match
GREP_COLORS='mt=01;31:fn=35:ln=32:bn=:se=:ml=36:cx=37:ne' grep -nH --color=always -e "INFO tree" ../info/*
../info/dir:6:File: dir Node: Top This is the top of the INFO tree
1:2:3:4:text
1:2:3:4:text
1:2:3:4:text
* GNU grep 2.5.1-cvs with default colors
grep -nH --color=always -e "INFO tree" ../info/*
../info/dir:6:File: dir Node: Top This is the top of the INFO tree
* GNU grep 2.5.1 on lines starting with a number and colon
grep -nH -e "Universal Time" ../lispref/*
../lispref/os.texi:1010:0:00 January 1, 1970 UTC (Coordinated Universal Time)
* GNU grep 2.5.1 with context lines
grep -C 2 -nH --color=always -e "INFO tree" ../info/*
../info/dir-4-looking at that node, which is (dir)Top.
../info/dir-5-
../info/dir:6:File: dir Node: Top This is the top of the INFO tree
../info/dir-7-
../info/dir-8-The Info Directory
* GNU grep 2.5.1 on files recognized as binary
Binary file emacs-7 matches
Binary file 2005-06 matches
* GNU grep 2.5.1: other messages
Grep started at Tue Jul 19 15:41:30
grep: ../info/dirinfo: No such file or directory
Grep interrupt at Tue Jul 19 15:42:31
Grep killed at Tue Jul 19 15:42:31
Grep terminated at Tue Jul 19 15:42:31
Grep exited abnormally with code 2 at Tue Jul 19 15:42:31
Grep finished with no matches found at Tue Jul 19 15:43:12
Grep finished (matches found) at Thu Jul 21 15:02:15
* agrep
agrep -n "INFO tree" ../info/*
../info/dir: 6: File: dir Node: Top This is the top of the INFO tree
* unknown greps
grep -nH -e "xyzxyz" ../info/*
../info/emacs-2:1205:10:inserts `xyzxyzxyzxyz' in the current buffer.
../info/emacs-2:1205:10-15:inserts `xyzxyzxyzxyz' in the current buffer.
../info/emacs-2:1205.10-1205.15:inserts `xyzxyzxyzxyz' in the current buffer.
../info/emacs-2 1205.10-15 inserts `xyzxyzxyzxyz' in the current buffer.
../info/emacs-2 1205.10-1205.15 inserts `xyzxyzxyzxyz' in the current buffer.
../info/emacs-2 1205 inserts `xyzxyzxyzxyz' in the current buffer.
;;; Local Variables:
;;; buffer-read-only: t
;;; End:

View file

@ -1,6 +1,6 @@
%!PS-Adobe-2.0
%%Creator: dvips(k) 5.92b Copyright 2002 Radical Eye Software
%%Title: org-ref.dvi
%%Title: orgcard.dvi
%%Pages: 2
%%PageOrder: Ascend
%%Orientation: Landscape
@ -8,9 +8,9 @@
%%DocumentFonts: CMBX10 CMR8 CMTT8 CMR7 CMSY8 CMBX8 CMTI8 CMR6 CMSY6
%%EndComments
%DVIPSWebPage: (www.radicaleye.com)
%DVIPSCommandLine: dvips -t landscape -o org-ref.ps org-ref.dvi
%DVIPSCommandLine: dvips -t landscape -o orgcard.ps orgcard.dvi
%DVIPSParameters: dpi=600, compressed
%DVIPSSource: TeX output 2005.07.04:0825
%DVIPSSource: TeX output 2005.08.30:1410
%%BeginProcSet: texc.pro
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@ -1934,357 +1934,364 @@ A95CD2B6F18935C37F49E9A73E97A8602C5C26EE13D7A04A188336FCAB4CDEE0
23DE9D803FD6E8D846B3F729BD36137E834E016242CD2F7BF048959DD45AD413
19B985D05E5D422F3D0968375EA6A90FBEBF8B42B15F15280469D69629C08A42
1C298CC027CC288B9C984239ABB96B6A891C1360D08F9ECC22202861E4CE9B39
8BF32D2E5635B6583D04BC0AA187D10FE773067ACF3B528CD412ED96902B0056
567103E3FD911A099ADDB9EAEB3C08F1B36A918FE865B7DAE1C49F21650E65F0
C6845C15740631BCB7618A3266D83E54976BCDC707883E531F3F833AD0DE88A0
CDB84D8384602B992263C3C223D1B5393DC98C75EFF9AD8D98A764228C70A303
28D87B1A5510A579D01088C26D9667DB86F72FA302A3A8EEF7E05DD1835E72C0
66A0728CB0DD8C34BA1D772886333BC78C79374026347FAC9CED39B7FBA84DEC
E70EABA29B80B4E813C0E6D5ECA5E9ECDF0413AF7556EA458C3C3B49A4B14A05
3034C04E1F8665532D053F810683C957050FCF44C5D4040CF09893DBF641D68C
0969D67BEBBA6DA451D446DCF87B8243365E7158D89332FB33CA28F0A83A7A63
D22A0948A46F0AB9B2CDECECDA40FA75B046CED41C017FF79FBD7380CF33D726
B03304BF8EE1EE450C065BC8B83643AA74F8D45924181D1D0C52CE78C36DFE66
99CFBD08406AB9FDCC61242472612AF009F8625C966AC9A7228B85912CA77A9C
832F9D14190A1DC798D4E99B5D067A020FAD7E13E2E5A155A94E46853CB93619
39183DAAB590F1BE12C3C4B0209A93CB015E58EEA72C0F71E68EDF1CAD4CA776
9320076D70BD2874A166F2CF735BD5154F9FBB219C868A568A7C176060F78092
1E3661E66B7E0A8DCF294E09D487AD7F7D1ABEF83E7E0E5BDC60D672A4D8F5A2
4C33479DB4FB7105158E19C62FB0E1B9749E6A9D4BFDF7884B1922C4C48265FB
7851C1116696C02337B64F1A0445396102B541EE1CA10D8311F79CC58F2106D0
12FF6B1D274B810AF318BEF04467B5066889896BBF019F63DD5DAC53EDB1CD7F
AD10D90B2D3CE615546860B11AFD0D6B705DAC7545579DDD3ED867F31615CF4E
F3E4BBD8527C9C3CB4DEBE71F1AC965A69A1C6E244BD5A49FC81135A587EA904
A863FF7D421C407EDE08825D78924635E6968CAC4399D231C785C9048FD8C916
0B2676DB4D91487B862B25F68DBBD03B604BD875420565855CCBEF9AF0793964
4FD45E490EFE697A470FA3C60192E660C45083E27B9E569DD1DBE07706975B9C
9AF2851279A7630999C92E9867F55D56CBBA0CA13A0F041CD0F3ADB318A0D298
ED48F8288691BB2CE08B6A73E9FA89DAF661F201947BD64C1EB769EA3A0C6FC0
3DC343AEF2379881E46627AD2F653B4C6BC37E8D8452C3A7E399C0B6B3D93671
F51A92EEA7712A872D0BEBEBB071C83D9254A24C8799CCB5D2FF4DB31075483F
3743AE4BD1CEECE6B9432BB89399FE62B87DAB3B19FA924FCC1F6C3DCA1B0049
51024011B8670DCE537387069A8732AC4ADDD77B2A0D5D97105810854595C4E8
0663FD917B5B587B8ADA22351D79F5E5AD494FADE90336AFC27FF9FE8BC770D6
0A8D6FBE6E45B3D4DB20E91A53D84C8B100813CEB9A81B03E142748475EEE77A
892B3458A3AAD744A20ACD28C7AA6C5A996C9A9900F2D6B3C1169DF3BF2B1A9A
56EF83195431EE89A89CCA5A0EB6A59D7D89179B6C127BA0981FE0122E4184A8
FA9094D9C3D54BB7CBA31FD03C7048A09AE67C956A5363F5D51ABB19CA264D9D
5D515F61DBD9C35D259950530A95350A313CFA8CF06413ABEF844771BF99590E
F9A2F28975AFD00D700E83A59A3F0B7238CC74A8C1C9DB059C84DD91F1E07580
C4C1311FF1C4AF2AFAA07CDCE72B0928663109CB31DE1548C72EA321F0EAFE9A
ACE0E0BBD840254E30D9A46162DACC79A07F21BA056BD90AD312A2D728CB94F5
FDD65516843523741D2430C5338FDB4274162B8C0409ABF94581C1A3D8636BCB
78A98069466C0C869BA08047E9C154DC6FF00A1DDCC2C4AF4D5DA5437BD02616
C0139731CAA7817984BE614D6D41E9C21AEA1CBC9E56C783F68364023CB95387
C71A72D9DCD59222964D04650181988D140295091175DD985F5B53B070D20B89
5E4B621C848C9370E0687B45EB1070A688A94BE949D242AA6266ED2D64C2518C
4A5E75442F030E137D2E3BD654C4E4EDAFF7B46EEDCC9090D537B6CE01DD6D0F
1872A47A04ECDED2421B511118B0628148D2289B74B79B3A68CA7A2547D644B5
2ABB83CBBFFE319957FD2189E272DA2C2E35DACA8EE229F37EB4C94C920A65C7
165A2ACFF7B92CE4338F3030E157CC75281E1F33AF00386FBE6003C4C8CDB57C
4EA70A31E2CD15FE6732F98BE47354C2F92AF632B5BA1C7ACCA3633ED13919BA
106E6ABCBDC11006BA4560AFB17C7091BC1A632E7870B65717656A89EE550576
B5D3BD5DD829886BA59D186770871C3D293EBED70D66EE3AEA926F2AE6AC6CEE
30CE46B99DCEA2D15384C53D08C6F1A083A24C025D92832E16E816B893B3F2F6
68BDF430788D1167B14633E0AD0FD74951C5826BE0F4B8CDD23CFAA88907C43D
1678FB2C4053E0E2056BC4B33F36A896D1BC212B0262B6CB59AB3A5ADCC027C9
EA6A2C0F1EA2DC6B88517BF08AF54C9B1A4A7B0A4BB9A66ABECB539BB6BA1F9F
313F2A5619949D0FEF977DFB87ABB8B8DD420F3097B2B8BEC00EA5A3E8C207CF
508C7CA5133CA63B98A14E11FB57BB7C461D7C8C767DB10E68BCEA1D5A4B7F29
7AE639BFD660B1CFC78DEF00CD1278833E48A65BE281C9438976BBB475AC6818
C533FB4D2F4D3727B68F533D03554393D66FEFDAD1A3BE79FCEF05B98A5D9EF3
71F4D16E531408B2D866286CB89B50DAAE9978B96C8BEA869F9E90B780F0C98C
1618C4F6FDDA21820BBA795B0AF3D00F96635FC5062544317A62A37060F965CF
3BF8A9C7B5C3D74914E0AF04AFFDA0FB1D1E644E2FB8125E94C480B4ED41FF6B
DE326A771B82A9C44B4DAA194D3C2A8855CA293787D7D5F466A2587860B64408
6F14F78C085F63E6B63AC41FE7574E5E22C723202B7D42A1BE0D14A299231F75
66FB900C2A030D0E09EF5107F9905A5C66E6A5648FBA2B8E80217160EB797496
FE3D4904C8E3B6FDE528D1B931C369AE5115114B3701CD40B57457341D735576
ABE1907500771C3EC5F562B63DCA85FAF5769ABF0F8F74A678E508A59802F1E1
B11545E6C8697D1A7FBD4ED7A5DE57778DF66E04AD354E5A45E199615C6CBFC7
7F6C232D710E8CD5F9953DDFE922B2CF50F02F65A96E1BEF0C1FE6B5C52415B9
052B9C062B532A6B83260D13AB6D3B2A48D780E03B4519F4A2152B82D1A90359
7CC62EBC5F26608232CDB89D2CD44F0E889AF80B1A9F8C0B9DE0EED9787D70AA
AFE3DEF464503D9E56674C9BCD0BC65876F2F455C83412E8FCAC08ADE7F8E2AE
CDA7A57425C7ACEF0D58CC85F71D8512B32D9C06AC001382A4095FEA02E2BF2B
A7EB6C298B10CD398780A7120CE9A31DE391C349AA273C890F620172CC434C23
33265359372A5451C4DACF0C859BA6D37AAAADD08D2F85DCDA2399D894840D7D
AD9870DD307B9D602661D7ACA2F84FAFDFFABF5A89AFA9973161DC1CF3A3943D
CB84A9C241C8B6D6CBAFD2DDC75166C3C2D5994DF4D2C60739F34E7805582A15
76191F4150309E55FA04EF8A59C4DF8EF1C95E57F0C255B63C82A7775D4CF3BD
A3C56600BB869D411A5ABE7EC6C67437B328DFF2F2BD6267A43D69B6788802B9
249DAE42336C2A3DE75816951644C742C36C51F120943DE8B75052EE4405A346
E157546DCB7D845D81AEB84E70B857B9152C3FA6D5F3BAEC8611C14F67B54DAC
F58BBDBAD4C473C0DA872330902A46610865EB0EF8F97078841AF74758F0E6E6
3DBA2B1659FB937AADD1C8A612C61F0C1A9636F0624E64D6D92966D892F44F09
48A4BDFC9A83C267ACEF143585C51ED45F59126AF7EBCEC2B9584B0FC6C1E670
FC382E476B6C33071A9FD3FC2D0F943DBE055BAEDAD6702DC0F474F9B2DAFFFB
C0AF48B326EC447E31210586B7DCD517FB61F4D4870A5E467492F40CCEAA4F2D
B06BF4FD8B31D9650D032A0A28E1D413162C649352784A0414C474A82DC471FF
1FFBDAE7795DDB8BF3DF22C393E939F5634C540DFE2590D71BC1444BBD79A9D9
7261CAC5207814AAA58D8B135A52A3D3174110FAE364257A6F79AB3B73B52A0A
EF08DC05593BD0327BEA4697339E45996E5D6812D166165790D8E4543C130DC5
34725E44BB037555803390CAF9F94FD6BC08AFC3ACE747B9728D8CF0128D5B4E
1275C4BD7E50AB5F980DB3C3281E3FC4A500FC6DD0038D35F4F5589679647238
FD7EE68BFA9AE20EB140B7277073E6F26C7EF556FD311D510C92E89B70762F42
410ED318AFD46F66F605E98D1EF12F00727B3B3F21F695241B4B5863FB1C27E9
6BBD4365B9AEEFE8A18AFE350731AAA0ED817498539433027D50C8D38284E888
1E6A1E6CD54F851B264E2FC4597A6A4FE03C7CFFF7D1F75CEF43E97B22096A1B
D8BE2DC4A899E64492359B346D9C0051361B6AE9DF079BDF21FBD274597B3C02
4D0FB1C66B8AE0AAFCE0C1CAC54BEFE069C0BE9505EB0B1AE60869B63C396698
EF594E1C8E5995AD22DAD027BDBA4BF2FA9B570E8F0FA3CAEECEF6DB8C4819E4
AEBD7165A655F1B7828527DCA9D01324FBFEEDD6797C8E3E9E17B760C70D7AF8
8EC0AEBBB2C448DFDA6B6B4BEB43291772174F1C369DBD1C4183C8E00A4DB46F
208C324163E0BDE572A84B85393892545249DB26457AF5FB311CD5EAA11D7F9C
3E491B0D49C77898AD873381077DF84EF4498C012D7752B22F0660810B6EC0F8
B66D447775AD659C51D3893CD2B4509E8B9D1413A99527F720571784E7B9302B
92175F1FCA726E8AD6D82B9B7E853FFA5739D0DE0A02BB115DABF83B1E4DE706
C23532EE82BD57109F9A7A4E6A87DB4FF5C698B04003312F1BA23AEEE22162EF
F22F7D338554AB08625B26D74F7D23772532A371AEDA9CC2962B0B665393FF04
0B032502628AC491E593D0D450757AB016B2C74C6AD44594E0FEC2F880B578CB
5C4D6A409FD6B64B9F1BD7CD8B69676814D169609D2ADB2F1E98F6C8F1A16D90
63FEB3C8FC663DE0CCA1C5CFF03828FD1DF28678492DA710EA61B9096A173CA5
FA8A85DCE00EA42ACCA03EF856F3F17FA32A69DF9F73C46944705C5DC20A7535
34CCC3878E878A0BAC55B7D56CE2C43C102D0AB841BD4A3C5EA0379D321413C8
6C2DF639D4EEA521E0A1C68D8B60319EB999707001795562E8AED4ABFAA486FD
C11D4F12ED45A04DC72264A882C97510C91F2DD77E3D5685DB2CE52C4746F613
AD98EF16AA9773CB00735151B7D4B9315441BC3B8BDDA5ACF619F49B6052AFAB
0F19D9ACFC8D6E0CA79A25A8360F9749EF39FB60404E318BB1A98EEAD98FA0E8
40DFD76BC3A84404F7D3904BFB2EE3597D8364EA556E4F7D18F32F1D86D10287
8AE46984461ED91AE22B6EFE0CE5511921B539122DA3EB48707B8ABFCCF2E6F3
9408D626EBD0C2A1A87827ABAAF02873B675AB54BC6CB5B40E697471320BB686
9D845AD686DCA663AB31B4C2A1915C55A814FBA82E77736F7F258C1AE7B42449
FD341CE08D65E648A3FB4DE280353F79FD70578A0C38C963461BE98100EE4084
CC1DEF4E35B10BB81C632FF1AB4511B80C881A729EAB34C9E9D217E3A57EFC52
6B73AAB4911830A00BA599013AD3BB83BD3DBC7445C316172B3B8A22B8148ADC
FF33379CBA195094D2C2CCAE0E260D8DFEC35153BB3533BE014F456A108C9D62
5C21C1BCD3CB9D7AA0DB74AE571A88AF6BEDDB6DE3DAF92AE60187819E8EB8A6
7CC1CCBB5F23E63A107EC8143F0F69B62CFC95605231FE605A989407218AE464
C2B566EB86E1075B0D8FF788B726FDA5F5F2D8743C39224C2231A46426F3B6AC
747E69C46AC322733DC052641526E775F10924F0AF404C37BD47369986746AEE
ECC7CAAC1B2CF6E5D86A46F4F6AAA2BB7707BA4D89F1B46DA3024A84228E1A5C
BA5EDB68205AE6971A255381FC06BC03644D67B082FD503F502B28141D437C84
E809F5C78BA5FBD5B8D51C012C3EFCA915505897C8099F0938EC15464FF4EAAD
2012A1239E0251BB126F4E400C170BD1C47656CC010235236733633CE22A43D6
3E043B687B32BAC9EDB90DEA0D0B0015E8C1DE4EE0B0E0C10F2F50F4E35B31BC
915A1D984614AC0B10AF2FF1B28FC135D07072C0530C50FB6ABEBC1592CAB0C7
2FF36245ECB609DD787852E5509AA57B3EC5F6186B16A4EF52ADF58D7ECD1D34
B2BDC2BA556F7915F5293A8CB3F44E707A57F6CDBD91E90F9146874311F25B80
A7348FA90D09459843F842FCCECFE4025D12B2BF2B61CA32E6F72B8618390560
0157F80C82BC6A54B9F0289215D94C662CCFA55EFD0650B0ED761D98C65BD47C
F7CD595FEF1C7DA57F3B79FD55ABBCE8D30B1D0DE32994D52F8885A87F0C109B
D90052BCEF87DE36DB4A852E910C792C094D0D0228C53D20ADA83280C79E9100
8AF8888CAB9835D6CE65D7FE36B18F365C4F6324DD5670157B37AF55B205F460
D10A0D16CDCDA78539CF166ACECEF425A1740B7C8F02D13F2A86070416AD9AF7
BD30314C6DC920E3CB78117564ABB1195397CD66FC92F54B5F1535C15E02F763
C92A2F3F4CD1FEAD965306DF3614D0362B0191492905777B75D8D1C6F5064A1F
111B7EFE43756B4F0996030C00503EFC5351D388C150BEC0FDA5AB0E218423E5
78F87F1B7684AFA6DC450EF115ACF8AC2C8DFF33AD39FEA1008A46EA9D6BABBF
B5F220B209770EF010154C87A4BC067315192ACEECE255BC6A5896C2F4963170
576E250C3F8520E1E413A30A1C17F50F6E8D2DD87EC02320176F355709D75320
D1747ABB9EA215793CAF3BDAC8F5C0812A630FE85D7FFC3AD199E5D83B068C44
B757C8A127C3993C01E25FD94725415298FCFA762ED456DD7DBEDDA2F7AB71E6
A289E0F59FAF62E3A2CB6A0995CC06838C8F9A6E19226B0E0953E2BA3764BBDC
257212FA3143D2B67D308AD49A0B245F0A97B09919C307B326D575F1F865ADBC
E292206795305174C193A4CABB0044936E51BF95D0B13E81F2C64248F1D9749E
CEC22448489B2AC1D766933B570E3471B4917ECB1D66E0A4779B084B1D22074D
108867FEC1329F5B30FA344C19FABB7C09A50F49A5B0A1C42413B3ED9FC39B36
500AD32B07AEE4A5C0DFE29DAC2C6FEC431842A473EB710293F23774FB448E51
3EB6B4A27D98078B2A4DF3A5F0F41308374765C86C0A879641FAD025EB77D7BC
9328E717E2EE4AEF31A3FD23573DDB8E81F20F6499FC2BB4C94D3F1054785E0E
6F3B8D6176EDA6E386FCBB034F6E82F6FE43CB83AA1147B05D51BBB03C477F54
38FC98086DE0E04722C5F0CBF9270E0DFB928EC7387710118513A3C97C0D6A9C
D67BBC5AA5DA3A33BB0F534096582355E0B3BFF7E6536FBF496FE4E05F006F88
C7C28672CC58838790821AA48534FCFB8DFD4EBA9C94E4F50E0B9E046651F779
E11B8915503682E7FDD90F05DFFCC5A009CE64FBBD223E2634DC95803805F4D1
C27B4D543FA3EF2B222DAAACF40C526B2A1563C0968E7F2FB22489810A530519
100FB442B5F972F960FF6BD86A19A1F297F93DDFF83CE2347EA3F861596B961D
4FEDC423B8262ED0F0352DA19F07ED09117CA72EFF0CA7B666EA45493D1E1317
559D4B5D278F107042D276C9AFA6A093ED696867BC1041E5F25B11C1687C8C1A
72DB2FCD4B632FC212D774785F2D3579BC0DBDDBC8CCFBCF7B686ED3BD92D4F5
378CDE86406399B059198B66E88BB9EF7E572C6460C36B0F2FA3E19AC56F93EE
60F1F7BCE76F0AF284C3F41C8BB69F7D34B4644AECA4E9324CE2EE4E4044F4EE
7B9C28E8B454D894445AB47B05F7B4B94529808A007A5E3A7D323F661F9D9C0B
B5BF1C24FAE9D951AF26493C3C9302C4C040A33E94E6596246511185628C7A02
15D33184493337E2543B1D82FD5ABF4F47E894E809C51DE0ABE163D378910FF1
717FA82AD420E076611F5559AA027F1F82433B4B103CC1541D342330D9BE4592
9B9112E1FAACB0FFD59326ABB3A352C54D097E0B79A91A0CB39B77AABC40D191
C895ECDE7E9439DD2098E2D81E56F13F178CB8DFDCA5759C4580BF1DCF7AA3AE
83F2D998FF3B9789DDD4B2A3E1F5CEEEAB48CB410F5C07DD3FBB4C362BE0D32B
5BEA9A428692EC6585A20F11A5C73FA22D023131B1B416AC0B2F4A4C801863BB
D43B180F82391830064FBCC5A233E3ABC5B30C1FF8155C61E589604EC6C16E48
F3C676C95C57B8E9D4305C1B1C7ECD75B3A5C7F8B8849AA1B46FDDD928D92B21
D0B6FFBAD0B71D101EC153669E32324C497CD26093D0D2E4AA197F9D5E459C50
709C64D20552A3B9DA9475D3658C302B5E7EAE0DAD3F9270A327A6644AF5C3FB
8338C062F33478E38E82C09510F27C2FD1FB2D304355F28B35C9EDFA0AAED925
F2D1493BECA291483EB47FF0442C3692D29D10FA92ADF3C9AD85D5AC09D35949
166DBEBAF7D425DBDF179F8BCF21912C5A2123E869DE9A9CEB4803F2C04414BE
45DF573DB40F5B9E42406F49862C7B23826CCCB05E76BA23BAA5A17CDA93D4EB
59569951158FC068E32ABDD8930D6C4C58A7DE1D39030E3B818E3382938F466E
47E8189A6B902AEE4798286CF0C032E0F2AD018380C904C2F4EC61ED98CCDF25
9E2C691BE9812FD5E0CE01F2C94134C9F0C05F4B7F1260DEC20B9907E1B5D372
8677FB4F0485ED87A3F6EA1A647072D635F7E2838649CFE37A4FF8182882BF7E
9474583F4E9D3548795E0A63D4859BD27B662D156DD893B3799371DB1BC75A38
0F454EBF825D683CF2CBC8B308AEE9D8FF8EBB8A7DEA067AEFE8CC77331156CB
20210ADE2B5DD0A9F77BB6E98F3630800BF33915E73E515B34E58516D1AD87B5
00A8969EE2595D2365AD69FA4F67CCAA7D243B8D03FB39CA136DC1E5FD434750
8A329F7D11DC4D33F6A0BEC9A23E5EE1A18FD5C3640E3F30FC2D8CCE5630E618
A273CACED00DA6F094148C5D6751DD983A2823418223E715DBE8ED167B2D1999
650D0FD8685884BCF1D6147C162BDBBB6597DCEAED3B5CAA75F301D46F2F770A
CA1C8997E99D16CC0A58572FE1D68383D87335A38AF8C27556FF19CC421B8BE1
8AF89CDBB98273BF4E43025A710B4ACB5D7F2C77249CF1756282B74CE43F037B
F62DEC52EA41330A2783B5E64F72392EE25FCE9A7E872F4A9AA7BB41E5368888
6DC531A2E602696EDA1CD3DCF808F62176E9198AAE9CA8925038D41E17570FD2
E976F627F7213AC8EE1B2BC240871B7CC1C61B81BAA031B8396536AA62A67DE7
63FBDFCFD363DB5CE786230B302B786A859C48BBA8CC27EADB1FBC84F1059FA1
3A02148B4CEF5DA6D90664E72DC6F3EA267E4102102F18D79FFBE4E2A642E94E
F3D9376838236476B1030A0C47D28F4E7EF6358D213AC0A95391659FE736010D
355826A83F7FBEDF3164FF177C16C41789E84F375C6FEFEA767DF654B0533E98
A1430FEE50F41D39D41DC2ED6EA7EE1FCAB31FCE526D5556E89D36F3B402C5E1
C0CCEAFA157772B77556AAC8F874A019EAE0A797BCF85655A7834D4DC32D388F
F3E48C0F7B338BBA1C9E949C5C0BC1A727A77FEBE57E1421FF81FE4AA81869FE
86EF313CAD75613726AB3F7508BC904A7E55F092A16D605802D36509525EE2E0
18B8CE25A0BEC74D167F9E766E30C4EB0D7914F4DA044FD895F3A9C196E23256
9033CF1E352E82193458B6CFD32238CC93CCBB0E05E8E6AED8CB27157BB148C5
C644977C16D7F4FC50DA22A28CF8F945B5E0209C8D715E8E7D9D80F32FEACD13
E6928F4BB60E9684C0F865C9D0C2EEA5EDB0A355FB16426A2405D124F3A01977
1DE108F66E30EE01ECAA74FE0DEC9A6D485B084FA8A38EC3A59B23FD35B72F87
ABC6B7D73EDA44DEAC4AA7285D15339EAC0B54B52FEC5B7EA723622704A3DE1C
AAD548509991E18B3AD4CAC7FCBA320ED3989A185CAFA4E22A42E1B5C209F774
F5FDE4CF0FD23978F3C37BC3EB97A0AA9B9CBC66538FF705F8F7E2C3CD58A359
40958DC811EBBD7F16902417BC1C97C3D409E4039E0569C6826D22923806BBCA
E601CFEB9B249597BF69BB74FA9607EA9CAC2DE0C8B958574B715D64D5E2AE19
DF262825913DE26CB598B36E6F8168F7641A58018B9ADBF73237113B9FBB958F
1A3CF592672A51EE2463CD7F22F058597DB9C7316CCD49EFAEFB6A20646E0DDF
794C0A9DFB62A42FC95483D7F578BA3163317AEB14561F49F6E2A909B7C92370
2592FF0614A1AAB9AC39E93A2DE2D38330AA56BD51D1FD225D0DDA8E91B94267
127CADEC25E9769512EE28557E051F516329445C31D75E19711CEFDF77224F25
8B590ABB3BCACF4C3620142B0401F7218BA00C67A748A2DA5F784EF53521F536
7110D64B659B7BCD26E03F6D35A6EA3452A8F33B4A4E580AEDBC83E7D882BF65
AACBDB77189BD88AD8A0CAB62EA74CD673A9B37AD1C40065C309BB399045594D
7BCACB882630E12489BD5E049F217C8498287D768B4D0BF904BF0BE1C6340D18
C14229DE0AC87C1FB28EAF752A2C88FB5B80A4EA1066F11DD918A2FB2E18DBD8
384E38D2B645EB843A019723C71FEA7C4D02621308D92FD72A10522EFB409D8B
9A5E51F4AA9D768ED428750A6F34FBFEF6FDBF163B13F6FF96450BC2DE22D65D
F7F0F5223CFD29524C61D0070228ED1113C58F48FA3154E53E67567B46F7040F
B03DAD476D4B4A2705ED9521BD22F48AE00AD101CD53BD79B7172ADBB6D4C4CD
951D9CB787F957A1177A7F967A3B867D48A74A0EFF9ACB491BAAB6C997896895
2F3A1DCFFDC2D71659F916C1630ECE089BF7318201DAEE72972A8AFD0C69D5BE
B5DBBF85ACF39AEEEB8CD634A58D4AD84A49E75E39A5799D53DDAACB7CC08310
23D44AEEC34D256B1C6C208CF20E986B5F52A866FBE4221FF02A77459AA91933
4DDA62FD7070BBA306D113FFE2F96090AD748C09470FEB4FFD0CF8C72EA68FB9
3F00F3F93A56DE5659A40ECAFEDF5E3CF327CBF8DAC7DF31F0F02EC416863D12
2787C56399B9BE4AB5DEF7D7E185FF02521844F75C48D1ADEA4C0D8436B3A780
8A55EB846C5CFFFC5D207B0F269DB3DAA7E06FFFAD34ED5A49BFFE73CAA09B6D
AF0C693F71CE69B77FC1378A3C4790CBE8B5546FFF134AE8CB103DD6376EF16E
03501532E3F725E58F36089E3718C635EF95FE9921EEDB08F0CFAEDDFBFB3336
517AE8ECA540F6918563EAB9D1B5E5BFFAAADC83D0867125E2050A05EF871ED8
CD0AAACE7D95D37065EA0C92E46115A732F468AA43FF12337839C206157A96BF
A8DFD01BFDF8E2D76E4D46C5B9AEF23193156FE4B535C6155F79149384737DB6
BAFDB4DC69A64056EEE87A1186B137B6D9D394EB8811AADAE996D67EC403083A
86771A4CDF9AC65678A65DCF46CD1EA9CBE4C1D839CD7F166BA2CA8521F698FD
4CDEF798D360867ADC4C8FD100DC3AB3B62C5BF2527A688D3DB498AB5F407879
970F2EF1EEBDBC4521CFCBC3E621F992F3EAD3E9737976CDB56596E661129545
2EBE036A72F668E809D454DACA709F2C0531CCB26910652CCBF94EFC3A4B3852
B144EB820877E7A55B33B3E9B2B1786729B0643517AD956A7A4779334D0A342A
3DD38F70100854C0B3032397BCDA640CD12C985BB2B5835AA83D442166613350
BACB4CA9F706141A9E9EB3DFF314B1A82113CA28B74B6603D67AA2D15A36972B
1D8B0057D3D8EB92A1809023EB95762577BD753193DCAF7021366943AFF53A8B
A9ECCB74BF27EE70B1D0B73078CA5CB5AACC1BEE0A61A75981F8A0A3253035FA
1D5D6A1D47DF111693DD9A1D35D9B865C06BD05A688B0D9BC285C0EBB1DF7B2F
2CEA26CFF7583EFED470D4BF02CAE6E4CCFE5347F61F669BF8E82ECD2112E672
86D10C529DDB600B5237C11BEE28BC3120A0E212E2ED4F52BDF6980675D7DE7C
89FBE11E19865B1C163EE5F4D410F95A434056202DB1BDD10B3A75FA3C091D5B
E3E2F888A6509E1755BFB39F9EE35AEACEDE970EAF42BBFB0D441BED621A8E20
F504AAB0F511661754B03BFBDEE9E5D704B1FFC70E429E97B8C5651C90044269
58BB39683838446D49507DCB70AB0DEDEFB73F05E621BC7371D21465AC659AA8
90786F8CF2A0B0ECA4B40774D7143F92F2B0A95417C475DA5308B5BDCEC67A74
A425CD76801FF2E115FA3A95818D088392C84FCBC00D3B3C7D683253414D4C5D
74446BBFD130AC89A0C9B68BB1CD772A1BFE8776D0772ED8C00C13C8D0412D7B
526A73A0E38885B79551DAC3E1060537C0EE8FFE574C4B9E8155E2CD83FD85BE
191BDD6ACAEE898A02717A9725196FA59E41FB45D2733CE77289FD178AF07D7A
FEF8D6BABC7DA5425A45AB8EF3C2E369432252E497B172A6FFD4D3DD957C0E26
0D3D402EAD21FB3E404DB8082DF2ED2C300A0AEC0DA12B7FB571F415017D44E2
57509A41CFC2284455635F50F06937D23699B43084728FCA9DD25A7264B9D1F4
2E086976B56237887470653AC62DE323911A64507B40DBF281BB060AE635F37D
BB4F9EF7456EF62EAACAB52F0606DFA777D2965BF03D7CDA312AE654EBFA92C7
580B7C2A2E604389152704BDF3008ED2F58200D825D0F60C7BF39AF14816B2DA
5738DE7338132B7E7E92424B7FDFB15D8E1EC176CBB7E15F3FA064CF04E357DC
72FDD1E8AF8079B1134EAE3E5CB6A7262994C71714691E8BD7CFF2676EA4D0C2
A5FCD6C622B3B34469E3B2FCD810AE0252B2814EB02C544B0458CF12DAACAC5F
4A2E078844AC2AC74543F4763CDC6FC081073CD60E276AA6E7F1D948EFA02C23
2FC1567CD952C837AA1ABD3E3077F5AA7F9986F01B0A9EE91C0EEA3895260CB6
3B4EA5F58F8C8C23D42C81764E72399D2EDF40C8F18EFAF113AD16E753263943
55EEC4F01AA885DCBCDB7C9E251210AB2B9382EE45050CC1184F592BBD65D6FD
44D9EA6BC7583CA725A1DCD28EA77A085B0A47CFCF5A847C5D29C4F64F2A17DB
BEAD7B3BA43BAF8548B65DFB4814135A2A789E7E76C978DEAE0138AF8A0AE4BD
B4D22A02C169BB0DA5215B2B91A10ED3A2A9797E5C5FBD11BB295B02C7498B13
6D90D8CD79D4606007D408E8D336D75D42519BACFB7164C2797F0E9FCD98F178
D82372F263BAF8B2D1F185E549BA63428E2B8DBCCDD243AD605DD10666F367C2
3EB98C9157E068FCAB8D91AF9683EEE87A1158A562C911574136CFC172D50C4F
70BC388C728E821395579A081CC946F528CE6F3471B7615F67623F9138DF8FD0
CAADC4E42AEBF892B36AC169C716DDA724300E9378B809DC6739929C3108A812
F9C116118E9AE1B066E1928A4A442CE02B2D3BFE18D406AAAC1603E754224AEE
1B802E92CCDCDEF94BAA8955F389B7565AB67D73CED601FA7BFF438717EAD65B
449941F0C87F048B9186C9C78A3D43A3D4C372B5F8DA74DAE6DD2A2816E44303
790F04C13F08E0815B43FCD837A67BF4A2A86FECB6ED6FFA56018961A0C528FB
472971A8E4C47C974DE12133616F3CBBFA20CE57B572F751649D9AE64A61F271
0DDE783CF2509DFC2ED2CE7467574AAF79101D56D3D2664DDA30FC7DD5B5C6B7
0BD084CA516A72E6D3F8B7FEDF0F11EF9CA594C2318EEA3CC266A2F4C2F2AC2C
AB1ABDC5F7419F46308865F1FA63CF2AF4AEBB8319372B3305AA052477ACD838
7A35218A6CD4A7C0ADE0C3F8B005D6E30C8A208A3518C1134DC34D0E64F804A4
258A995097F17642E97FE9CC38A34C250B8828B4FBA1840EECBD06D427FE7E10
4EFAFEBBC934AA295E12F25D6FA3D277C7C88DA60D818A8A303364BD6B2C0288
6E94BD8E474F28BFB951BE4ABC493AB0EA6EFF110193105DF8E9CEAE1CE549D0
A907F7A7CF1AD20E121FA6547F93CC10D7957B36ACAF213EE436C92A00AB1A24
540E535440938E748DAA6401133235D1CC74EC8FF80F9E297FB6C56C12B4E0A4
D53AB28F11618F2C793F6EACB593E56B8370ED5CFF467B5FFF04AD11BC5A3AF0
A6EF110B540CD2C87070FFCA3AA0776FF070C384BCDACB0FBD4921C06E24C8F0
CE590D788FB8C1BCF9E083B4778818F92269C274B0CC6565E2D70FFFA2480381
040C5CA012341D51427A59C3FC9B5121956B4323872E67BA499876052131B266
C21F0B8B37902C7C3156FAEB668AE6A7851BC7AA62FE60D792B35B6A38183B23
E5FB11DBBAF1E60B0D9DF0E84B9EA6F1EA6C37B84736FE657F4A29E92F7DD89D
3473C81FD7F595770BA69C91DAA3154425278D323C3E50A14FF72A02BF3820D6
6621B91A96A1D2F76710143D41C8305E02810780D868D822DC6056DFA4690F24
90BE5BB4F14902B97F5FB4CF31A6C8B346A76B95D82EEF610AAFF9F6B88E782C
F0E46DD18BD1CD53C92075AFEA0C1F0870DA52455847B22A638DABEA04C90ACF
0D89E8345F118E5E26A3934AC0C0C9F1269946E17F1AF5759123CE2359B60ED6
3FB22A23380A34DF818CDA8570B36B92C4634A80AA4ABEFFFE36865AFB384DA8
70E5CB4829052F8BEB962841C2030BBBF874EDEFE149EB8A38DE0ED59903FCBC
25788EFBB825265AFD7FF2F8D5F9A947EA94A368C52986E8640A6D6A11B14DFD
CF435B2F1F7C168D1E9C7B84B2C2D9E235DC59799B99971FE9E6D9780EAC653C
981FBDF083B949310FF20F7B383BD10737136E88B9D294677C7C63CC50A41AC1
B4649631134034DB9FF76E0B19799396A232809A5BE397B63B528A0E860D38AD
A90BF0D4246F012E19CEABC74F21E2BD46FACF96D5F033B6023A98DA51653D59
C306875AA02EDC3DB78060D72B0A00596BE36367A1681ECFEEFA447DB8DE6879
18962C974B55038A8F67AA553ECD27C6C72D46CEADA75D68D7DACB40B063F9F7
464401B0AE4CC61A1F55A7E40FBD0FEB890DD2FE36D9641E40BD2F6D20C54353
C3B282E7F46D61EF3A41F8BCB31FA38EE2B99B671841DA2FAD644C11AE20B6F8
C7D5D99806643412273F874273FBD04C65F048D76086EA1156F07A47CA0FE349
391E906747C833320E84E18781C61DEA8FACB8D9DDF08D29E5983F2E1FDC8C72
C200B63415529A45978010EA5C150BA9D70CF4F5799DA551A1CF7041A17DD5F4
153A868BD4B81A25551784E2A6EE42996F4D6CFAED97725C940C0FE9FFE0AA31
FB2A32941E6C555FCF33B4B8E802C40B423599C8E88C6DF1AEEC28938FCF3BAB
B6846C20D7EC7278A909073BD15BA75F470F82237BBFF6E7287A3771378A944C
8CA6215F95437DCC9EA67F7A8721FA63614CA7BC5054EF5E5716FD4B7DEFDE48
FA8D2AF9F0B3BD92BF5F48A0DCC8406B0A940FBB5D35B56A49B7D4605A00F82D
495AEBF2B413F19FE37AECED8060D5C32E9FE0EE9C0FB14045AE87D04B92A734
0A35DBFFE12CB1ED64C924E4ADEE0AD635BFC70CCEC92FB07B1DE13E3D14B09C
94590CE5F2F4B7D0C697F6F30E217ED09B35917714712B1182D687302770C205
C3D17944AC1CC6AE2A023707E13DC1299256DB1211650F76A969D74F940CA580
6B499C40B76BA77D12688A8CF75E90A19AA3E368D6C99FCF8163450CAD6EA028
84D4E9A5279013354D9C8D7FB8BCF3FD31433C822F0A412A3115B0E5E71079F6
60C6BBE10380872D5D75F1BE9BB6DE755103E4B376458B97E0B50BF8932940AE
F95D4002737966FF15A0B67C5B717AFF0E95B9F8F3498D7CCB538FF133A977EF
3471FCE3B83D5395F282D1982B2A6CDBD1C0DE44B3CA286E7E3F3E82B3561635
6E462A4ABFAE8DE9331FEABA97AE7E7C93F0A30F4E3FDF4DFD66E5CBE234ADD8
0AEFB354B80ADBDC128EAE328AF10FFDEF587B462A88F62F463D640C4F8898D4
1AAECA8EAE36639F6CC17B68BC1F1202F462BF7CB20CBD42FF2DEC420B4A7001
90A1F1499D49731DBC0C5DD4AADC4C32A7349219F25150117D733A0D51A7E51D
88712AF2AC91D73A906CCFFAEA98C68DB967D96DA69E38A0406F2DD149B3E771
68D65EF65F99A4AD33BB5B15672E57433BC84C9023BA77997E82473C557D18A9
60F7064934EDDA12E614186A092930690D2DF97E1955FA75CA3CA077EC39A561
27FC8DCBF13DC183774AF61C2B1B65E5E4
8BF32EFC8C0D1CC0C1622ABA0B6CE939036B2D9CAFA2A3B0C4B5DD9AE5B2D798
CC856CB41F82D3B5FCBBF70D07E05369713730081901FEDE318F9DA81D39F84C
45D0996AC0E8FD780FD2E5E6BD013D98463E0A51034735243F2B3695371E8451
6A6EC4236E47A282AD2966E06BF3FB59C6222C15A34F1E910E637D805741BC1D
CD426BF31361147DA45BDA2884880D90AEE92DF02AE5C4772537FEEA157A6D50
3BBB910A80A2EF41D18213631584B343ECFBD6BA006AD6BCAC63E9CD9430DF59
98091BE32FE17FCA7B32DCA95052F5BACF73FEAFCE5EA47B740FDC972C2FAB94
E1FE42F8536DE4DD0DBFC4CCF3A96DC1140F736344D4DC796756948ABEE0433B
BFFD9F1A343259444D248598844888F046800D6BFC7BFE3F63900767727A8742
10C756EC6380274290F84F7B2055C2390BF04B466B5D4437C0D6AC55C90792CE
8A8BB5602BC96118B07FDB8692006E91585273AEFF55D71967011A1658205ECB
A0B0C1CE1F7C5167A5868D5DA81EE5CC3A41983425663776391EA37525FF1357
2CBD0C9B4644850880C5115C7F0677A605C1009D018A9D6BF4F94A6DD019CA26
FA7D748D55D441CE1111EFE5254381E1F916912E1B446CC7803DEB5C9B1AF811
3938473A2FDD49E5A0360F4020CAF9E85E056E59430B18AD352BA929C9A3DA10
D7C524D92AEA6F4DCC13E2B59DBC0B8C0CD90B1E4E82BCEE516928BC9E1BB67A
060EFD856CC9F1CFFEF90C421DBB3CAFD1959B332EADE93C9CCB31006248BD6A
5D79AA8E049C5EA70DAB46F5D3E73984814E9F3E15A0383EFCD157240D43BF23
F84372FB3915791E581FA0E4CD457289FACCC08C0D37CEC1FC45DE3751445A9F
824A6B006B5E672AAABEC2B8D5DB7B0745C1D01C52657B7DF4FFB9803FD9655F
B7D34C6048E8BF44A0235DFA9791770CB3E451E01ED7A578512DCA397F24F71D
B2784D0778C02BCD5A88FB1671F8019523D8ECD0F42D273A72F2140D3C14F40F
7BC451BE2FD39FA297D9857745B4B8F8531CA0DFD9E72E8EE0E7FBCDA811C8D4
167DA0037F9F1F181115209C22FA250C8234695C1085931C3D92585563366C74
826D4E5F9A61F39E3F8CEB8701591C4A5FC62940C2729A2D9FFAB09F833D47C8
1B184163D87FB4E5EC4BD91B81C325FDA8ECC31EAC76FAB333A9EE090C202EFA
FB2BF753A5AB8D147F8949C6FCA5922E1B2C6231ED86BBB953166DE2C08A3DC2
433C76CAA7260AC901C3B4E2E78C8A6064F0ABBA1F4D16BACAC5288F199A0929
25F1DC8ECA38DA299A229D86E105C29CCD0FD59585467BAB46AECA7A76905CEB
1CE91EFB79E3B4EE3CDE096E2CF63DFF71544E639567BC8F12263B2F596CB4F1
FEECEB69763A7EE15B0E59A2529A116E6E3BD067BFB3690021068ECBF18F6D9C
3F3F07D8C7E2A7793FDEE84EAB71613A6EA8F6AC665A7C0376A6406171EAF3F3
4E466A08318F942F2830757721CE2B193F3A7404D51375DF34495AE48356DD78
E4AB3A71C2BE2094D5196BBBEBF056029805A302F6AE5F4A9BDB25461E81617E
A634959D343DAC10BD072CE16D7C51C120F9B6A1D75EBC4D03DF60048B8CE15A
94FD31DAE86A4BF525C979C7E96BC1DE88069A342C9E07C0340AA83DCF381134
0C13C315D1B690B5E858A20362441C9F61A20B70392F87078E5C3F8B4AF23D99
B051B170140D0069DC6E2D4FFAC6E45EE56221264A894AE68FABF04994EF9D87
EF92B498493E3F0B2F003C47C861320E714FE36F9B4669226E40753B2FA90731
CE281E469DB371C975B186E2910879681485763CD9316CD4017C5D9ACE43DCA0
38397FE463F2A3D6B72209FBEA175E75793163F0FE4A2CAE3C7E5061D1A7C31E
1F8FD3082D2743CEEA008B0F0AB55C2BBA23918A1BE4200DC628662775AC2D66
FB16BB7C06C295357A1BD655CFF3E0C49046C2CFC70FDB87E62C2EA187A0914D
2B55FDECDD9309FC215AF8882D65174ECEC01F38158C4D96FF9EF1B17AF32EB4
E7C2B4770F5CE67E2B26BA0ABA9116BB3F89944E308A0127C99B1A145F730B50
28473FD0DE250D63A7116DA1ECCE93B02F3CED8C894E6B090F5A01A26822503C
EA68C5A7BC8734C35E40D3A56449F6AC36406A0818C666F0EFB88BF02AC4C296
201B0D0848450A54B3FE1A75F641D1592D265CA639D29DD99C47AC8DCAA2FE5F
0216CD31751A42FB48F53200053979FD87DEBBF427363CE1748FAADFA0C6E2C7
9B407F5D041D9383385891A86F33AC51F0C7F4902580D9446D8118D8EF2BB177
5C2A39867EF485A454C07CD835350997F5C18EC1C3A83E57F57D8A0813EF784D
19B088E03344EEB3EE8AF03D18B2A4EB5A57E1DE60CFFC487FF1C2DCCDC88C40
1B7B1B16A0DB3AA16474F6CF5F92C7490CA1F3D94B33B18DAAAED531D2740961
53F662902417A01C2B33489862A446A5D7BC27B87ED382CC41175114C7B0D42E
6DEED8A64B3034F764BDAFAA477191564F3EF1339976051C0BFF59E56FA20C7D
C5954E0A805A4A8431B40401E8A188D2409A16013427152F64CD8CD502C5EC4E
B2F5AFFBF1F4D5BBD636109F2AF10BF4737DC0F722E11649EA017EBB2F4F531C
9D08E88CCC7D3345E4B2A96F14C9CF8E211B90F8A2CE2EF57A68BDA5997271C1
93A69D91A285B2198A12F8B3C23FCA396CBF176473CC5A4C4E24ED72990BDF14
162EDFE244272250864246D493134DBC29C5CF2C8A5B5E27FCCFC7C577C014FE
FD8F723CFC46F2D9700738788930F22656B5F1AD5A34C4EA6C96EF45C8E68138
CE87FEA609914E3936624E1E6B167A60237A34C04FF1500C52E7258FDF3DE58E
FFED1699614DE43622D1057F172E54AEE1257FCC853C0D1828B072F7F4477309
4E3E42B5C00413307335285F8404FE1229D1B2006D482993E7F96D8C9BB7C41E
CB0A9B91F02CAAA3B8A05143ED6330BE0ADC9549D1AE8A46B2BB68E3002F3589
0D5AFDA53BF17BC6E069E5B1CB3CD24362C702BF44F7823E005F0700AD2E150C
CC5E486F4AE4103A5D0C7396F31C42843ECA1EAF0632AB3EA191C0701EFA0C42
452C72B6ECD57240A505F49CDC390DE48C5251F9232F837CE604CA7C6AC0F742
6742EE1BA48956E6CAB43F05485A4457F44BFF2E75846BFB56F9C34B17CBF84E
4133424ADA7942199449554E493E2CBF5A4EAD39A22C166F02E5332197F32C88
542CDD0D5018D322396F3BF767CAEB823ECD801D22E536D6201747DE4D2CFEFC
30CF112F6DA37736C836CE44A458B170B974F2BC9B7EE06AB478F2EB94774A5A
F18E82473C5016AE0FA8AE9DFA174F17945A5F3526C73A24D348E2A2FD14899E
5D33177E01B7D101A571E196405CA95FE795CBD73F7185DE01F99C1122B2C050
A4D54AC01881582AE55E34FCFB39189C4482230FE1C01F7BAF31F97B59DA6823
606D7E318EDA739F6C18B7A3F011E76EEA67C696EE9EEBFEBC8F1F95CB450D0A
FDCA2740E7CF611F427FD44ECD90CEA692377130C239B3A0AF9F492F377C55F6
0C2910E3FBC614DE8F8F917FF5ED25702A5500D9477B5A09B0A12C9DAAB966C3
AF6B4F5C16BC519B8D147E414C1334F009730E52C0C1242685F40530A32E236C
2143B0053A7FBF6DE9CC6DA142DEE3A61E338B0E9ECE657C046F2540CA50BC49
55062DBDC0CC1295991242EA7C749000E114EF1795ADF45A4CE8B33DB1815CB5
CA3B4D8703CA72082B63700BD8ED24610FF157C3BB2A704FE41AFB1FAF4774F1
A208ED52A9684A802003AAD6D9FCD5A3CF635FCC938931CB94C751212CCCDA6E
202FEB609EB5232D1CC78DC78F60A00441965117AB45E898BEEE41B9A21D4B17
64F5DD48296352202F5BB49BD6D7C8A031AE5E9667E077ADB2AE7D92D61EFF47
3599436C302EA12D0C1713FDC98CFBEF052D7F06666FA15DF8571D712A3A77E1
370D07F557A30CB110CBAF7AEFC425F9C9A4BD06F54608B44AA3B796F560711F
6EAD4AEF60B83DB1E356D7B6844375FB3AAA0389F56D070F426C759ECD2F970B
2E65032797BEE2FFDD78CF0B7C9684F6EB8FAAB6502F4676CA8F23D37CC4D4A3
42EFDCFAC381E4B95D63E26FAC8DC58232288CDF0A98F076816242E68A3C3189
9B2F6F8F06DF0A52211E3953A57A51EE1327E6C519A50F2B0857987530CA262F
A7634CBCBE1BABB7EF1917AD836C66FB19A1C993ACEA40D291AA07755E5F4CE3
877EA9256745044ED37695871840F5FD39ECC03B9A65955C2886E773F51BA327
36D4B9077056B5C4D31075BDB84D95F39217123A292CCD32F072F3DFFFB937F1
7A543C93033C9BE51423EAF43AFE5D40F75C7614C707D898342BF2E84E557470
A08F92931617AF53A9E90036C4E235DF6C8A66366558DEEDBC6267DDB46D1DDB
B943EF9381859201FA74BC1EE0D11E52A75D89678663CAF13969A433B817D0BF
AFE672FD7B7E0E318140A2E18A2829FB9BF621B9519FD20B415F338E2DAAB087
FD4F4FCB88E7AF5C24C95D596F35D46AE8075E7AF122CBFD661A144081C53AC8
AEB6F0121693634DD7514440936609024EA1609687A6BCF2AAF1302FB5D59126
E724B35374577B44AD979B36CCD696E4B8C86B659C7A07C12F1B07DF63902F46
DB26E527586481898BA0C1C4D0343E72D90C446446C5A5BA75B6D6E3A45646E2
6161A12398845D942EC234685037E7FD00EB78E2DDFEB6FBF29EB0D2507ED3E5
645F4CF42B5164A3052755B879329C913274965209606A41AA739A8072E3C7A3
68B2E9B1FD527C93AF479C377271D51821315A483ADBE61E4E5B8AD254E17DF9
4D4832CED4009A88EF7A13CE454500545B81911091C6965B384A8F8AF977318E
3F5C7120A28882A2176C5B815E337C52FA5A66BEB55528A34FAADB58884EA98C
D8226D65ECF97382A37C9D02350C87F7D9E050D45814D2DC6B2490EA5A19D366
10D06715C71F9505F9169A3B210B1B8ADCF919A2CFC751BFC47AA8132F660073
5C6C9629E8DF4A06AC8FD77039C5B292BA00600E039217297C519FA7CDC5171E
5B8E1DD51B4DFBBCC7BEB3AF99C723F4C6148F6F4187E15C9A5C5F24A565722B
FE9DFBA7CC0C6A01BDA00C8075623ABCF59FB8062983174198FA1818CC644D6B
A7C7E3773993773D2B4C009FDAF9DE26A95EB4F7B7157472028965A2AE646234
B13F3406DD2C8C078CD8A4078364413CBDF63FB582B25E9C0E4B8A7F9F0BF493
E9E1F0C3B711D5FFBE44E588422055F792D7D5D3A2482120333C99AB487308BC
614DA8C5B16E239689ADE4FDEB69E9F61578786E38036B913EE77A89B3B7867C
E27D009FB44BF2D9DFDCD9F66FD2D13BC1599B13F2E19F4D34182B3929758BD1
F0B825E52213B52C5C091DD2E6E9216CD4E8AF0B82A0789FE40DB0EED926AC4A
C8A67A33101086A925F3E677B7F6EF0A5C33CD3A354464EA92C3D860B90D08F0
7E2CD9F57A06EF377955ADD81969BB714DD25267F29115C02FA60F8F7B3E1646
48FB8C60D0F0E08560DF756D96F320ABD285FD35FFBAA476C6ACB989BCF92394
11CD8FE3FA053111EF9A7CD5A32A4986150A5F800340849B5D4CAC1FD9C581E8
D0E0166EAD80174CFABC7EEC0F1C3928BD465CC690E73DE9E0F91ECBCB6E694F
BA399F2998FF36013EFADC8D4C24D76EFC29AC6EC6766E61FB9D1738C70848AA
C5E93D89FD24B6053F40775BF36A1137464BAC9CADBC12CFB564B030D0AA2CC4
0D2C53EFA25F3DB0712532C89D9156B498B9FA8D7B5F6EFB475650866CF6E79D
DA67C0533FD0F8536CAAF909744672E14CA51A667845689D5D94473242E1B804
D6A717F082000AE27D8A159BB2042E36FAE0B193DBBB218F5C528BD203F4D146
057399E10E7BA35BE63B729ABF9DC1891239A573A67B44E361F29962A2C4E628
E106F9E0A7390B0EDA6FBFA1DFB6C99C71D56E977B1EE6C0D2AC1FA77511F2A0
4F80FBC1173CEF67FE8D3F0EAE17224FB730041148F4E9A6E7D401810D30A923
249F6DC070651B57B47A513DCD5C06D82C8319A92629B36278EB6BFE9739F203
26B15E42525FE6D439BA608478213F5848E8BBAB6872011F130F003A94C8612A
ED46690E81CDA8EC5948CA0F57455116B81A0AFCB200285EADBECAF3F3249279
E80D9ABD82F22F12A9E14F6BC249942717E73CFF0BF9B205301F80EA09C6A847
AB937AA4C2D0E60AA335177B4B86A1D4D5ACEF074120E2DE632A82598D51FCB0
B32C6C900255A00101E57AA5EFE2DB09CC07BE8DC99F796713092DB97D6912BD
D8B0C40313F3D6061F0AFC4B89413514A9EE113ED95BB7729E29F144AA0D42EC
CBDA616D1295537975D0E09D3F59F7BD2D5965E2C35C85EC56383CE14EA9D8FB
7F28F5A3F3088F970C4BE07982E140F52E1345FAEFE04F4C508A33672611D76E
33DC6BE4C84BBAD738A71539E8416E5C8B2DF65068B29FA0ADADA5992DC6941B
AA856C98EE3B244520159B884CF4339C891B86E917E7DD54A712B5B572AB5696
9256DCA1D8E073C2F5E754C845FF861419026385F21F5B5134372D27AEE08B72
E234E74D06FAFAA327A769105DBD300D0F75C286F4AC3A7706B377321B828CF9
85A48B4394C32B09F6CA7A92F93B8143AFB83FB6C1FB0F181C64A23C04651AB1
830A7CB62F5755D3A0B780FED3A290C752678D4A30C7EE1B8179749D415202DC
85C2DF88383A620044BF850B733EA1ABCD96BEEF7BDF2FD6EA0449B6D61DBD07
D3A8FABDFC7961B06F7C2F2906BAB7A3BD33BA8928109E8BC4B405D9163D3CBC
5C664B1B2A18BC21C3EF35CD3E7D99999DA3205F41B15BBE2C9E76CE7EECCF18
E5186D5A4AEF72CD7DCF1C76DF9CCE29C92BB28B8C1A9A05C4602B82DEAB9354
9258C2CBA3D9146358B69C420BE22F1603F6FE4C39D2423FDCBDD2BEE0BF6B40
4F7BDE641C19DCF7684E7495EADDF3A86D3DA4C4E93DC00398C5CCEE3F3C95A2
D72201367CC2D4A5BA6B0DAA88E488CA671EF45FFEBDFFEAB634811BB0884670
7EA730CECC91C30A2B6ED9CD41CC8465209F05DF45C3FA514703BEAFF3A6DBE4
978CD593E8E540D4B2D99055CA68FACCC4D1A2F709615805E885B840A806C952
E5B0BA85C23488AA8EEB924B99489C748602F82973B081BAB206D808C08F8C11
75B1D192FAFF8C8BC3148AED1B7206AEC32CAD33D1E15DB3CB4CF58957F2FFE1
9A2D1E838916289220638EE91B9DDD691EF6D83017F35EB2E924708E655A8CB1
CBA59DCAA9F787DD62352699DC1AD43CA225BC10B53B8298AC5B8C316FE433A5
FFF41E657EBF3DA92F7815919E3693C9C6F14098F35F206EC9D9972517D1C233
6A838D0FC455502DE6C9CFEC92560026D5E9FBFB9CA05A15BEE9992F7FD73779
3AF7CBCE1CDE7AEC92F2453431A1712E20B7C8222656589D379348583058DD50
035F956EF757456D651B53B0E2E12AAC4FDF5B063B9BFA53DAE05542D55AF892
B2AA10EB49EB839625A0FB4344F552F24279DEAA4E0E25E5EF1C73DABE4F1C84
44CA224F92C9CB2FD5EBDBB510B98F3FCADB388FB72418BB298934195D623CC4
EC6177AA90E8DC19CCCDD49B0B5E4588DFBA825C32135F92494B37C5C13C80FD
4199D717A7BC47E9F43ED5751DBF7DB3B1296E37E6C4E0C9858C4FB0EB5373B0
E70643A0BD54D080D8B4A7EE78A455240D2BA072A20FC76EB2121BC58C1654CD
2F9EB646568BD4C95F4AD8505921041A20DA936FE009F1758CECB5838173133A
ADF49A309504BCA3C0E1C61CAB5ADB599130F1987943B7A2D0AA2C7883AD7BBC
5483F8225867EC447117DD15D7976B924F12BE6D1D83E9157E02FFBD5D9BE32E
3173FF8C0D6DE6E8932E02B2ED98E320172C97118F8A20049CACE8CC3DA954A7
6613384E2619602E9BF84E3470B14A692371F6C9BD320D207BBFDDD4B5F7FD10
16E495EEF83B33C6A6E490806C9E95AFCA72209760AF1BD12E8D454E29882181
1E78BEA63628526F89724BCBA66266EC783B6CC3846F9C4F14E49ED879647D0E
79C3EAFE8F21A85727214955CA5F7E4C4DE351D560C2E5F6585572B31199F88D
CCEDB5E2F1D98627F4D701E06D1492DE6A6BC55200A18C811FE7F34BFE805AFC
CD62FF2CC89AF62DE15A81E5749DFE00DF841697466967BD315E282A21711EDC
ECB58F3C0469CAEBE96FCF3C34AC90428765C57419FED782EC8F497341565D0C
9ADB90CCE9022B299C7B7036FF1773AEAEFBA6B4CAFC5CC2E1EB60B01DF29813
F7990B64DCDDA4E8D614907093030734F52C87D2D70F6C41314E02231AA15E22
5B4EAFD207E6003C88A986FBC0678FD6385BD57F147EE134522E16C674183041
9CED60638095EA1574C7A56A1A08ABC233D65D257D64594E3ACC6FECD22D6277
62724C1EA3BB6E141D8C1318E6DDF314CA8342FA8AA3D586DDCFE9B491A34D06
FB96033D2CF9A0CE07E5B985F953AC5BFEBDD740BF2E4E84234A9873CFFCC429
E62C40E98C198C6A8600375B8C57F94B99DB9F39718718C63F71B7013BD50DF4
8B07070F306E3867CE805847066DE7A8889F745CA3325AB658AE774229A12EE0
2754E9AE1A2CC0BFB41CE64EDE6C35F64D3B31393A633961A65B0948942435E3
C135496114762A1C96C359A017102CC8514ABC5F8FD478C4D948377C62095B0D
5941FCEB8976498D64E5AF4847E90D91356B02F5D3F1DD82EE9CB361A7BD30BD
90ED3211D307B07A3E86C65CBDC303D1209F45B24FB163893ABCDCFE016A618B
EF5577344EFA756DA4BA55B4F5783D97398D9F0BF1E2C4ADC5CEE0197D7FE6AB
5F2993332A8F5D1505292307642A38A29217AC559BAC069186B81A0CD3061A8C
87F94EDE385C9E391EFF99F1D4BFEC8954F396314A75D66E8051B334048B243D
B4997AFB7594C8A99364AC553875A4E136C4E6BE5CC819D74C6B6A242FF119C5
D65141D2C57A82C6A23FB2CCE13F7B0F9D0F1F638A285B828EFC971A6DA81560
7069805EF29C3B54DCCC41304E41EDA03F49455FE03D4778544926538ACF49C0
145CECAE7C3E55C7524883C0F3AFE5434A728960653BE4A85348763E2A32A12E
7AEDF42B6CD1FA2F3233A677F914008A55EA0904BC3AB68A578F71EB628A3B9C
D044EE55D7E0199A1D12254371E9178CD23B04EA9652F138104C81DB89625F79
8DE1334A827DCF796A23EA8B51A1E694F2DD4F90A9ACCD4444B598DEB7C03424
325FDABF04A476D9F5ECFA4F3FC0117FDBE5038FED06A0A37081D72158A97BC9
ABE850B51A6875B8D71C31F6A47B65DEEC08C1A7A2939A116365B21B58324065
F0764301DA41634E83358DBD3D5443883F2CF9776FEFEB5671D036DD05FF9FEC
48E47776C13E10F7FD4EB2E542B4A8D74E1D50DAE2FD949235838C33A9940EB1
EF77C7655DDC5C2CE4C16303DF83E4CC78DF773AD2E3273FF071E4B04D0FC8E3
FAA7EE4880A63C620F02E13AB11D05A61C97FF1189CDC9BDD7D5DCD77FE5E59A
80E0FFA93B933B37CC51E382C264281704D35A8FC56D31E7B33A020C25F22A25
91FE54E44380484DD5676FFBBB49AFDE6682FFAE124A8A126483C207E6442F28
5AE4A7BF8CF7FE15A764212C5D69B290D174D586E7D7720DE5A4C39C00B7CBCE
EC1C270661EB0254A773D951F44170306A22866CB23F9C968817532F7BAF9B50
C4CC8F167D11E24F3C673F466BDA42936AA8EE3A28EA11C0BF7C67598DB45862
EE00FDF6A9FD7A1A66F3616E1910422D17466D169FF553F2FDDD533A7E0271E7
870EAF618B153D88BDC83FB599151E6385C2EF9A10D8E60FAB9769D92F230838
F68922A3CB0A464A4CC11DB15F452B990752F49C114A5CC8B683F44C6C430D3F
4B72157F1D80D39672CB326DD0FD543B0F269B70C3F9901DA2A4308CAB155C1D
0641FAD7B74CB1CF11FDE1078EDF5B97C18C6E21CCB01768537D5E4860BC090E
45617C7D605EB165C1882B111A0FE68ED219D5066B17C10EA722965A5B5AED1B
AB06E59D586C1FA30F806B01EBB9B2F16890AA768D4BCF8714F5DDA695E00D5F
D60063E20356610830D24DB4BBF20C6FB34F9D0772AA79904A81FBEA67E59254
0E93D259FCA04ACE24FDF64644472B09C8919E7FF0775744460026E6BF994E85
20128B9E699F5AE3E54FFC891B59FDADA39D0F270571FC1349E036B95D7A138C
73A4C487E1009677EEEBFF2D4AC4FC8B54082F9556104959F6D5FB7F93F55435
82AC9F999D2BD61FECF71669FD2A92F79CA12C8ACA80281E5023EA0F5F29C545
DA6912173E8C03774EBA0F6CF988E97360A0F025EBB33A4D96F60542F8CC55BE
9394D13D5416149D28FE1E2737D99888846182153CF8412750DC06DE7D69CA8B
4E2EF5F60BF49E8FA303307DD211ECB9D48419A61A0F1FAF7F27D047EBDE5E47
10BBB3D73217BD6D02328039B28F6289ED67E3685380C89BD7C863B10A5CD28C
74FE3D9DD16CD17670DB0372953E2507669C4C790FD78571FD084870D2BCBE41
2BB1F34E907CC27345776DE346EFBEFBB3E1CDB281C57EF9C35E201605B9FE9C
29D7C668D3D978773AF7B0ECD12DA7F3DA93549740246B962AABE06B35C70960
5E2584C24AA8C85D57F30D26997B708728970F2088C7CDB31951F15553CA8F84
10F6736DEB73F54C8C7385ECE031E21659919200E0405F7C125C2F02E9B91CA5
F7F16189ACF40DABD4E49ABD0655B38A9F45DC55580FF6117EFE285B244E9246
73B994BA85A3B34189E5E501D7E62B75DA9264EA295D04C2376572D33EC65660
3AED8708ECBD0804C5192BEC8E76DB9612E61AE8F4A7EC82C95AE01AE4B2AB38
E0AB1E8FDEF7FE0B767F81D85196D46F915AB8CB3E9228293762EFD7DE31F4F9
0DE2FC0E65E7D82B882A809DF681F19DFA11443487B6280518579F98B4F1A502
EA4B74C001DE061E8C09BF15FB500A26AB8A63EC8D7957DB52FB736D6AB6D401
ADCF4213EA6CF340E1156D125DBD8B19F456008F8094E98B06EB6DA5096ABDC5
6BACB34BFA69816F1F2265E0117177A5544502BA91AC3593E2930AA30D276CA7
59A56BCCF1CECA5A74D6BAA897BB4103249F13C8504DE04E5C0E22A733D7CB62
153DC1E8534706C59D20F2BB5966CCE975C05C4F95D1BB69C7D45FF329F8C01F
CCDFDFA2C0941B083203D1F0A7648B7F6B8C33A1115081A1DB09D9541088494C
AF44453108961AB4161A40A2A1A8F1B1C454E181D9AD054BA86FEBE2A1B901B9
B9A9BA4B9633F90D45C2138CCF1EAB4BEEEF2336EDE66FB7CFD0A84A226ACF64
680C748BB7BDFB62F93C2BEE638ABB3A59F3CD19055AC504A0E160CB13A7C1F5
1D1AD0095D138A3FD85F25CCF4304E82D758E963C69CB8392EA5C995B7D1802C
9D7CB493E2F572E9998346A157CF9FCBFB95846088C7376AC82F58BE46B16281
A87532D5F6EE9E85C23C3F1960FF99CD970E6EDD1BE8D492D312359BDFBDF59E
E0B6738BEDC5F16B7EBE0F7A775EAB4BE2CBD067F7F77CAF443A4BD9AE10B7FE
7173FEE658922032B21F77A7A48325E51CC52FED690023344E49EF2614F0A63F
D474E6D89BE40194235F5BD341B449DFBBCC9E8AF23241A36EAA316BAB5FFD8C
69DA203716290169CB07A0EEE2BC4BD005CC548090B8D4EB82104C83696FDB7E
10D4B935924EA19E7C35E9379F204C10BB0854C55E7867194D9D3544EA1DA675
5E9B3A0792BE2E87B611F92BBA99C01ED1F21366699464733D774BEC5B0A2B4C
6E8C68CFAEF8E0C69A1685BCCEBD8900C1E9C5CD26808696D16D125DAB3E5A79
4A9484029864AD3BBDA91883A4D5DB1DF9BF789D7F18A6D5BF13A72680682A5B
196BC80E977E553FBD0EA62F08952013D77814F6ADDFC5C68A667B43B26FCD50
EDD49E8F1B6DD262DC0B4E2EF5A1150B3DBCA61E4F0ABA689BF862FB62AB65CA
1E64F0C816D45BD236B557E1A8668EC76644EF5F607205E3F789CE757D4FDCE3
A4D9F039F1CB8A40AA352BFBAD6643E30579D4265002BD3EFA420E275FEAA4A9
412E33C557C0625F06A565F856989D62581CEB59A4877CA6DE7935E7D7CD2D81
029F282754F1D25B522EE9374EED11147A229A44D5447F3265226E0889DB7C4C
2D262A6CBD15E4565C324A5508564CFEE3534C4572581E818396620BF86AF511
3200CCAA7DB922183B3D4DD6A9C2429AAEE0A1384C74A61715E96C5D69A4E4FF
6408DD6ECF517D44BC8130971441BBD4819D25993C4CBED0591CEA1D2BDEB54D
CBF02D516A2AB97E6EBAA7D883F90C521C130BB0049FB9C22A55402C162D1E54
2EB04A71BBCC56812460362093742AC01579A95F3E0E1BE0C6E26FAACBF5980A
A1EC5FE4811A1506C01931ABD5AF4800CD13EFD3F6F5B5F1A862EB3E7EA70CED
FD99468911AB9C55E8A5CFE3F17855AC3825BBF7EDDDB6E44603F8E9FD0DBB51
A990B69EB47CBE44770BFD17A9DBA044FDC61AC83F5017B5C0D2E6521A217503
430D75EF4BFE5FCAE780CF8BAC999C8B3947AE40BC76CF2BCA11BE8D4EB40BC7
EF1E2791B9F186FE4CC9426E909162AA6B8ED62121844A58A7AD67A119A94F8E
875129AF889A8B2D49B7822EDB60132A4CFFCD4D5484E9967A3045B9AFD4B608
A9BB626BF68B1F304E2E4E8F3E492E07DEBA18627ED11EB09E3C619B1DF9C7F7
26F8BF1463A1E2DE2156B15FD44199E7A0C130EFC3EA967C0C8EAC057D821733
7C923B779B2EB4C7F8CDA663708FEDFDDD2359B1DB313CCC890F7188DC1078C2
FC523A2AD140ED1197301E87CA2F279B3545829AB7BDB40FC5FCFE5034EA7A70
EF18705FD531098B573691DC707570426AA6FE1462CF9DBF00DC67D81FB83FFE
CFDBB288207180B0BD705938B41AA48E68E557186BAEAD79759D699266A9A9DD
D7477F7F45E7F28C7F63F597A7E67762DED6C385EB2FBE9CFD52A5D714741720
5BB4ADD90DDBA6C760C231A58AE55F2EAD1EE93F11C5E8C708F22DAB168469B9
BD3FDCD68EADBC1CC464C54E0D16C93269010EBAA0C5370E8E945C7BAFF08A95
940A574143B6F9670D39FB03A25E49E164CD4DE8B3131FAC9D15F5B0447CCFC7
4452E108BBA7358698B0FAB49402B21C3A69000223667EF56BC5873CEC8D8EE5
F019652EA7C433C11D7B0C4996F2D21899DCBDED1A8D530733A7C92B925F75B1
D2D6A25B3862BAB0025A66E29BB5744AF1F68CB10DE298C36B620C115B942F90
3912F0D9646907EFCAAD7C05E5E0B053F3639EAE98A853466C5F0ADB18495648
262C3FB2813EEA2D2211B71F1447522E0B4C5C745EA34A154214D57C8943893C
248CA1CF244490775F70B52BB2D959A9D892A241C298C495FB39AC7BF0D6C655
3F150712AA065FCB56C3EB03F8A9CA8268DB79C11B4CEC8C9E84DFDD2BA3671E
CF1B12AEDCEAF5884548F7F9EA628262CE709321E47F8B4214C2A108E5ABD663
783CD6AC5984CC08DBEBA75F7ACCF2A3A6CA42BE5A3777080F30182C1C038F6C
9426B5488684A0E82966E4C8EE3ECD5674B6E5508F43E0526E14F38618BE6DE9
EE175DA4CA32A6405D726C411D89C755A8ED1F73D9DBE67FEADC9DB448668FB3
CB6838C400F05B902D27F3AFA0BA11148541288201DFEC8A08D6B3D1D972AA53
8DAE043A766E84CEC8894D30B7E77CAC1683363E747A4FEE17D9B83BA9754796
20FC1A0AEED75C71EF48FED0E99317B67F690F615CCD479133B7E08DD8EB46CA
D5895810E01E07ED6D17BB54F5B9AA19D2B1ECF2795E777227B12242C07BCAA7
2D5F6AA8083B43C6928FA28EECE66CB90899763AA1037E4C1AC76741097DF3F8
6BD297528CC9F538C5AEEFD5A7038CAA230A09DE750B740DC8398072A0876528
946BE8088F6EB74ECA0CC1DA30A43AC47351AC7934E90A88DAD80EC957087768
B9893241462946A9C5A843D454DF125A906D70D9C4812EB36759537E0372D2B5
3F4905D8F605EBA26C49A167D48E177BB6821FD39E775D9569D387673B976306
57537EB480132851DED5740C2E175D5B08CF40BE96EC1810865DEE2B52B1CF44
CDE1607EDD185CAC4330016DA7343C9F3DCD21BB3492FA1D027CF81E76E45358
55F5DD22884FB50B80A2388F673EF7FD7CFF4AD4AC212EC5BBFED0EAF7ABD2FE
1FD35C0C7360DA40622DA59FEA983B702A6C53FB975EA85DF0A5DACFCC8C8549
786DAE9D57A2029DE7185AD4E283AE57618BA3CF37744C18C882678F34A161D3
8ADD4757DAB9B77FB891EE0DE945D551043A286426751CD6A62279E99F21D0F1
C4E3042E8A474AF9920CF416B50A94ED092661711C4FF54A8606E1912066F340
59CD492D9BEA791E7AC9486E6CB214169B238084ECA7515D03F9F78601AFC144
18EA9CF8C814CA5D2F05AE6D23BED9E8A0D41E323CF572CE98599BAEA8562285
6327E1B8A141E395C2FFE6DC90F6648598DF8B8389D8AB2E1D982F1FDC71A6CF
51994FAB23671F641D0A54906AD41759FFC09A2273D48AE572258FAFB3B768E7
2CCDACF0DC0125F7E1D56388B817F0ACF62258E3F80317494E3D21F8A317AC28
A82E16A930CBB531D05F7BA59667AFD26474333C201768124C80E97F92EB0A6D
73AE9A8BDD37FA688920AE2A5AF906CAF90ECBA54E5F6ADBBBC0F45DE40F147E
B2F17C816231D41ACB54D82D2D3498A9D41A4172BFDB56CFA196986AD6D28430
983186893BA6C30408997347FB265BD80EE95E011E6C397D1D1592CC1C34AEA1
7706D3B35D946E0C0790652F688879A53231202AB3A6B495E6E251E6829F0549
94F5A375E8AC0696660E002B6C195446D0E08BB7BE160EFCF356A81BEDA21934
B3365D78CEDCCDB705594895418C48D91C9AD97637D37DFE69624F7885106965
C574270839038CC543B62CC351A2FEB42F664810D5613D27B1D86351C669FE8C
37787213F68E0657240DF253186228CA5CEC4283A4C0A125F6262B566190B701
3AF5BDAD86A1F84029FDD7ACB5A11A23107E5413E67809AB9DA6BA5C3CCCC2EA
9D4270831EAD274C3AC9DF833BC8EBF339376EADEE48D748C4F71C97B43DBA6A
FD014C2F73B6F18EB9E52F3A7B1994B00E38020C6EF4529C318386E1F62ADA34
95B878B5F1A3F2D7FE2EE48CC8FFB79E3140993DB96AD77281A7D314880464BD
0C205CE8A86714EE8B3A334E002DD04AFBE3C3B95E8A2B4F41CEAFA6A2CF2F95
A06B2D1412E221D968E847313C86AAB3DE19725D2A380484CB7FE6B636DEB3BD
1C01FF657B8287339DB0A67F62AA692F14BD29175748552DF93E3247CCF71BC9
04D1F745A4159C7AC635EF6A41106A821F3017BCA5C0D8FCBB1ABCCED6302ED7
B9DCE19F8E88C23CD19CFA9550FC79A609942ED70B8E6BBF29422A2D7E28B9D1
4797414CF2766E7CC48626049DAD906C45EA994EF5C3352342A127081B7632EA
61293A7A688022E6380B68CB3E60D5F464F8B2D1F185F2C56D2879C65F1EDC6C
E31AC52A05C95D96DFE2AB700DD868C718EA003669F163CDFFA3568DC92941D7
471E6B53BB763A3A6CEEC8771287709FC88D048749CACC598977ED1676EF1F16
34B7285528C06B059EB6528368F622FF958555AFF122823B4FCC62E4AA36BAC0
B7CD09BB34A19A926A66AF74F996D7A6FDFBBCAE7BAC2F7C6F9432FFB4B767E5
5EC547750CC6C4CD4202F7E289B7E8A842D8046BF9D3F38F5B401DA65FC0A792
4EC3116BAD5B959468EDBCA52C433209E602EED5066765E2489C6BBB0F094CE5
5FC789A3413D958578ABDDE73153553092916729EFB532556990ADBC56865AFC
A9812247D518F0E035E08D9DEA3C3764041F02301DD5C66EA559B3D47E18CE25
BB4A6691C178902DDE9B1ECFE9CAC98190BB39465B5B1736B15583708878CE1B
E81750434A6D847218D4348AF6C56A2FFDFFE0934DDE3BB25A9678FA201A67E0
717A6311D0E49A9474A29B0A251473F267C7F8886B9B55BCB6F609D98D2E8038
718ACEEA982EC047A5FA3F28F9546A8010A1DF995F41E11E64B997046CE7EB2B
3556D4B27D23AF70E78A0EE95BF48FB0F7C217E39EE61DB6635EB84434464C73
2D3B0F36AC2959BF039038A018ED1DE4CF72B7BD7A51D5CCB9FEC0B2B1968E19
23491E9C97ADB33FC9B09FD5EABAD326D0BDBE90AFB69122C71A488F401CD387
45DD12DD92022DB180DDCBB531ABA3CA4A5892F3E1D3528384596FD646ED97A2
C9E2C29F1299FA52159F7CF060810CB99F2B1B261708AAF94AFA022F9A3CD267
11432D4DF4F9F7BCF1434F9D9C94EC5BEBC6C98432BC339E0DB2461623880887
1CFE5DA076E7A3CED52E2E307B1CDDB1D0E273A4774177DB4664C75B69C857BC
FB693B1E0DE72065D2B6BF7466FD272B1BF9DA5B838E04DA93C92F7A526F4389
3063774999A51F2A863D118592
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@ -2295,7 +2302,7 @@ F95D4002737966FF15A0B67C5B717AFF0E95B9F8F3498D7CCB538FF133A977EF
0000000000000000000000000000000000000000000000000000000000000000
cleartomark
%%EndFont
TeXDict begin 55380996 39158280 1000 600 600 (org-ref.dvi)
TeXDict begin 55380996 39158280 1000 600 600 (orgcard.dvi)
@start /Fa 242[61 13[{ TeXbbad153fEncoding ReEncodeFont }1
49.8132 /CMSY6 rf /Fb 134[32 1[43 32 34 24 24 24 1[34
30 34 50 18 32 1[18 34 30 19 27 34 27 34 30 13[34 44
@ -2323,10 +2330,10 @@ TeXDict begin 55380996 39158280 1000 600 600 (org-ref.dvi)
rf /Fi 133[31 37 37 51 37 39 27 28 28 37 39 35 39 59
20 37 22 20 39 35 22 31 39 31 39 35 2[35 1[35 3[53 72
53 53 51 39 52 1[48 55 53 65 44 55 1[25 53 55 46 48 54
51 50 53 6[20 6[35 35 35 1[35 20 24 20 55 35 27 27 20
2[35 59 35 20 19[39 39 41 11[{ TeXf7b6d320Encoding ReEncodeFont }70
66.4176 /CMR8 rf /Fj 141[57 2[69 76 6[69 42 63 76 61
1[67 14[103 2[103 1[131 9[99 16[69 69 1[69 1[46 3[53
51 50 53 6[20 4[35 1[35 35 35 1[35 20 24 20 55 35 27
27 20 2[35 59 35 20 19[39 39 41 11[{ TeXf7b6d320Encoding ReEncodeFont }
71 66.4176 /CMR8 rf /Fj 141[57 2[69 76 6[69 42 63 76
61 1[67 14[103 2[103 1[131 9[99 16[69 69 1[69 1[46 3[53
53 40[{ TeXf7b6d320Encoding ReEncodeFont }19 119.552
/CMBX10 rf end
%%EndProlog
@ -2339,7 +2346,7 @@ TeXDict begin
%%Page: 1 1
TeXDict begin @landscape 1 0 bop -169 -357 a Fj(Org-Mo)t(de)45
b(Reference)h(Card)g(\(1/2\))546 -242 y Fi(\(for)23 b(v)n(ersion)h
(3.13\))-150 -42 y Fh(Getting)37 b(Started)-150 125 y
(3.15\))-150 -42 y Fh(Getting)37 b(Started)-150 125 y
Fi(Put)24 b(the)h(follo)n(wing)e(in)g(y)n(our)h Fg(~/.emacs)931
102 y Ff(1)-150 199 y Fg(\(autoload)38 b('org-mode)g("org")e("Org)h
(mode")g(t\))-150 268 y(\(autoload)h('org-diary)g("org")f("Org)f(mode)h
@ -2467,81 +2474,82 @@ y Fg(<vm:folder#id>)950 b Fi(VM)23 b(message)2046 4073
y Fg(<vm://myself@some.where)q(.org)q(/fo)q(lder)q(#id)q(>)105
b Fi(VM)23 b(remote)2046 4143 y(W)-6 b(anderlust)25 b
Fg(<wl:...>)h Fi(and)e(RMAIL)f Fg(<rmail:...>)k Fi(lik)n(e)c(VM)4242
-364 y Fh(T)-10 b(ables)4242 -255 y Fd(Creating)25 b(a)i(table)4242
-168 y Fi(insert)c(a)h(new)g(Org-mo)r(de)g(table)330
b Fg(M-x)36 b(org-table-create)4242 -98 y Fi(...)30 b(or)23
b(just)h(start)g(t)n(yping,)g(e.g.)173 b Fg(|Name|Phone|Age)39
b(RET)d(|-)g(TAB)4242 -28 y Fi(con)n(v)n(ert)25 b(region)f(to)g(table)
741 b Fg(C-c)36 b(C-c)4242 41 y Fi(...)30 b(separator)24
-364 y Fh(T)-10 b(ables)4242 -265 y Fd(Creating)25 b(a)i(table)4242
-181 y Fi(insert)c(a)h(new)g(Org-mo)r(de)g(table)330
b Fg(M-x)36 b(org-table-create)4242 -111 y Fi(...)30
b(or)23 b(just)h(start)g(t)n(yping,)g(e.g.)173 b Fg(|Name|Phone|Age)39
b(RET)d(|-)g(TAB)4242 -41 y Fi(con)n(v)n(ert)25 b(region)f(to)g(table)
741 b Fg(C-c)36 b(C-c)4242 28 y Fi(...)30 b(separator)24
b(at)h(least)f(3)g(spaces)537 b Fg(C-3)36 b(C-c)g(C-c)4242
128 y Fd(Commands)26 b(a)n(v)-5 b(ailable)25 b(inside)j(tables)4242
215 y Fi(The)17 b(follo)n(wing)f(commands)i(w)n(ork)f(when)g(the)h
(cursor)e(is)g Fc(inside)k(a)f(table)p Fi(.)4242 285
113 y Fd(Commands)26 b(a)n(v)-5 b(ailable)25 b(inside)j(tables)4242
197 y Fi(The)17 b(follo)n(wing)f(commands)i(w)n(ork)f(when)g(the)h
(cursor)e(is)g Fc(inside)k(a)f(table)p Fi(.)4242 266
y(Outside)24 b(of)e(tables,)i(the)g(same)f(k)n(eys)h(ma)n(y)f(ha)n(v)n
(e)h(other)g(functionalit)n(y)-6 b(.)4242 371 y Fd(Re-aligning)25
b(and)i(\014eld)h(motion)4242 458 y Fi(re-align)22 b(the)i(table)g
(e)h(other)g(functionalit)n(y)-6 b(.)4242 351 y Fd(Re-aligning)25
b(and)i(\014eld)h(motion)4242 435 y Fi(re-align)22 b(the)i(table)g
(without)g(mo)n(ving)g(the)g(cursor)70 b Fg(C-c)36 b(C-c)4242
528 y Fi(re-align)23 b(the)h(table,)g(mo)n(v)n(e)h(to)f(next)h(\014eld)
311 b Fg(TAB)4242 598 y Fi(mo)n(v)n(e)24 b(to)h(previous)e(\014eld)762
b Fg(S-TAB)4242 667 y Fi(re-align)23 b(the)h(table,)g(mo)n(v)n(e)h(to)f
(next)h(ro)n(w)328 b Fg(RET)4242 754 y Fd(Ro)n(w)26 b(and)h(column)g
(editing)4242 841 y Fi(mo)n(v)n(e)d(the)h(curren)n(t)f(column)g(left)
544 b Fg(M-LEFT)4242 911 y Fi(mo)n(v)n(e)24 b(the)h(curren)n(t)f
(column)g(righ)n(t)497 b Fg(M-RIGHT)4242 980 y Fi(kill)23
b(the)h(curren)n(t)g(column)731 b Fg(M-S-LEFT)4242 1050
505 y Fi(re-align)23 b(the)h(table,)g(mo)n(v)n(e)h(to)f(next)h(\014eld)
311 b Fg(TAB)4242 574 y Fi(mo)n(v)n(e)24 b(to)h(previous)e(\014eld)762
b Fg(S-TAB)4242 644 y Fi(re-align)23 b(the)h(table,)g(mo)n(v)n(e)h(to)f
(next)h(ro)n(w)328 b Fg(RET)4242 728 y Fd(Ro)n(w)26 b(and)h(column)g
(editing)4242 812 y Fi(mo)n(v)n(e)d(the)h(curren)n(t)f(column)g(left)
544 b Fg(M-LEFT)4242 882 y Fi(mo)n(v)n(e)24 b(the)h(curren)n(t)f
(column)g(righ)n(t)497 b Fg(M-RIGHT)4242 952 y Fi(kill)23
b(the)h(curren)n(t)g(column)731 b Fg(M-S-LEFT)4242 1022
y Fi(insert)23 b(new)i(column)f(to)g(left)f(of)h(cursor)f(p)r(osition)
104 b Fg(M-S-RIGHT)4242 1137 y Fi(mo)n(v)n(e)24 b(the)h(curren)n(t)f
(ro)n(w)f(up)678 b Fg(M-UP)4242 1207 y Fi(mo)n(v)n(e)24
104 b Fg(M-S-RIGHT)4242 1106 y Fi(mo)n(v)n(e)24 b(the)h(curren)n(t)f
(ro)n(w)f(up)678 b Fg(M-UP)4242 1176 y Fi(mo)n(v)n(e)24
b(the)h(curren)n(t)f(ro)n(w)f(do)n(wn)594 b Fg(M-DOWN)4242
1276 y Fi(kill)23 b(the)h(curren)n(t)g(ro)n(w)g(or)f(horizon)n(tal)h
(line)291 b Fg(M-S-UP)4242 1346 y Fi(insert)23 b(new)i(ro)n(w)e(ab)r(o)
1245 y Fi(kill)23 b(the)h(curren)n(t)g(ro)n(w)g(or)f(horizon)n(tal)h
(line)291 b Fg(M-S-UP)4242 1315 y Fi(insert)23 b(new)i(ro)n(w)e(ab)r(o)
n(v)n(e)i(the)f(curren)n(t)g(ro)n(w)285 b Fg(M-S-DOWN)4242
1433 y Fi(insert)23 b(horizon)n(tal)i(line)e(b)r(elo)n(w)h(the)h
(curren)n(t)f(ro)n(w)100 b Fg(C-c)36 b(-)4242 1503 y
1399 y Fi(insert)23 b(horizon)n(tal)i(line)e(b)r(elo)n(w)h(the)h
(curren)n(t)f(ro)n(w)100 b Fg(C-c)36 b(-)4242 1469 y
Fi(insert)23 b(horizon)n(tal)i(line)e(ab)r(o)n(v)n(e)i(the)g(curren)n
(t)f(ro)n(w)100 b Fg(C-u)36 b(C-c)g(-)4242 1589 y Fd(Regions)4242
1676 y Fi(cut)25 b(rectangular)f(region)758 b Fg(C-c)36
b(C-h)g(C-w)4242 1746 y Fi(cop)n(y)25 b(rectangular)f(region)715
b Fg(C-c)36 b(C-h)g(M-w)4242 1816 y Fi(paste)25 b(rectangular)f(region)
695 b Fg(C-c)36 b(C-h)g(C-y)4242 1885 y Fi(\014ll)23
(t)f(ro)n(w)100 b Fg(C-u)36 b(C-c)g(-)4242 1553 y Fd(Regions)4242
1637 y Fi(cut)25 b(rectangular)f(region)758 b Fg(C-c)36
b(C-h)g(C-w)4242 1707 y Fi(cop)n(y)25 b(rectangular)f(region)715
b Fg(C-c)36 b(C-h)g(M-w)4242 1777 y Fi(paste)25 b(rectangular)f(region)
695 b Fg(C-c)36 b(C-h)g(C-y)4242 1847 y Fi(\014ll)23
b(paragraph)h(across)g(selected)h(cells)399 b Fg(C-c)36
b(C-q)4242 1972 y Fd(Calculations)4242 2059 y Fi(Except)31
b(C-q)4242 1931 y Fd(Calculations)4242 2015 y Fi(Except)31
b(for)e(the)i(summation)f(commands,)h(these)g(need)g(the)g(Emacs)4242
2129 y(calc)24 b(pac)n(k)l(age)i(installed.)4242 2215
y(replace)e(curren)n(t)g(\014eld)g(with)g(result)f(of)h(form)n(ula)129
b Fg(C-c)36 b(=)4242 2285 y Fi(...)30 b(same)24 b(calculation)h(for)e
(rest)g(of)h(column)267 b Fg(C-u)36 b(C-c)g(=)4242 2355
y Fi(re-apply)23 b(all)g(stored)i(equations)g(to)f(curren)n(t)g(line)96
b Fg(C-c)36 b(*)4242 2425 y Fi(re-apply)23 b(all)g(stored)i(equations)g
2085 y(calc)24 b(pac)n(k)l(age)i(installed.)4242 2169
y(set)e(and)g(ev)l(al)g(column)g(form)n(ula)567 b Fg(C-c)36
b(=)4242 2239 y Fi(set)24 b(and)g(ev)l(al)g(named-\014eld)h(form)n(ula)
433 b Fg(C-u)36 b(C-c)g(=)4242 2308 y Fi(edit)24 b(form)n(ulas)f(in)g
(separate)i(bu\013er)473 b Fg(C-c)36 b(')4242 2378 y
Fi(re-apply)23 b(all)g(stored)i(equations)g(to)f(curren)n(t)g(line)96
b Fg(C-c)36 b(*)4242 2448 y Fi(re-apply)23 b(all)g(stored)i(equations)g
(to)f(en)n(tire)g(table)101 b Fg(C-u)36 b(C-c)g(*)4242
2511 y(TAB)p Fi(,)30 b Fg(RET)f Fi(and)f Fg(C-c)37 b(C-c)28
2532 y(TAB)p Fi(,)30 b Fg(RET)f Fi(and)f Fg(C-c)37 b(C-c)28
b Fi(trigger)h(automatic)g(recalculation)h(in)d(lines)4242
2581 y(starting)d(with:)31 b Fg(|)36 b(#)f(|)p Fi(.)4242
2668 y(rotate)23 b(recalculation)f(mark)g(through)g(#)g(*)g(!)30
b(^)p 5533 2668 22 4 v 47 w($)71 b Fg(C-#)4242 2755 y
Fi(displa)n(y)24 b(column)g(n)n(um)n(b)r(er)f(cursor)h(is)f(in)354
b Fg(C-c)36 b(?)4242 2824 y Fi(sum)23 b(n)n(um)n(b)r(ers)h(in)f(curren)
n(t)i(column/rectangle)143 b Fg(C-c)36 b(+)4242 2908
2602 y(starting)d(with:)31 b Fg(|)36 b(#)f(|)p Fi(.)4242
2686 y(rotate)25 b(calculation)g(mark)e(through)i(#)e(*)h(!)31
b(^)p 5487 2686 22 4 v 49 w($)115 b Fg(C-#)4242 2770
y Fi(displa)n(y)24 b(column)g(n)n(um)n(b)r(er)f(cursor)h(is)f(in)354
b Fg(C-c)36 b(?)4242 2840 y Fi(sum)23 b(n)n(um)n(b)r(ers)h(in)f(curren)
n(t)i(column/rectangle)143 b Fg(C-c)36 b(+)4242 2924
y Fi(cop)n(y)25 b(do)n(wn)f(with)g(incremen)n(t)625 b
Fg(S-RET)5857 2885 y Ff(4)4242 2995 y Fi(A)27 b(form)n(ula)g(can)h
(also)f(b)r(e)h(t)n(yp)r(ed)g(directly)g(in)n(to)g(in)n(to)f(a)h
(\014eld.)42 b(It)28 b(will)4242 3065 y(b)r(e)c(executed)i(b)n(y)e
Fg(TAB)p Fi(,)g Fg(RET)h Fi(and)f Fg(C-c)36 b(C-c)p Fi(:)4242
3152 y(Example:)31 b(Add)24 b(Col1)g(and)g(Col2)522 b
Fg(=$1+$2)4242 3221 y Fi(...)30 b(with)24 b(prin)n(tf)f(format)g(sp)r
(eci\014cation)387 b Fg(=$1+$2;\045.2f)4242 3291 y Fi(...)30
Fg(S-RET)5857 2900 y Ff(4)4242 3008 y Fi(A)25 b(form)n(ula)f(can)i
(also)f(b)r(e)h(t)n(yp)r(ed)g(directly)g(in)n(to)f(in)n(to)h(a)f
(\014eld)g(and)h(will)4242 3078 y(executed)31 b(b)n(y)e
Fg(TAB)p Fi(,)h Fg(RET)g Fi(and)f Fg(C-c)36 b(C-c)p Fi(.)47
b(A)28 b(leading)h Fg(=)g Fi(in)n(tro)r(duces)h(a)4242
3148 y(column)24 b(form)n(ula,)e Fg(:=)j Fi(a)e(named-\014eld)i(form)n
(ula.)4242 3232 y(Example:)31 b(Add)24 b(Col1)g(and)g(Col2)522
b Fg(=$1+$2)4242 3301 y Fi(...)30 b(with)24 b(prin)n(tf)f(format)g(sp)r
(eci\014cation)387 b Fg(=$1+$2;\045.2f)4242 3371 y Fi(...)30
b(with)24 b(constan)n(ts)h(from)e(constan)n(ts.el)352
b Fg(=$1/$c/$cm)4242 3361 y Fi(Apply)24 b(curren)n(t)g(\(for)f(this)h
(column\))g(form)n(ula)200 b Fg(=)4242 3431 y Fi(Sum)24
b(all)f(n)n(um)n(b)r(ers)g(ab)r(o)n(v)n(e/left)j(of)d(cursor)292
b Fg(=sum)36 b(/)g(=sumh)4242 3500 y Fi(Sum)24 b(just)f(the)i(3)f
(\014elds)f(closest)i(to)f(cursor)279 b Fg(=sum3/=sumh3)4242
3587 y Fd(Miscellaneous)4242 3674 y Fi(toggle)25 b(visibilit)n(y)d(of)i
(v)n(ertical)g(lines)474 b Fg(C-c)36 b(|)4242 3744 y
Fi(exp)r(ort)25 b(as)e(tab-separated)j(\014le)370 b Fg(M-x)36
b(org-table-export)4242 3813 y Fi(imp)r(ort)23 b(tab-separated)j
(\014le)447 b Fg(M-x)36 b(org-table-import)4242 3900
y Fd(T)-7 b(ables)27 b(created)f(with)h(the)g Fg(table.el)i
b Fg(=$1/$c/$cm)4242 3441 y Fi(sum)23 b(from)g(3rd)h(hline)f(ab)r(o)n
(v)n(e)i(to)f(here)411 b Fg(:=vsum\(&III\))4242 3511
y Fi(apply)24 b(curren)n(t)g(column)g(form)n(ula)518
b Fg(=)4242 3595 y Fd(Miscellaneous)4242 3679 y Fi(toggle)25
b(visibilit)n(y)d(of)i(v)n(ertical)g(lines)474 b Fg(C-c)36
b(|)4242 3749 y Fi(exp)r(ort)25 b(as)e(tab-separated)j(\014le)370
b Fg(M-x)36 b(org-table-export)4242 3819 y Fi(imp)r(ort)23
b(tab-separated)j(\014le)447 b Fg(M-x)36 b(org-table-import)4242
3903 y Fd(T)-7 b(ables)27 b(created)f(with)h(the)g Fg(table.el)i
Fd(pac)n(k)-5 b(age)4242 3987 y Fi(insert)23 b(a)h(new)g
Fg(table.el)i Fi(table)582 b Fg(C-c)36 b(~)4242 4057
y Fi(recognize)25 b(existing)f(table.el)g(table)474 b
@ -2551,7 +2559,7 @@ end
%%Page: 2 2
TeXDict begin @landscape 2 1 bop -169 -357 a Fj(Org-Mo)t(de)45
b(Reference)h(Card)g(\(2/2\))546 -242 y Fi(\(for)23 b(v)n(ersion)h
(3.13\))-150 -36 y Fh(Timeline)37 b(and)g(Agenda)-150
(3.15\))-150 -36 y Fh(Timeline)37 b(and)g(Agenda)-150
120 y Fi(sho)n(w)24 b(timeline)f(of)h(curren)n(t)g(org)f(\014le)458
b Fg(C-c)36 b(C-r)-150 190 y Fi(...)30 b(include)24 b(past)h(dates)793
b Fg(C-u)36 b(C-c)g(C-r)-150 288 y Fi(add)24 b(curren)n(t)g(\014le)g
@ -2623,7 +2631,7 @@ b(C-x)g(h)2046 169 y Fi(exp)r(ort)25 b(as)e(HTML)g(and)h(op)r(en)h(in)e
b(arg)g(sets)g(n)n(b.)31 b(of)23 b(headline)i(lev)n(els,)e(e.g.)182
b Fg(C-3)36 b(C-c)g(C-x)g(h)2046 337 y Fi(insert)23 b(template)j(of)d
(exp)r(ort)h(options)423 b Fg(C-c)36 b(C-x)g(t)2046 435
y Fi(toggle)25 b(\014xed)f(width)g(for)f(line)g(or)h(region)346
y Fi(toggle)25 b(\014xed)f(width)g(for)f(en)n(try)h(or)g(region)295
b Fg(C-c)36 b(:)2046 534 y Fd(HTML)27 b(formatting)2046
632 y Fi(mak)n(e)d(w)n(ords)g Fd(b)r(old)897 b Fg(*bold*)2046
702 y Fi(mak)n(e)24 b(w)n(ords)g Fc(italic)898 b Fg(/italic/)2046
@ -2676,10 +2684,9 @@ b(Lines)28 b(starting)g(with)g Fg(#)2046 3273 y Fi(are)j(commen)n(ts)g
3441 y(toggle)h(COMMENT)d(k)n(eyw)n(ord)j(on)f(en)n(try)285
b Fg(C-c)36 b(;)2046 3644 y Fh(Completion)2046 3800 y
Fi(In-bu\013er)e(completion)g(completes)h(TODO)d(k)n(eyw)n(ords)i(at)g
(headline)2046 3869 y(start,)26 b(T)-6 b(eX)26 b(macros)f(after)h(\\)p
Fg(\\)p Fi(",)h(option)f(k)n(eyw)n(ords)g(after)g(\\)p
Fg(#-)p Fi(",)h(k)n(ey-)2046 3939 y(w)n(ord)d(form)n(ulas)e(after)i(\\)
p Fg(=)p Fi(",)g(and)g(dictionary)g(w)n(ords)g(elsewhere.)2046
(headline)2046 3869 y(start,)28 b(T)-6 b(eX)27 b(macros)g(after)g(\\)p
Fg(\\)p Fi(",)h(option)g(k)n(eyw)n(ords)g(after)f(\\)p
Fg(#-)p Fi(",)h(and)2046 3939 y(dictionary)c(w)n(ords)g(elsewhere.)2046
4037 y(Complete)h(w)n(ord)e(at)h(p)r(oin)n(t)702 b Fg(M-TAB)4242
-364 y Fh(Calendar)36 b(and)h(Diary)i(In)m(tegration)4242
-208 y Fi(T)-6 b(o)35 b(include)g(en)n(tries)g(from)f(the)i(Emacs)f
@ -2738,7 +2745,7 @@ b Fi(with)g(the)h(cur-)4242 3574 y(sor)h(still)g(in)g(a)h(line)f(to)h
Fg(org-CUA-compatibility)p Fi(.)4535 3770 y Fb(Cop)n(yrigh)n(t)4838
3768 y(c)4821 3770 y Fa(\015)d Fb(2005)i(F)-5 b(ree)21
b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 b(Inc.)4795 3826
y(v3.13)h(for)h(Org-Mo)r(de)e(3.13,)i(2005)4912 3882
y(v3.15)h(for)h(Org-Mo)r(de)e(3.15,)i(2005)4912 3882
y(Author:)k(Philip)18 b(Ro)r(ok)n(e)4473 3937 y(based)j(on)g(refcard)g
(design)g(and)f(format)i(b)n(y)f(Stephen)f(Gildea)4242
4022 y(P)n(ermission)28 b(is)f(gran)n(ted)i(to)f(mak)n(e)h(and)e

View file

@ -1,11 +1,11 @@
% Reference Card for Org Mode 3.13
% Reference Card for Org Mode 3.15
%
%**start of header
\newcount\columnsperpage
% This file can be printed with 1, 2, or 3 columns per page (see below).
% At the moment this card works quite nicely in 3 column format and
% currently takes most of 2 pages. It is thus suited to producing one
% currently takes 2 full pages. It is thus suited to producing one
% double-side page when printed.
% There are a couple of tweaks in the format of this card which make it work
@ -32,8 +32,8 @@
% You should have received a copy of the GNU General Public License
% along with GNU Emacs; see the file COPYING. If not, write to
% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
% Boston, MA 02110-1301, USA.
% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
% Boston, MA 02111-1307, USA.
% This file is intended to be processed by plain TeX (TeX82).
%
@ -58,7 +58,7 @@
% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
% for their many good ideas.
\def\orgversionnumber{3.13}
\def\orgversionnumber{3.15}
\def\year{2005}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
@ -467,29 +467,30 @@ Outside of tables, the same keys may have other functionality.
Except for the summation commands, these need the Emacs calc package
installed.
\key{replace current field with result of formula}{C-c =}
\key{... same calculation for rest of column}{C-u C-c =}
\key{set and eval column formula}{C-c =}
\key{set and eval named-field formula}{C-u C-c =}
\key{edit formulas in separate buffer}{C-c '}
\key{re-apply all stored equations to current line}{C-c *}
\key{re-apply all stored equations to entire table}{C-u C-c *}
\kbd{TAB}, \kbd{RET} and \kbd{C-c C-c} trigger automatic recalculation
in lines starting with: {\tt | \# |}.
\key{rotate recalculation mark through \# * ! \^ \_ \$}{C-\#}
\key{rotate calculation mark through \# * ! \^ \_ \$}{C-\#}
\key{display column number cursor is in}{C-c ?}
\key{sum numbers in current column/rectangle}{C-c +}
\key{copy down with increment}{S-RET$^4$}
A formula can also be typed directly into into a field. It will be
executed by \kbd{TAB}, \kbd{RET} and \kbd{C-c C-c}:
A formula can also be typed directly into into a field and will
executed by \kbd{TAB}, \kbd{RET} and \kbd{C-c C-c}. A leading \kbd{=}
introduces a column formula, \kbd{:=} a named-field formula.
\key{Example: Add Col1 and Col2}{=\$1+\$2}
\key{... with printf format specification}{=\$1+\$2;\%.2f}
\key{... with constants from constants.el}{=\$1/\$c/\$cm}
\key{Apply current (for this column) formula}{=}
\key{Sum all numbers above/left of cursor}{=sum / =sumh}
\key{Sum just the 3 fields closest to cursor}{=sum3/=sumh3}
\key{sum from 3rd hline above to here}{:=vsum(\&III)}
\key{apply current column formula}{=}
{\bf Miscellaneous}
@ -593,7 +594,7 @@ in the current directory.
\key{insert template of export options}{C-c C-x t}
\key{toggle fixed width for line or region}{C-c :}
\key{toggle fixed width for entry or region}{C-c :}
{\bf HTML formatting}
@ -646,8 +647,8 @@ Subtrees whose header starts with COMMENT are never exported.
\section{Completion}
In-buffer completion completes TODO keywords at headline start, TeX
macros after ``{\tt \\}'', option keywords after ``{\tt \#-}'',
keyword formulas after ``{\tt =}'', and dictionary words elsewhere.
macros after ``{\tt \\}'', option keywords after ``{\tt \#-}'', and
dictionary words elsewhere.
\key{Complete word at point}{M-TAB}

View file

@ -32,7 +32,7 @@
\columnsperpage=2
% Copyright (c) 1999, 2004 Free Software Foundation, Inc.
% Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -73,7 +73,7 @@
% If there were room, it would be nice to see a section on Dired.
\def\versionnumber{1.1}
\def\year{1999}
\def\year{2005}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.

View file

@ -14,7 +14,8 @@
\letterpaper=1
% Nothing else needs to be changed below this line.
% Copyright (c) 1987, 1993, 1996, 1997, 2005 Free Software Foundation, Inc.
% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
% 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -289,7 +290,7 @@ To enter GNU Emacs 22, just type its name: \kbd{emacs}
\key{{\bf insert} contents of another file into this buffer}{C-x i}
\key{replace this file with the file you really want}{C-x C-v}
\key{write buffer to a specified file}{C-x C-w}
\key{version control checkin/checkout}{C-x C-q}
\key{toggle read-only status of buffer}{C-x C-q}
\section{Getting Help}
@ -301,14 +302,14 @@ the directions. If you are a first-time user, type \kbd{C-h t} for a
\key{scroll help window}{C-M-v}
\key{apropos: show commands matching a string}{C-h a}
\key{show the function a key runs}{C-h c}
\key{describe the function a key runs}{C-h k}
\key{describe a function}{C-h f}
\key{get mode-specific information}{C-h m}
\section{Error Recovery}
\key{{\bf abort} partially typed or executing command}{C-g}
\metax{{\bf recover} a file lost by a system crash}{M-x recover-file}
\metax{{\bf recover} files lost by a system crash}{M-x recover-session}
\metax{{\bf undo} an unwanted change}{C-x u, C-_ {\rm or} C-/}
\metax{restore a buffer to its original contents}{M-x revert-buffer}
\key{redraw garbaged screen}{C-l}
@ -572,7 +573,7 @@ minibuffer. Type \kbd{F10} to activate the menu bar using the minibuffer.
\section{Info}
\key{enter the Info documentation reader}{C-h i}
\key{find specified function or variable in Info}{C-h C-i}
\key{find specified function or variable in Info}{C-h S}
\beginindentedkeys
Moving within a node:
@ -591,6 +592,7 @@ Moving between nodes:
\key{follow cross reference (return with \kbd{l})}{f}
\key{return to last node you saw}{l}
\key{return to directory node}{d}
\key{go to top node of Info file}{t}
\key{go to any node by name}{g}
Other:

View file

@ -1,3 +1,5 @@
% Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
\documentclass[10pt]{article}
\usepackage{multicol,tabularx}
\usepackage[a4paper,hmargin={2cm,2cm},vmargin={2cm,2cm},nohead,twoside]{geometry}
@ -17,7 +19,7 @@
\setlength{\ColThreeWidth}{25mm}
\newcommand{\versionnumber}[0]{2.2}
\newcommand{\nyear}[0]{1997}
\newcommand{\nyear}[0]{2005}
\newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
\centerline{\footnotesize \copyright\ \nyear\ Free Software Foundation, Inc.

View file

@ -1,5 +1,5 @@
% Reference Card for Dired
% Copyright (C) 2000 Free Software Foundation, Inc.
% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
% Slovak hyphenation rules applied
\shyph
@ -48,7 +48,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{0.1}
\def\year{2000}
\def\year{2005}
\def\version{May \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill

View file

@ -11,7 +11,8 @@
\columnsperpage=1
% Copyright (c) 1987, 1993, 1996, 1997 Free Software Foundation, Inc.
% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
% 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -67,7 +68,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{2.2}
\def\year{1997}
\def\year{2005}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.

View file

@ -21,7 +21,7 @@
\endinput
\fi
% Copyright (c) 2000, 2004 Free Software Foundation, Inc.
% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -50,7 +50,7 @@
% e.g. in the TeX Live CD).
\def\versionnumber{1.0}
\def\year{2000}
\def\year{2005}
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter

View file

@ -25,7 +25,7 @@
\endinput
\fi
% Copyright (c) 2000 Free Software Foundation, Inc.
% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -45,7 +45,7 @@
% Boston, MA 02110-1301, USA.
\def\versionnumber{1.0}
\def\year{2000}
\def\year{2005}
\def\copyrightnotice{\penalty-1\vfill
\vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter

View file

@ -7,7 +7,7 @@
\columnsperpage=1
% Copyright (c) 1987 Free Software Foundation, Inc.
% Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -54,7 +54,7 @@
\def\versionnumber{1.2}
\def\year{1987}
\def\year{2005}
\def\version{September \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill

View file

@ -7,7 +7,8 @@
\columnsperpage=2
% Copyright (c) 1995, 1996, 1997 Free Software Foundation, Inc.
% Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004,
% 2005 Free Software Foundation, Inc.
% This file is part of GNU Emacs.
@ -61,7 +62,7 @@
\def\versionnumber{3.0}
\def\year{1997}
\def\year{2005}
\def\version{August \year\ v\versionnumber}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill

View file

@ -1,3 +1,8 @@
2005-07-08 Kenichi Handa <handa@m17n.org>
* quail/japanese.el (quail-japanese-kanji-kkc): Fix order of
insertion and deletion.
2005-07-04 Lute Kamstra <lute@gnu.org>
Update FSF's address in GPL notices.

View file

@ -79,9 +79,9 @@
(when (= (char-before (overlay-end quail-conv-overlay)) ?n)
;; The last char is `n'. We had better convert it to `$B$s(B'
;; before kana-kanji conversion.
(goto-char (overlay-end quail-conv-overlay))
(delete-char -1)
(insert ?$B$s(B))
(goto-char (1- (overlay-end quail-conv-overlay)))
(insert ?$B$s(B)
(delete-char 1))
(let* ((from (copy-marker (overlay-start quail-conv-overlay)))
(len (- (overlay-end quail-conv-overlay) from)))
(quail-delete-overlays)

5
lib-src/.gitignore vendored
View file

@ -1,7 +1,7 @@
DOC
Makefile.c
b2m
ctags
ctags*
cvtmail
digest-doc
ebrowse
@ -9,8 +9,7 @@ emacsclient
emacsserver
etags
fakemail
fns-*
fns.el
getopt.h
hexl
make-docfile
movemail

View file

@ -1,3 +1,34 @@
2005-07-27 Juanma Barranquero <lekktu@gmail.com>
* .cvsignore: Don't ignore fns-* and fns.el, which are no longer
generated. Ignore also ctags.c and getopt.h.
* makefile.w32-in (clean): Delete getopt.h.
(getopt.h): New rule.
2005-07-26 Paul Eggert <eggert@cs.ucla.edu>
Merge gnulib getopt implementation into Emacs.
* Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* getopt.c, getopt1.c: Sync from gnulib.
* getopt_.h, getopt_int.h, gettext.h: New files, from gnulib.
* getopt.h: Removed (now is getopt_.h).
2005-07-13 Ken Raeburn <raeburn@gnu.org>
* pop.c: Don't include des.h (or variants thereof); krb.h will do
it.
(sendline): Add the \r\n to the line in a temporary buffer, and
write it all at once.
2005-07-04 Lute Kamstra <lute@gnu.org>
Update FSF's address in GPL notices.

View file

@ -1,6 +1,6 @@
# Makefile for lib-src subdirectory in GNU Emacs.
# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004
# Free Software Foundation, Inc.
# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
@ -344,7 +344,7 @@ uninstall:
rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
mostlyclean:
-rm -f core *.o
-rm -f core *.o getopt.h getopt.h-t
clean: mostlyclean
-rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
@ -382,11 +382,18 @@ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
$(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
./test-distrib ${srcdir}/testfile
GETOPTOBJS = getopt.o getopt1.o
GETOPTDEPS = $(GETOPTOBJS) ${srcdir}/getopt.h
getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h
/* We need the following in order to create a <getopt.h> when the system
doesn't have one that works with the given compiler. */
GETOPT_H = @GETOPT_H@
getopt.h: getopt_.h
cp $(srcdir)/getopt_.h $@-t
mv $@-t $@
GETOPTOBJS = @GETOPTOBJS@
GETOPTDEPS = $(GETOPTOBJS) $(GETOPT_H)
getopt.o: ${srcdir}/getopt.c $(GETOPT_H) ${srcdir}/gettext.h
${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c
getopt1.o: ${srcdir}/getopt1.c ${srcdir}/getopt.h
getopt1.o: ${srcdir}/getopt1.c $(GETOPT_H)
${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
#ifdef REGEXP_IN_LIBC
@ -430,7 +437,7 @@ b2m${EXEEXT}: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS)
movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS)
$(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MAIL) $(LIBS_MOVE) -o movemail
movemail.o: ${srcdir}/movemail.c ../src/config.h
movemail.o: ${srcdir}/movemail.c ../src/config.h $(GETOPT_H)
$(CC) -c ${CPP_CFLAGS} -Demacs ${MOVE_FLAGS} ${srcdir}/movemail.c
pop.o: ${srcdir}/pop.c ../src/config.h

View file

@ -1,4 +1,5 @@
/* Copyright (C) 1985, 1994 Free Software Foundation
/* Copyright (C) 1985, 1994, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,7 +1,8 @@
/* Give this program DOC-mm.nn.oo as standard input and it outputs to
standard output a file of nroff output containing the doc strings.
Copyright (C) 1987, 1994, 2001 Free Software Foundation Inc.
Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,7 +1,7 @@
/* ebrowse.c --- parsing files for the ebrowse C++ browser
Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99,
2000, 2001, 2002 Free Software Foundation Inc.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,6 +1,6 @@
/* Client process that communicates with GNU Emacs acting as server.
Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2003, 2004
Free Software Foundation, Inc.
Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,5 +1,6 @@
/*
Copyright (C) 1986, 1988, 1990, 1991 Free Software Foundation, Inc.
Copyright (C) 1986, 1988, 1990, 1991, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,6 +1,7 @@
/* Tags file maker to go with GNU Emacs -*- coding: latin-1 -*-
Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2001, 2002, 2004
Free Software Foundation, Inc. and Ken Arnold
Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995,
1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005 Free Software Foundation, Inc. and Ken Arnold
This file is not considered part of GNU Emacs.

View file

@ -1,5 +1,6 @@
/* sendmail-like interface to /bin/mail for system V,
Copyright (C) 1985, 1994, 1999 Free Software Foundation, Inc.
Copyright (C) 1985, 1994, 1999, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
/* getopt_long and getopt_long_only entry points for GNU getopt.
Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
Free Software Foundation, Inc.
Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997,
1998, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@ -26,36 +26,10 @@
#else
# include "getopt.h"
#endif
#if !defined __STDC__ || !__STDC__
/* This is a separate conditional since some stdc systems
reject `defined (const)'. */
#ifndef const
#define const
#endif
#endif
#include "getopt_int.h"
#include <stdio.h>
/* Comment out all this code if we are using the GNU C Library, and are not
actually compiling the library itself. This code is part of the GNU C
Library, but also included in many other GNU distributions. Compiling
and linking in this code is a waste when using the GNU C library
(especially if it is a shared library). Rather than having every GNU
program understand `configure --with-gnu-libc' and omit the object files,
it is simpler to just do this in the source for each such file. */
#define GETOPT_INTERFACE_VERSION 2
#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
#include <gnu-versions.h>
#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
#define ELIDE_CODE
#endif
#endif
#ifndef ELIDE_CODE
/* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */
#ifdef __GNU_LIBRARY__
@ -67,14 +41,20 @@
#endif
int
getopt_long (argc, argv, options, long_options, opt_index)
int argc;
char *const *argv;
const char *options;
const struct option *long_options;
int *opt_index;
getopt_long (int argc, char *__getopt_argv_const *argv, const char *options,
const struct option *long_options, int *opt_index)
{
return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
return _getopt_internal (argc, (char **) argv, options, long_options,
opt_index, 0, 0);
}
int
_getopt_long_r (int argc, char **argv, const char *options,
const struct option *long_options, int *opt_index,
struct _getopt_data *d)
{
return _getopt_internal_r (argc, argv, options, long_options, opt_index,
0, 0, d);
}
/* Like getopt_long, but '-' as well as '--' can indicate a long option.
@ -83,31 +63,30 @@ getopt_long (argc, argv, options, long_options, opt_index)
instead. */
int
getopt_long_only (argc, argv, options, long_options, opt_index)
int argc;
char *const *argv;
const char *options;
const struct option *long_options;
int *opt_index;
getopt_long_only (int argc, char *__getopt_argv_const *argv,
const char *options,
const struct option *long_options, int *opt_index)
{
return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
return _getopt_internal (argc, (char **) argv, options, long_options,
opt_index, 1, 0);
}
# ifdef _LIBC
libc_hidden_def (getopt_long)
libc_hidden_def (getopt_long_only)
# endif
int
_getopt_long_only_r (int argc, char **argv, const char *options,
const struct option *long_options, int *opt_index,
struct _getopt_data *d)
{
return _getopt_internal_r (argc, argv, options, long_options, opt_index,
1, 0, d);
}
#endif /* Not ELIDE_CODE. */
#ifdef TEST
#include <stdio.h>
int
main (argc, argv)
int argc;
char **argv;
main (int argc, char **argv)
{
int c;
int digit_optind = 0;

View file

@ -1,5 +1,6 @@
/* Declarations for getopt.
Copyright (C) 1989-1994, 1996-1999, 2001 Free Software Foundation, Inc.
Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
2001, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@ -22,6 +23,64 @@
# define _GETOPT_H 1
#endif
/* Standalone applications should #define __GETOPT_PREFIX to an
identifier that prefixes the external functions and variables
defined in this header. When this happens, include the
headers that might declare getopt so that they will not cause
confusion if included after this file. Then systematically rename
identifiers so that they do not collide with the system functions
and variables. Renaming avoids problems with some compilers and
linkers. */
#if defined __GETOPT_PREFIX && !defined __need_getopt
# include <stdlib.h>
# include <stdio.h>
# if HAVE_UNISTD_H
# include <unistd.h>
# endif
# undef __need_getopt
# undef getopt
# undef getopt_long
# undef getopt_long_only
# undef optarg
# undef opterr
# undef optind
# undef optopt
# define __GETOPT_CONCAT(x, y) x ## y
# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y)
# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y)
# define getopt __GETOPT_ID (getopt)
# define getopt_long __GETOPT_ID (getopt_long)
# define getopt_long_only __GETOPT_ID (getopt_long_only)
# define optarg __GETOPT_ID (optarg)
# define opterr __GETOPT_ID (opterr)
# define optind __GETOPT_ID (optind)
# define optopt __GETOPT_ID (optopt)
#endif
/* Standalone applications get correct prototypes for getopt_long and
getopt_long_only; they declare "char **argv". libc uses prototypes
with "char *const *argv" that are incorrect because getopt_long and
getopt_long_only can permute argv; this is required for backward
compatibility (e.g., for LSB 2.0.1).
This used to be `#if defined __GETOPT_PREFIX && !defined __need_getopt',
but it caused redefinition warnings if both unistd.h and getopt.h were
included, since unistd.h includes getopt.h having previously defined
__need_getopt.
The only place where __getopt_argv_const is used is in definitions
of getopt_long and getopt_long_only below, but these are visible
only if __need_getopt is not defined, so it is quite safe to rewrite
the conditional as follows:
*/
#if !defined __need_getopt
# if defined __GETOPT_PREFIX
# define __getopt_argv_const /* empty */
# else
# define __getopt_argv_const const
# endif
#endif
/* If __GNU_LIBRARY__ is not already defined, either we are being used
standalone, or this is the first header included in the source file.
If we are being used with glibc, we need to include <features.h>, but
@ -33,6 +92,17 @@
# include <ctype.h>
#endif
#ifndef __THROW
# ifndef __GNUC_PREREQ
# define __GNUC_PREREQ(maj, min) (0)
# endif
# if defined __cplusplus && __GNUC_PREREQ (2,8)
# define __THROW throw ()
# else
# define __THROW
# endif
#endif
#ifdef __cplusplus
extern "C" {
#endif
@ -77,7 +147,7 @@ extern int optopt;
The field `has_arg' is:
no_argument (or 0) if the option does not take an argument,
required_argument (or 1) if the option requires an argument,
optional_argument (or 2) if the option takes an optional argument.
optional_argument (or 2) if the option takes an optional argument.
If the field `flag' is not NULL, it points to a variable that is set
to the value given in the field `val' when the option is found, but
@ -92,11 +162,7 @@ extern int optopt;
struct option
{
# if (defined __STDC__ && __STDC__) || defined __cplusplus
const char *name;
# else
char *name;
# endif
/* has_arg can't be an enum because some compilers complain about
type mismatches in all the code that assumes it is an int. */
int has_arg;
@ -136,39 +202,20 @@ struct option
arguments to the option '\0'. This behavior is specific to the GNU
`getopt'. */
#if (defined __STDC__ && __STDC__) || defined __cplusplus
# ifdef __GNU_LIBRARY__
/* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */
extern int getopt (int ___argc, char *const *___argv, const char *__shortopts);
# else /* not __GNU_LIBRARY__ */
extern int getopt ();
# endif /* __GNU_LIBRARY__ */
extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
__THROW;
# ifndef __need_getopt
extern int getopt_long (int ___argc, char *const *___argv,
#ifndef __need_getopt
extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
const char *__shortopts,
const struct option *__longopts, int *__longind);
extern int getopt_long_only (int ___argc, char *const *___argv,
const struct option *__longopts, int *__longind)
__THROW;
extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
const char *__shortopts,
const struct option *__longopts, int *__longind);
const struct option *__longopts, int *__longind)
__THROW;
/* Internal only. Users should not call this directly. */
extern int _getopt_internal (int ___argc, char *const *___argv,
const char *__shortopts,
const struct option *__longopts, int *__longind,
int __long_only);
# endif
#else /* not __STDC__ */
extern int getopt ();
# ifndef __need_getopt
extern int getopt_long ();
extern int getopt_long_only ();
extern int _getopt_internal ();
# endif
#endif /* __STDC__ */
#endif
#ifdef __cplusplus
}
@ -179,5 +226,5 @@ extern int _getopt_internal ();
#endif /* getopt.h */
/* arch-tag: 9adb7828-e6a6-40cd-8512-0cdf1f20ddd4
/* arch-tag: e36f5607-3ac6-4cdc-9aa7-c26c6525fe9b
(do not change this comment) */

134
lib-src/getopt_int.h Normal file
View file

@ -0,0 +1,134 @@
/* Internal declarations for getopt.
Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
2001, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _GETOPT_INT_H
#define _GETOPT_INT_H 1
extern int _getopt_internal (int ___argc, char **___argv,
const char *__shortopts,
const struct option *__longopts, int *__longind,
int __long_only, int __posixly_correct);
/* Reentrant versions which can handle parsing multiple argument
vectors at the same time. */
/* Data type for reentrant functions. */
struct _getopt_data
{
/* These have exactly the same meaning as the corresponding global
variables, except that they are used for the reentrant
versions of getopt. */
int optind;
int opterr;
int optopt;
char *optarg;
/* Internal members. */
/* True if the internal members have been initialized. */
int __initialized;
/* The next char to be scanned in the option-element
in which the last option character we returned was found.
This allows us to pick up the scan where we left off.
If this is zero, or a null string, it means resume the scan
by advancing to the next ARGV-element. */
char *__nextchar;
/* Describe how to deal with options that follow non-option ARGV-elements.
If the caller did not specify anything,
the default is REQUIRE_ORDER if the environment variable
POSIXLY_CORRECT is defined, PERMUTE otherwise.
REQUIRE_ORDER means don't recognize them as options;
stop option processing when the first non-option is seen.
This is what Unix does.
This mode of operation is selected by either setting the environment
variable POSIXLY_CORRECT, or using `+' as the first character
of the list of option characters, or by calling getopt.
PERMUTE is the default. We permute the contents of ARGV as we
scan, so that eventually all the non-options are at the end.
This allows options to be given in any order, even with programs
that were not written to expect this.
RETURN_IN_ORDER is an option available to programs that were
written to expect options and other ARGV-elements in any order
and that care about the ordering of the two. We describe each
non-option ARGV-element as if it were the argument of an option
with character code 1. Using `-' as the first character of the
list of option characters selects this mode of operation.
The special argument `--' forces an end of option-scanning regardless
of the value of `ordering'. In the case of RETURN_IN_ORDER, only
`--' can cause `getopt' to return -1 with `optind' != ARGC. */
enum
{
REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
} __ordering;
/* If the POSIXLY_CORRECT environment variable is set
or getopt was called. */
int __posixly_correct;
/* Handle permutation of arguments. */
/* Describe the part of ARGV that contains non-options that have
been skipped. `first_nonopt' is the index in ARGV of the first
of them; `last_nonopt' is the index after the last of them. */
int __first_nonopt;
int __last_nonopt;
#if defined _LIBC && defined USE_NONOPTION_FLAGS
int __nonoption_flags_max_len;
int __nonoption_flags_len;
# endif
};
/* The initializer is necessary to set OPTIND and OPTERR to their
default values and to clear the initialization flag. */
#define _GETOPT_DATA_INITIALIZER { 1, 1 }
extern int _getopt_internal_r (int ___argc, char **___argv,
const char *__shortopts,
const struct option *__longopts, int *__longind,
int __long_only, int __posixly_correct,
struct _getopt_data *__data);
extern int _getopt_long_r (int ___argc, char **___argv,
const char *__shortopts,
const struct option *__longopts, int *__longind,
struct _getopt_data *__data);
extern int _getopt_long_only_r (int ___argc, char **___argv,
const char *__shortopts,
const struct option *__longopts,
int *__longind,
struct _getopt_data *__data);
#endif /* getopt_int.h */
/* arch-tag: 8bfc548f-23d6-46aa-b5b5-2739b0edaf79
(do not change this comment) */

32
nt/inc/gettext.h → lib-src/gettext.h Executable file → Normal file
View file

@ -1,20 +1,20 @@
/* Convenience header for conditional use of GNU <libintl.h>.
Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2004,
2005 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
by the Free Software Foundation; either version 2, or (at your option)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _LIBGETTEXT_H
#define _LIBGETTEXT_H 1
@ -37,6 +37,16 @@
# include <locale.h>
#endif
/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
<libintl.h>, which chokes if dcgettext is defined as a macro. So include
it now, to make later inclusions of <libintl.h> a NOP. */
#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
# include <cstdlib>
# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
# include <libintl.h>
# endif
#endif
/* Disabled NLS.
The casts to 'const char *' serve the purpose of producing warnings
for invalid uses of the value returned from these functions.
@ -68,5 +78,5 @@
#endif /* _LIBGETTEXT_H */
/* arch-tag: 07b35a70-3531-4cda-9674-2968467143ec
/* arch-tag: 3d01bb8e-82e3-4674-9812-de4c4224f7d1
(do not change this comment) */

View file

@ -1,6 +1,7 @@
#! /usr/bin/perl
# Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#

View file

@ -1,5 +1,5 @@
/* Convert files for Emacs Hexl mode.
Copyright (C) 1989 Free Software Foundation, Inc
Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is not considered part of GNU Emacs.

View file

@ -1,6 +1,6 @@
/* Generate doc-string file for GNU Emacs from source files.
Copyright (C) 1985, 86, 92, 93, 94, 97, 1999, 2000, 01, 2004
Free Software Foundation, Inc.
Copyright (C) 1985, 1986, 1992, 1993, 1994, 1997, 1999, 2000, 2001,
2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,5 +1,6 @@
# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
# Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc.
# Copyright (C) 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
@ -286,6 +287,7 @@ install: $(INSTALL_FILES)
clean:
- $(DEL) *~ DOC* $(COMPILER_TEMP_FILES)
- $(DEL) ctags.c
- $(DEL) getopt.h
- $(DEL_TREE) $(OBJDIR)
cleanall: clean
@ -301,6 +303,8 @@ cleanall: clean
$(CP) $(ALL_DEPS) $@
../src/paths.h: ../nt/paths.h
$(CP) $(ALL_DEPS) $@
getopt.h: getopt_.h
$(CP) $(ALL_DEPS) $@
### DEPENDENCIES ###

View file

@ -1,6 +1,7 @@
/* movemail foo bar -- move file foo to file bar,
locking file foo the way /bin/mail respects.
Copyright (C) 1986, 92, 93, 94, 96, 1999 Free Software Foundation, Inc.
Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,5 +1,5 @@
/* Utility and Unix shadow routines for GNU Emacs support programs on NT.
Copyright (C) 1994 Free Software Foundation, Inc.
Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,5 +1,5 @@
/* Utility and Unix shadow routines for GNU Emacs support programs on NT.
Copyright (C) 1994 Free Software Foundation, Inc.
Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,5 +1,6 @@
/* pop.c: client routines for talking to a POP3-protocol post-office server
Copyright (c) 1991, 1993, 1996, 1997, 1999 Free Software Foundation, Inc.
Copyright (C) 1991, 1993, 1996, 1997, 1999, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Written by Jonathan Kamens, jik@security.ov.com.
This file is part of GNU Emacs.
@ -76,17 +77,6 @@ extern struct servent *hes_getservbyname (/* char *, char * */);
# ifdef HAVE_KRB5_H
# include <krb5.h>
# endif
# ifdef HAVE_DES_H
# include <des.h>
# else
# ifdef HAVE_KERBEROSIV_DES_H
# include <kerberosIV/des.h>
# else
# ifdef HAVE_KERBEROS_DES_H
# include <kerberos/des.h>
# endif
# endif
# endif
# ifdef HAVE_KRB_H
# include <krb.h>
# else
@ -1403,12 +1393,24 @@ sendline (server, line)
{
#define SENDLINE_ERROR "Error writing to POP server: "
int ret;
char *buf;
ret = fullwrite (server->file, line, strlen (line));
if (ret >= 0)
{ /* 0 indicates that a blank line was written */
ret = fullwrite (server->file, "\r\n", 2);
}
/* Combine the string and the CR-LF into one buffer. Otherwise, two
reasonable network stack optimizations, Nagle's algorithm and
delayed acks, combine to delay us a fraction of a second on every
message we send. (Movemail writes line without \r\n, client
kernel sends packet, server kernel delays the ack to see if it
can combine it with data, movemail writes \r\n, client kernel
waits because it has unacked data already in its outgoing queue,
client kernel eventually times out and sends.)
This can be something like 0.2s per command, which can add up
over a few dozen messages, and is a big chunk of the time we
spend fetching mail from a server close by. */
buf = alloca (strlen (line) + 3);
strcpy (buf, line);
strcat (buf, "\r\n");
ret = fullwrite (server->file, buf, strlen (buf));
if (ret < 0)
{

View file

@ -1,5 +1,6 @@
/* pop.h: Header file for the "pop.c" client POP3 protocol.
Copyright (c) 1991,1993 Free Software Foundation, Inc.
Copyright (C) 1991, 1993, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Written by Jonathan Kamens, jik@security.ov.com.
This file is part of GNU Emacs.

View file

@ -1,5 +1,6 @@
/* profile.c --- generate periodic events for profiling of Emacs Lisp code.
Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
Copyright (C) 1992, 1994, 1999, 2002, 2003, 2004,
2005 Free Software Foundation, Inc.
Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>

View file

@ -2,7 +2,8 @@
# This script accepts any number of file arguments and checks them into RCS.
# Copyright (C) 1993, 1994, 1995, 2001, 2002 Free Software Foundation, Inc.
# Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#

View file

@ -55,7 +55,7 @@ Report bugs to <bug-gnu-emacs@gnu.org>.'
Id='$Id$'
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
# 2004 Free Software Foundation, Inc.
# 2004, 2005 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -72,7 +72,7 @@ Id='$Id$'
# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
Copyright='Copyright (C) 2004 Free Software Foundation, Inc.
Copyright='Copyright (C) 2005 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.

View file

@ -1,8 +1,8 @@
/* Give this program DOC-mm.nn.oo as standard input and it outputs to
standard output a file of texinfo input containing the doc strings.
Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001
Free Software Foundation Inc.
Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,7 +1,7 @@
/* test-distrib.c --- testing distribution of nonprinting chars
Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001
Free Software Foundation Inc.
Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.

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