andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged from miles@gnu.org--gnu-2005 (patch 296-306)

Browse source 
Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-296
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-297
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-298
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-299
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-300
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-301
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-302
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-303
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-304
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-305
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-306
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-344
This commit is contained in:
Karoly Lorentey 2005-05-13 22:59:23 +00:00
commit 892f9671ad
118 changed files with 4135 additions and 2561 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-05-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* configure.in: Don't check HAVE_CARBON if HAVE_X11 is set to yes.
Check HAVE_CARBON before USE_TOOLKIT_SCROLL_BARS. Define
USE_TOOLKIT_SCROLL_BARS by default if HAVE_CARBON is set to yes.
* configure: Regenerate.
2005-05-07 J,Ai(Br,At(Bme Marant <jerome@marant.org>
* make-dist: Remove references to makefile.nt and makefile.def.

19
admin/FOR-RELEASE
View file

@ -93,9 +93,12 @@ you're going to handle.
DIRECTORY STATUS IN CHARGE
--------- ------ ---------
lisp/international working Kenichi Handa
lisp/emulation working Thien-Thi Nguyen
lisp/international done Kenichi Handa
lisp/languages working Kenichi Handa
lisp/net working Thien-Thi Nguyen
lisp/play done Thien-Thi Nguyen
lisp/term done Thien-Thi Nguyen
** Update AUTHORS.
@ -175,7 +178,7 @@ lispref/customize.texi Chong Yidong
lispref/debugging.texi Joakim Verona <joakim@verona.se> Lute Kamstra
lispref/display.texi Chong Yidong
lispref/edebug.texi Chong Yidong
lispref/elisp.texi "Luc Teirlinck"
lispref/elisp.texi "Luc Teirlinck" Lute Kamstra
lispref/errors.texi "Luc Teirlinck"
lispref/eval.texi "Luc Teirlinck" Chong Yidong
lispref/files.texi "Luc Teirlinck" Chong Yidong
@ -200,7 +203,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
lispref/processes.texi Chong Yidong Thien-Thi Nguyen
lispref/searching.texi "Luc Teirlinck" Chong Yidong
lispref/sequences.texi "Luc Teirlinck" Chong Yidong
lispref/streams.texi "Luc Teirlinck" Chong Yidong
@ -214,10 +217,10 @@ lispref/windows.texi "Luc Teirlinck" Chong Yidong
** Check the Emacs Tutorial.
The first line of every tutorial must begin with a sentence saying
"Emacs Tutorial" in the respective language. This should be followed
by "See end for copying conditions", likewise in the respective
language.
The first line of every tutorial must begin with text ending in a period
(".", ASCII 0x2E) saying "Emacs Tutorial" in the respective language.
This should be followed by "See end for copying conditions", likewise
in the respective language.
After each file name, on the same line or the following line, come the
names of the people who have checked it.

302
configure vendored
View file

@ -8215,6 +8215,154 @@ if test "${opsys}" = "hpux9shr"; then
esac
fi
HAVE_CARBON=no
if test "${HAVE_X11}" != "yes"; then
if test "${with_carbon}" != "no"; then
if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6
else
# Is the header compilable?
echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5
echo $ECHO_N "checking Carbon/Carbon.h 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 <Carbon/Carbon.h>
_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 Carbon/Carbon.h presence" >&5
echo $ECHO_N "checking Carbon/Carbon.h 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 <Carbon/Carbon.h>
_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: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: 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 Carbon/Carbon.h" >&5
echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_Carbon_Carbon_h=$ac_header_preproc
fi
echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6
fi
if test $ac_cv_header_Carbon_Carbon_h = yes; then
HAVE_CARBON=yes
fi
fi
fi
### Compute the unexec source name from the object name.
UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
@ -11042,6 +11190,12 @@ _ACEOF
elif test "${HAVE_GTK}" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define USE_TOOLKIT_SCROLL_BARS 1
_ACEOF
USE_TOOLKIT_SCROLL_BARS=yes
elif test "${HAVE_CARBON}" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define USE_TOOLKIT_SCROLL_BARS 1
_ACEOF
USE_TOOLKIT_SCROLL_BARS=yes
@ -12384,153 +12538,6 @@ _ACEOF
fi
fi
### Use Mac OS X Carbon API to implement GUI.
HAVE_CARBON=no
if test "${with_carbon}" != "no"; then
if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6
else
# Is the header compilable?
echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5
echo $ECHO_N "checking Carbon/Carbon.h 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 <Carbon/Carbon.h>
_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 Carbon/Carbon.h presence" >&5
echo $ECHO_N "checking Carbon/Carbon.h 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 <Carbon/Carbon.h>
_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: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: Carbon/Carbon.h: 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 Carbon/Carbon.h" >&5
echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_Carbon_Carbon_h=$ac_header_preproc
fi
echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6
fi
if test $ac_cv_header_Carbon_Carbon_h = yes; then
HAVE_CARBON=yes
fi
fi
if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5
echo $ECHO_N "checking for malloc/malloc.h... $ECHO_C" >&6
@ -12678,6 +12685,7 @@ fi
### Use Mac OS X Carbon API to implement GUI.
if test "${HAVE_CARBON}" = "yes"; then
cat >>confdefs.h <<\_ACEOF

17
configure.in
View file

@ -1694,6 +1694,13 @@ if test "${opsys}" = "hpux9shr"; then
esac
fi
HAVE_CARBON=no
if test "${HAVE_X11}" != "yes"; then
if test "${with_carbon}" != "no"; then
AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
fi
fi
### Compute the unexec source name from the object name.
UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
@ -2155,6 +2162,9 @@ if test "${with_toolkit_scroll_bars}" != "no"; then
elif test "${HAVE_GTK}" = "yes"; then
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
USE_TOOLKIT_SCROLL_BARS=yes
elif test "${HAVE_CARBON}" = "yes"; then
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
USE_TOOLKIT_SCROLL_BARS=yes
fi
fi
@ -2308,15 +2318,10 @@ if test "${HAVE_X11}" = "yes"; then
fi
fi
### Use Mac OS X Carbon API to implement GUI.
HAVE_CARBON=no
if test "${with_carbon}" != "no"; then
AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
fi
dnl Check for malloc/malloc.h on darwin
AC_CHECK_HEADER(malloc/malloc.h, AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.]))
### Use Mac OS X Carbon API to implement GUI.
if test "${HAVE_CARBON}" = "yes"; then
AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.])
window_system=mac

37
etc/ChangeLog
View file

@ -59,7 +59,7 @@
* TUTORIAL.de: Updated header.
2005-04-05 Marcelo Toledo <marcelo@marcelotoledo.org>
2005-04-05 Marcelo Toledo <marcelo@gnu.org>
* TUTORIAL.translators: Added the field Maintainer.
@ -80,20 +80,24 @@
* TUTORIAL.es: Clean up line breaks.
2005-04-01 Marcelo Toledo <marcelo@marcelotoledo.org>
2005-04-01 Marcelo Toledo <marcelo@gnu.org>
* TUTORIAL.pt_BR, TUTORIAL.cn, TUTORIAL.cs, TUTORIAL.de,
* TUTORIAL.es, TUTORIAL.fr, TUTORIAL.it, TUTORIAL.ja, TUTORIAL.ko,
* TUTORIAL.pl, TUTORIAL.pt_BR, TUTORIAL.ro, TUTORIAL.ru,
* TUTORIAL.sk, TUTORIAL.sl, TUTORIAL.th, TUTORIAL.zh: Fix title
line.
2005-04-01 Ognyan Kulev <ogi@fmi.uni-sofia.bg>
* TUTORIAL.bg: Fix title line; Applied TUTORIAL changes in
2005-02-08T14:20:54Z!lute@gnu.org, "Emacs" is not transliterated to cyrillic anymore;
Minor fixes; patch by Ognyan Kulev <ogi@fmi.uni-sofia.bg>.
Minor fixes.
2005-04-01 Mats Lidell <matsl@contactor.se>
* TUTORIAL.sv: Sync some other changes with the TUTORIAL version
2005-04-01T00:31:25Z!rms@gnu.org patch by Mats Lidell <matsl@contactor.se>.
2005-04-01T00:31:25Z!rms@gnu.org.
2005-04-01 Lute Kamstra <lute@gnu.org>
@ -358,7 +362,7 @@
* tree-widget: New directory containing tree-widget themes and
images.
2004-04-13 Marcelo Toledo <marcelo@marcelotoledo.org>
2004-04-13 Marcelo Toledo <marcelo@gnu.org>
* TUTORIAL.pt_BR: initial check-in.
@ -377,9 +381,9 @@
* TUTORIAL.it, TUTORIAL.nl, TUTORIAL.sv: Add coding: latin-1.
2004-04-16 David Kastrup <dak@gnu.org>
2004-04-16 Alex Ott <ottalex@narod.ru>
* TUTORIAL.ru: Changes by Alex Ott checked in.
* TUTORIAL.ru: Various corrections.
2004-04-14 Jan Nieuwenhuizen <janneke@gnu.org>
@ -574,10 +578,9 @@
* MH-E-NEWS: Upgraded to MH-E version 7.0.
2002-11-22 Juanma Barranquero <lektu@terra.es>
2002-11-22 Rafael Sep,Az(Blveda <drs@gnulinux.org.mx>
* TUTORIAL.es: Extensively changed and updated by Rafael Sep,Az(Blveda
<drs@gnulinux.org.mx>.
* TUTORIAL.es: Extensively changed and updated.
2002-10-01 Bill Wohler <wohler@newt.com>
@ -1833,11 +1836,13 @@
* emacstool.c: setenv IN_EMACSTOOL=t, TERM=sun, TERMCAP=.
* emacsstool.1: update to document environment variables.
1989-02-21 Mosur Mohan (email@notavailable)
* etags.c (PAS_funcs): New function.
1989-02-21 Richard Stallman (rms@sugar-bombs.ai.mit.edu)
* etags.c (PAS_funcs): New function by Mosur Mohan.
* movemail.c: On sysv, include unistd.h.
1989-02-18 Richard Stallman (rms@sugar-bombs.ai.mit.edu)
@ -1856,10 +1861,10 @@
* fakemail.c (put_line): Break header lines at 79 cols.
1989-01-19 Richard Stallman (rms@sugar-bombs.ai.mit.edu)
1989-01-19 Sam Kendall (email@notavailable)
* etags.c: Greatly rewritten by Sam Kendall for C++ support and for
multiple tags per line.
* etags.c: Greatly rewritten for C++ support and for multiple tags
per line.
1989-01-03 Richard Stallman (rms@sugar-bombs.ai.mit.edu)

2189
etc/NEWS
View file

File diff suppressed because it is too large Load diff

5
etc/TODO
View file

@ -9,6 +9,9 @@ to the FSF.
* Small but important fixes needed in existing features:
** Convert everything that uses post-command-idle-hook
to use idle timers instead.
** Fix the kill/yank treatment of invisible text. At the moment,
invisible text is placed in the kill-ring, so that the contents of
the ring may not correspond to the text as displayed to the user. It
@ -259,6 +262,8 @@ to the FSF.
** Make monochrome images display using the foreground and background
colors of the applicable faces.
** Face remapping.
** Add support for rendering antialiased text, probably using
XRender/Freetype.

2
etc/TUTORIAL.pt_BR
View file

@ -1061,7 +1061,7 @@ Esse tutorial descende de uma longa linha de tutoriais do Emacs
iniciando com um escrito por Stuart Cracraft para o Emacs original.
Essa versão do tutorial foi originalmente traduzida por Marcelo Toledo
<marcelo@marcelotoledo.org> e como o GNU Emacs, tem um copyright, e vem
<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

4
etc/TUTORIAL.translators
View file

@ -52,8 +52,8 @@ Maintainer: Beatę Wierzchołowską <beataw@orient.uw.edu.pl>
Janusz S. Bien <jsbien@mail.uw.edu.pl>
* TUTORIAL.pt_BR:
Author: Marcelo Toledo <marcelo@marcelotoledo.org>
Maintainer: Marcelo Toledo <marcelo@marcelotoledo.org>
Author: Marcelo Toledo <marcelo@gnu.org>
Maintainer: Marcelo Toledo <marcelo@gnu.org>
* TUTORIAL.ro:
Author: Tudor Hulubei <tudor@gnu.org>

5
lib-src/ChangeLog
View file

@ -1,3 +1,8 @@
2005-05-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* make-docfile.c (DIRECTORY_SEP): New macro.
(IS_DIRECTORY_SEP): Use it.
2005-03-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* emacsclient.c: Avoid expansion of getcwd when defined as a macro.

10
lib-src/make-docfile.c
View file

@ -60,8 +60,16 @@ Boston, MA 02111-1307, USA. */
#define READ_BINARY "r"
#endif /* not DOS_NT */
#ifndef DIRECTORY_SEP
#ifdef MAC_OS8
#define DIRECTORY_SEP ':'
#else /* not MAC_OS8 */
#define DIRECTORY_SEP '/'
#endif /* not MAC_OS8 */
#endif
#ifndef IS_DIRECTORY_SEP
#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/')
#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
#endif
int scan_file ();

230
lisp/ChangeLog
View file

@ -1,5 +1,180 @@
2005-05-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* term/mac-win.el (mac-select-convert-to-string): Try coding
systems in mac-script-code-coding-systems if specified one cannot
encode string for `com.apple.traditional-mac-plain-text'.
2005-05-13 Daniel Pfeiffer <occitan@esperanto.org>
* progmodes/make-mode.el (makefile-targets-face)
(makefile-shell-face, makefile-makepp-perl-face): New faces.
(makefile-dependency-regex): Fix it to not make the colon in
$(var:a=b) special.
(makefile-rule-action-regex): New regexp for highlighting embedded
Shell strings.
(makefile-macroassign-regex): Handle != for highlighting as
embedded Shell strings.
(makefile-var-use-regex): New const.
(makefile-statements, makefile-automake-statements)
(makefile-gmake-statements, makefile-makepp-statements)
(makefile-bsdmake-statements): New consts.
(makefile-make-font-lock-keywords): New function.
(makefile-automake-font-lock-keywords)
(makefile-gmake-font-lock-keywords)
(makefile-makepp-font-lock-keywords)
(makefile-bsdmake-font-lock-keywords): New consts.
(makefile-mode-map): Add switchers between the various submodes.
(makefile-mode): Document the availability of the variants.
(makefile-automake-mode, makefile-gmake-mode)
(makefile-makepp-mode, makefile-bsdmake-mode): New derived modes.
* files.el (auto-mode-alist, interpreter-mode-alist): Set up the
new variants of makefile-mode.
2005-05-12 Stefan Monnier <monnier@iro.umontreal.ca>
* font-lock.el (font-lock-comment-delimiter-face): Fix up
the inheritance.
2005-05-12 Luc Teirlinck <teirllm@auburn.edu>
* progmodes/inf-lisp.el (inferior-lisp-mode-hook)
(inferior-lisp-load-hook): Convert defcustoms back to defvars.
* files.el (normal-mode): Extend the scope of the
`enable-local-variables' binding to include the `set-auto-mode' call.
(magic-mode-alist): Doc fix.
2005-05-12 Stefan Monnier <monnier@iro.umontreal.ca>
* font-lock.el (font-lock-comment-delimiter-face): Inherit from
font-lock-comment-face rather than copying its setting.
2005-05-12 Andreas Schwab <schwab@suse.de>
* eshell/esh-mode.el (eshell-send-input): Doc fix.
2005-05-12 Lute Kamstra <lute@gnu.org>
* emacs-lisp/generic.el (define-generic-mode): Don't generate a
defcustom for the mode hook variable. Delete the last argument.
* generic-x.el: Fix callers of define-generic-mode.
(generic-x-modes): Delete group.
(show-tabs-tab-face, show-tabs-space-face): Put them in the
generic-x customization group.
2005-05-12 Kim F. Storm <storm@cua.dk>
* font-lock.el (font-lock-negation-char-face): Default to "off".
* progmodes/cc-fonts.el (c-basic-matchers-before): Don't apply
font-lock-negation-char-face to ! in !=.
2005-05-12 Masatake YAMATO <jet@gyve.org>
* add-log.el (find-change-log): Fix typos in the docstring
of function.
2005-05-11 Arne J,Ax(Brgensen <arne@arnested.dk>
* international/latexenc.el (latexenc-find-file-coding-system):
Avoid `re-search-forward' when looking for input encoding because
of speed and safety. Better regular expressions for recognizing
input encoding. Limit a search for TeX-master/tex-main-file to
the local variable section.
2005-05-11 Dan Nicolaescu <dann@ics.uci.edu>
* progmodes/sh-script.el (sh-mode-default-syntax-table): Set the
syntax of $ to "'" (quote).
2005-05-11 Reiner Steib <Reiner.Steib@gmx.de>
* dnd.el (dnd-protocol-alist): Improve custom type.
* dired.el (dired-dnd-protocol-alist): New variable.
(dired-mode): Use `dired-dnd-protocol-alist'. Move call of
`dired-mode-hook' to the end.
2005-05-11 Stefan Monnier <monnier@iro.umontreal.ca>
* font-lock.el (font-lock-fontify-syntactically-region): Don't use
comment-end if comment-start-skip is not set.
Obey the font-lock-comment-delimiter-face variables.
2005-05-11 Stefan Monnier <monnier@iro.umontreal.ca>
* files.el (executable-find): Move from executable.el. Use locate-file.
* progmodes/executable.el (executable-find): Move to files.el.
* font-lock.el (font-lock-fontify-keywords-region): Use a marker
when trying to ensure forward progress.
2005-05-11 Chong Yidong <cyd@stupidchicken.com>
* mouse-sel.el (mouse-sel-follow-link-p): New function.
(mouse-select, mouse-select-internal, mouse-extend-internal):
Use it to implement mouse-1-click-follows-link functionality.
2005-05-11 Richard M. Stallman <rms@gnu.org>
* font-lock.el (font-lock-fontify-syntactically-region):
Use font-lock-comment-delimiter-face for comment delimiters.
2005-05-10 Jay Belanger <belanger@truman.edu>
* calc/calc-help.el (calc-m-prefix-help): Add mention of
preserving embedded modes.
2005-05-10 Richard M. Stallman <rms@gnu.org>
* progmodes/sh-script.el (sh-indent-for-do): Default to 0.
* progmodes/ada-mode.el (ada-adjust-case-skeleton):
Move from ada-stmt.el.
(ada-mode): Add ada-adjust-case-skeleton to skeleton-end-hook.
* progmodes/ada-stmt.el (ada-adjust-case-skeleton):
Move to ada-mode.el.
(ada-stmt-mode-hook): Delete; do the work in ada-mode.
* cus-edit.el (custom-file): Call file-chase-links.
* files.el (read-directory-name): Fix previous change.
2005-05-10 Lute Kamstra <lute@gnu.org>
* font-lock.el (font-lock-keywords-alist)
(font-lock-removed-keywords-alist): Clarify docstrings.
2005-05-10 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-macro-info): New variable.
(gdb-source-info): Check for preprocessor info.
(gdb-tooltip-print-1): New function. Don't print tooltip if it is
a macro for a function.
found (user might have used GDB dir command).
(gdb-info-breakpoints-custom): Try to find file again if not already
(gdb-get-location): Update gdb-location-alist correctly for change
to gdb-info-breakpoints-custom.
* progmodes/gud.el (gud-tooltip-mode): Require tooltip to be safe.
(gud-tooltip-print-command): Add gdbmi case.
(gud-tooltip-tips): Call gdb-tooltip-print-1 first if there is
preprocessor info.
2005-05-09 Reiner Steib <Reiner.Steib@gmx.de>
* startup.el (fancy-splash-insert): Fix typo in doc string.
2005-05-09 Juanma Barranquero <lekktu@gmail.com>
* obsolete/float.el (string-to-float):
* obsolete/hilit19.el (hilit-add-pattern):
* obsolete/rnews.el (news-parse-range, news-select-message)
(news-get-pruned-list-of-files): Replace `string-to-int' by
`string-to-number'.
* obsolete/uncompress.el: Set `find-file-not-found-functions', not
`find-file-not-found-hooks'; use `add-hook'.
(uncompress-while-visiting): Set `write-file-functions', not
@ -14,8 +189,8 @@
2005-05-08 Eli Zaretskii <eliz@gnu.org>
* emacs-lisp/easy-mmode.el (easy-mmode-pretty-mode-name): Improve
commentary.
* emacs-lisp/easy-mmode.el (easy-mmode-pretty-mode-name):
Improve commentary.
* simple.el (next-error-overlay-arrow-position): Revert the change
made on 2005-04-30.
@ -31,8 +206,8 @@
2005-05-07 Eli Zaretskii <eliz@gnu.org>
* progmodes/compile.el (compilation-setup): Set
overlay-arrow-string to an empty string on text terminals.
* progmodes/compile.el (compilation-setup):
Set overlay-arrow-string to an empty string on text terminals.
* textmodes/ispell.el (ispell-program-name): Try looking for
"aspell" along exec-path, and if found, use it as the default
@ -40,8 +215,8 @@
2005-05-07 Jirka Kosek <jirka@kosek.cz> (tiny change)
* international/mule.el (sgml-xml-auto-coding-function): Recognize
encoding='FOO' in single quotes as well as in double quotes.
* international/mule.el (sgml-xml-auto-coding-function):
Recognize encoding='FOO' in single quotes as well as in double quotes.
2005-05-07 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se>
@ -51,9 +226,9 @@
2005-05-07 Eli Zaretskii <eliz@gnu.org>
* emacs-lisp/easy-mmode.el (easy-mmode-pretty-mode-name): Explain
more about the LIGHTER arg's usage in the doc string. Add
commentary to clarify what the code does. Fix the regexp that
* emacs-lisp/easy-mmode.el (easy-mmode-pretty-mode-name):
Explain more about the LIGHTER arg's usage in the doc string.
Add commentary to clarify what the code does. Fix the regexp that
strips whitespace from LIGHTER. Quote LIGHTER before using it,
since it could have characters special to regular expressions.
@ -61,8 +236,7 @@
* replace.el (occur-1): Bind inhibit-read-only so that
erase-buffer doesn't barf on read-only text properties (likewise
for add-text-properties in occur-engine). Mark buffer as
unmodified.
for add-text-properties in occur-engine). Mark buffer as unmodified.
(occur-engine): Don't set buffer-read-only here.
2005-05-06 Stefan Monnier <monnier@iro.umontreal.ca>
@ -157,8 +331,7 @@
* term/mac-win.el: Don't define or bind scroll bar functions if
x-toolkit-scroll-bars is t.
(x-select-text, x-get-selection-value):
Clear x-last-selected-text-clipboard if x-select-enable-clipboard is
nil.
Clear x-last-selected-text-clipboard if x-select-enable-clipboard is nil.
(PRIMARY): Put mac-scrap-name property.
(mac-select-convert-to-file-url): New function.
(public.file-url): New selection target type. Add to
@ -166,6 +339,19 @@
(x-get-selection, x-selection-value): Handle it.
(x-cut-buffer-or-selection-value): New alias.
2005-05-05 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
* textmodes/bibtex.el (bibtex-summary): Use current BibTeX
entry to avoid calling bibtex-find-entry with arg global
being t. Remove arg key.
(bibtex-summary-function, bibtex-complete-crossref-cleanup)
(bibtex-copy-summary-as-kill): Change accordingly.
2005-05-05 Stefan Monnier <monnier@iro.umontreal.ca>
* textmodes/org.el (org-get-entries-from-diary): Remove unused vars.
(org-agenda-date-later): Use with-current-buffer.
2005-05-05 Luc Teirlinck <teirllm@auburn.edu>
* emacs-lisp/byte-run.el (define-obsolete-function-alias)
@ -231,6 +417,8 @@
2005-05-04 Richard M. Stallman <rms@gnu.org>
* help.el (describe-key): No error when UNTRANSLATED is nil.
* simple.el (line-move-1): Fix previous change to signal errors
appropriately.
@ -375,11 +563,15 @@
with mode-require-final-newline.
(mode-require-final-newline): Doc fix.
2005-05-01 Lute Kamstra <lute@gnu.org>
2005-05-01 Stefan Monnier <monnier@iro.umontreal.ca>
* international/latexenc.el (latexenc-find-file-coding-system):
Fix regular expressions. Suggested by David Kastrup <dak@gnu.org>
and Stefan Monnier <monnier@iro.umontreal.ca>.
Fix regular expressions.
2005-05-01 David Kastrup <dak@gnu.org>
* international/latexenc.el (latexenc-find-file-coding-system):
Fix regular expressions.
2005-05-01 Nick Roberts <nickrob@snap.net.nz>
@ -1654,7 +1846,7 @@
* xt-mouse.el (xterm-mouse-mode): Add explicit Custom group, mouse.
Doc fix.
2005-04-03 Marcelo Toledo <marcelo@marcelotoledo.org>
2005-04-03 Marcelo Toledo <marcelo@gnu.org>
* add-log.el (change-log-font-lock-keywords): The manual
describing a Change Log entry, says: (...) "Aside from these
@ -4874,7 +5066,7 @@
* vc-svn.el (vc-svn-diff): Stay local if possible.
2005-01-02 Stefan <monnier@iro.umontreal.ca>
2005-01-02 Stefan Monnier <monnier@iro.umontreal.ca>
* vc-arch.el (vc-arch-workfile-version): Handle the empty-branch case.
@ -12014,7 +12206,7 @@
* tree-widget.el: New file.
2004-05-13 Marcelo Toledo <marcelo@marcelotoledo.org>
2004-05-13 Marcelo Toledo <marcelo@gnu.org>
* language/european.el ("Brazilian Portuguese"): Add support for
Brazilian Portuguese.

7
lisp/add-log.el
View file

@ -250,6 +250,9 @@ Note: The search is conducted only within 10%, at the beginning of the file."
;; Acknowledgements.
;; Don't include plain "From" because that is vague;
;; we want to encourage people to say something more specific.
;; Note that the FSF does not use "Patches by"; our convention
;; is to put the name of the author of the changes at the top
;; of the change log entry.
("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
3 'change-log-acknowledgement-face))
"Additional expressions to highlight in Change Log mode.")
@ -375,10 +378,10 @@ nil, by matching `change-log-version-number-regexp-list'."
Optional arg FILE-NAME specifies the file to use.
If FILE-NAME is nil, use the value of `change-log-default-name'.
If 'change-log-default-name' is nil, behave as though it were 'ChangeLog'
If `change-log-default-name' is nil, behave as though it were 'ChangeLog'
\(or whatever we use on this operating system).
If 'change-log-default-name' contains a leading directory component, then
If `change-log-default-name' contains a leading directory component, then
simply find it in the current directory. Otherwise, search in the current
directory and its successive parents for a file so named.

2
lisp/calc/calc-help.el
View file

@ -630,7 +630,7 @@ C-w Describe how there is no warranty for Calc."
(interactive)
(calc-do-prefix-help
'("Deg, Rad, HMS; Frac; Polar; Inf; Alg, Total; Symb; Vec/mat"
"Working; Xtensions; Mode-save"
"Working; Xtensions; Mode-save; preserve Embedded modes"
"SHIFT + Shifted-prefixes, mode-Filename; Record; reCompute"
"SHIFT + simplify: Off, Num, Default, Bin, Alg, Ext, Units")
"mode" ?m))

29
lisp/cus-edit.el
View file

@ -3835,20 +3835,21 @@ if only the first line of the docstring is shown."))
(defun custom-file ()
"Return the file name for saving customizations."
(or custom-file
(let ((user-init-file user-init-file)
(default-init-file
(if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
(when (null user-init-file)
(if (or (file-exists-p default-init-file)
(and (eq system-type 'windows-nt)
(file-exists-p "~/_emacs")))
;; Started with -q, i.e. the file containing
;; Custom settings hasn't been read. Saving
;; settings there would overwrite other settings.
(error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
(setq user-init-file default-init-file))
user-init-file)))
(file-chase-links
(or custom-file
(let ((user-init-file user-init-file)
(default-init-file
(if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
(when (null user-init-file)
(if (or (file-exists-p default-init-file)
(and (eq system-type 'windows-nt)
(file-exists-p "~/_emacs")))
;; Started with -q, i.e. the file containing
;; Custom settings hasn't been read. Saving
;; settings there would overwrite other settings.
(error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
(setq user-init-file default-init-file))
user-init-file))))
(defun custom-save-delete (symbol)
"Visit `custom-file' and delete all calls to SYMBOL from it.

19
lisp/dired.el
View file

@ -200,6 +200,18 @@ with the buffer narrowed to the listing."
;; Note this can't simply be run inside function `dired-ls' as the hook
;; functions probably depend on the dired-subdir-alist to be OK.
(defcustom dired-dnd-protocol-alist
'(("^file:///" . dired-dnd-handle-local-file)
("^file://" . dired-dnd-handle-file)
("^file:" . dired-dnd-handle-local-file))
"The functions to call when a drop in `dired-mode' is made.
See `dnd-protocol-alist' for more information. When nil, behave
as in other buffers."
:type '(choice (repeat (cons (regexp) (function)))
(const :tag "Behave as in other buffers" nil))
:version "22.1"
:group 'dired)
;; Internal variables
(defvar dired-marker-char ?* ; the answer is 42
@ -1522,14 +1534,11 @@ Keybindings:
'dired-desktop-buffer-misc-data)
(setq dired-switches-alist nil)
(dired-sort-other dired-actual-switches t)
(run-mode-hooks 'dired-mode-hook)
(when (featurep 'dnd)
(make-variable-buffer-local 'dnd-protocol-alist)
(setq dnd-protocol-alist
(append '(("^file:///" . dired-dnd-handle-local-file)
("^file://" . dired-dnd-handle-file)
("^file:" . dired-dnd-handle-local-file))
dnd-protocol-alist))))
(append dired-dnd-protocol-alist dnd-protocol-alist)))
(run-mode-hooks 'dired-mode-hook))
;; Idiosyncratic dired commands that don't deal with marks.

2
lisp/dnd.el
View file

@ -55,7 +55,7 @@ If no match is found, the URL is inserted as text by calling `dnd-insert-text'.
The function shall return the action done (move, copy, link or private)
if some action was made, or nil if the URL is ignored."
:version "22.1"
:type 'alist
:type '(repeat (cons (regexp) (function)))
:group 'dnd)

74
lisp/emacs-lisp/generic.el
View file

@ -117,46 +117,37 @@ instead (which see).")
;;;###autoload
(defmacro define-generic-mode (mode comment-list keyword-list
font-lock-list auto-mode-list
function-list &optional docstring
&rest custom-keyword-args)
function-list &optional docstring)
"Create a new generic mode MODE.
MODE is the name of the command for the generic mode; don't quote
it. The optional DOCSTRING is the documentation for the mode
command. If you do not supply it, `define-generic-mode' uses a
default documentation string instead.
MODE is the name of the command for the generic mode; don't quote it.
The optional DOCSTRING is the documentation for the mode command. If
you do not supply it, `define-generic-mode' uses a default
documentation string instead.
COMMENT-LIST is a list in which each element is either a
character, a string of one or two characters, or a cons cell. A
character or a string is set up in the mode's syntax table as a
\"comment starter\". If the entry is a cons cell, the `car' is
set up as a \"comment starter\" and the `cdr' as a \"comment
ender\". (Use nil for the latter if you want comments to end at
the end of the line.) Note that the syntax table has limitations
about what comment starters and enders are actually possible.
COMMENT-LIST is a list in which each element is either a character, a
string of one or two characters, or a cons cell. A character or a
string is set up in the mode's syntax table as a \"comment starter\".
If the entry is a cons cell, the `car' is set up as a \"comment
starter\" and the `cdr' as a \"comment ender\". (Use nil for the
latter if you want comments to end at the end of the line.) Note that
the syntax table has limitations about what comment starters and
enders are actually possible.
KEYWORD-LIST is a list of keywords to highlight with
`font-lock-keyword-face'. Each keyword should be a string.
FONT-LOCK-LIST is a list of additional expressions to highlight.
Each element of this list should have the same form as an element
of `font-lock-keywords'.
FONT-LOCK-LIST is a list of additional expressions to highlight. Each
element of this list should have the same form as an element of
`font-lock-keywords'.
AUTO-MODE-LIST is a list of regular expressions to add to
`auto-mode-alist'. These regular expressions are added when
Emacs runs the macro expansion.
`auto-mode-alist'. These regular expressions are added when Emacs
runs the macro expansion.
FUNCTION-LIST is a list of functions to call to do some
additional setup. The mode command calls these functions just
before it runs the mode hook.
The optional CUSTOM-KEYWORD-ARGS are pairs of keywords and values
to include in the generated `defcustom' form for the mode hook
variable `MODE-hook'. The default value for the `:group' keyword
is MODE with the final \"-mode\" (if any) removed. (Don't use
this default group name unless you have written a `defgroup' to
define that group properly.) You can specify keyword arguments
without specifying a docstring.
FUNCTION-LIST is a list of functions to call to do some additional
setup. The mode command calls these functions just before it runs the
mode hook `MODE-hook'.
See the file generic-x.el for some examples of `define-generic-mode'."
(declare (debug (sexp def-form def-form def-form form def-form
@ -167,22 +158,9 @@ See the file generic-x.el for some examples of `define-generic-mode'."
(when (eq (car-safe mode) 'quote)
(setq mode (eval mode)))
(when (and docstring (not (stringp docstring)))
;; DOCSTRING is not a string so we assume that it's actually the
;; first keyword of CUSTOM-KEYWORD-ARGS.
(push docstring custom-keyword-args)
(setq docstring nil))
(let* ((name (symbol-name mode))
(pretty-name (capitalize (replace-regexp-in-string
"-mode\\'" "" name)))
(mode-hook (intern (concat name "-hook"))))
(unless (plist-get custom-keyword-args :group)
(setq custom-keyword-args
(plist-put custom-keyword-args
:group `',(intern (replace-regexp-in-string
"-mode\\'" "" name)))))
"-mode\\'" "" name))))
`(progn
;; Add a new entry.
@ -192,15 +170,11 @@ See the file generic-x.el for some examples of `define-generic-mode'."
(dolist (re ,auto-mode-list)
(add-to-list 'auto-mode-alist (cons re ',mode)))
(defcustom ,mode-hook nil
,(concat "Hook run when entering " pretty-name " mode.")
:type 'hook
,@custom-keyword-args)
(defun ,mode ()
,(or docstring
(concat pretty-name " mode.\n"
"This a generic mode defined with `define-generic-mode'."))
"This a generic mode defined with `define-generic-mode'.\n"
"It runs `" name "-hook' as the last thing it does."))
(interactive)
(generic-mode-internal ',mode ,comment-list ,keyword-list
,font-lock-list ,function-list)))))

2
lisp/eshell/esh-mode.el
View file

@ -663,7 +663,7 @@ waiting for input."
(eshell-match-result "alpha\n"))
(defun eshell-send-input (&optional use-region queue-p no-newline)
"Send the input received to Eshell for parsing and processing..
"Send the input received to Eshell for parsing and processing.
After `eshell-last-output-end', sends all text from that marker to
point as input. Before that marker, calls `eshell-get-old-input' to
retrieve old input, copies it to the end of the buffer, and sends it.

97
lisp/files.el
View file

@ -541,9 +541,6 @@ DIR should be an absolute directory name. It defaults to
the value of `default-directory'."
(unless dir
(setq dir default-directory))
(unless default-dirname
(setq default-dirname
(if initial (concat dir initial) default-directory)))
(read-file-name prompt dir (or default-dirname
(if initial (expand-file-name initial dir)
dir))
@ -679,6 +676,13 @@ PATH-AND-SUFFIXES is a pair of lists (DIRECTORIES . SUFFIXES)."
((null action) (try-completion string names))
(t (test-completion string names))))))
(defun executable-find (command)
"Search for COMMAND in `exec-path' and return the absolute file name.
Return nil if COMMAND is not found anywhere in `exec-path'."
;; Use 1 rather than file-executable-p to better match the behavior of
;; call-process.
(locate-file command exec-path exec-suffixes 1))
(defun load-library (library)
"Load the library named LIBRARY.
This is an interface to the function `load'."
@ -1724,10 +1728,10 @@ or from Lisp without specifying the optional argument FIND-FILE;
in that case, this function acts as if `enable-local-variables' were t."
(interactive)
(or find-file (funcall (or default-major-mode 'fundamental-mode)))
(report-errors "File mode specification error: %s"
(set-auto-mode))
(report-errors "File local-variables error: %s"
(let ((enable-local-variables (or (not find-file) enable-local-variables)))
(let ((enable-local-variables (or (not find-file) enable-local-variables)))
(report-errors "File mode specification error: %s"
(set-auto-mode))
(report-errors "File local-variables error: %s"
(hack-local-variables)))
(if (fboundp 'ucs-set-table-for-input) ; don't lose when building
(ucs-set-table-for-input)))
@ -1758,9 +1762,11 @@ in that case, this function acts as if `enable-local-variables' were t."
("\\.ad[abs]\\'" . ada-mode)
("\\.ad[bs].dg\\'" . ada-mode)
("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode)
("\\.mk\\'" . makefile-mode)
("\\([Mm]\\|GNUm\\)akep*file\\'" . makefile-mode)
("\\.am\\'" . makefile-mode) ;For Automake.
("\\.mk\\'" . makefile-gmake-mode) ; Might be any make, give Gnu the host advantage
("[Mm]akefile\\'" . makefile-mode)
("GNUmakefile\\'" . makefile-gmake-mode)
("Makeppfile\\'" . makefile-makepp-mode)
("\\.am\\'" . makefile-automake-mode)
;; Less common extensions come here
;; so more common ones above are found faster.
("\\.texinfo\\'" . texinfo-mode)
@ -1932,7 +1938,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
("more" . text-mode)
("less" . text-mode)
("pg" . text-mode)
("make" . makefile-mode) ; Debian uses this
("make" . makefile-gmake-mode) ; Debian uses this
("guile" . scheme-mode)
("clisp" . lisp-mode)))
"Alist mapping interpreter names to major modes.
@ -1988,7 +1994,7 @@ if REGEXP matches the text at the beginning of the buffer,
to decide the buffer's major mode.
If FUNCTION is nil, then it is not called. (That is a way of saying
\"allow `auto-mode-alist' to decide for these files.")
\"allow `auto-mode-alist' to decide for these files.)")
(defun set-auto-mode (&optional keep-mode-if-same)
"Select major mode appropriate for current buffer.
@ -2147,6 +2153,26 @@ Otherwise, return nil; point may be changed."
(goto-char beg)
end))))
(defun hack-local-variables-confirm ()
(or (eq enable-local-variables t)
(and enable-local-variables
(save-window-excursion
(condition-case nil
(switch-to-buffer (current-buffer))
(error
;; If we fail to switch in the selected window,
;; it is probably a minibuffer or dedicated window.
;; So try another window.
(let ((pop-up-frames nil))
;; Refrain from popping up frames since it can't
;; be undone by save-window-excursion.
(pop-to-buffer (current-buffer)))))
(save-excursion
(beginning-of-line)
(set-window-start (selected-window) (point)))
(y-or-n-p (format "Set local variables as specified in -*- line of %s? "
(file-name-nondirectory buffer-file-name)))))))
(defun hack-local-variables-prop-line (&optional mode-only)
"Set local variables specified in the -*- line.
Ignore any specification for `mode:' and `coding:';
@ -2201,21 +2227,7 @@ is specified, returning t if it is specified."
(if mode-only mode-specified
(if (and result
(or mode-only
(eq enable-local-variables t)
(and enable-local-variables
(save-window-excursion
(condition-case nil
(switch-to-buffer (current-buffer))
(error
;; If we fail to switch in the selected window,
;; it is probably a minibuffer.
;; So try another window.
(condition-case nil
(switch-to-buffer-other-window (current-buffer))
(error
(switch-to-buffer-other-frame (current-buffer))))))
(y-or-n-p (format "Set local variables as specified in -*- line of %s? "
(file-name-nondirectory buffer-file-name)))))))
(hack-local-variables-confirm)))
(let ((enable-local-eval enable-local-eval))
(while result
(hack-one-local-variable (car (car result)) (cdr (car result)))
@ -2244,20 +2256,8 @@ is specified, returning t if it is specified."
(search-backward "\n\^L" (max (- (point-max) 3000) (point-min)) 'move)
(when (let ((case-fold-search t))
(and (search-forward "Local Variables:" nil t)
(or (eq enable-local-variables t)
mode-only
(and enable-local-variables
(save-window-excursion
(switch-to-buffer (current-buffer))
(save-excursion
(beginning-of-line)
(set-window-start (selected-window) (point)))
(y-or-n-p (format "Set local variables as specified at end of %s? "
(if buffer-file-name
(file-name-nondirectory
buffer-file-name)
(concat "buffer "
(buffer-name))))))))))
(or mode-only
(hack-local-variables-confirm))))
(skip-chars-forward " \t")
(let ((enable-local-eval enable-local-eval)
;; suffix is what comes after "local variables:" in its line.
@ -2478,18 +2478,7 @@ is considered risky."
(hack-one-local-variable-eval-safep val))
;; Permit eval if not root and user says ok.
(and (not (zerop (user-uid)))
(or (eq enable-local-eval t)
(and enable-local-eval
(save-window-excursion
(switch-to-buffer (current-buffer))
(save-excursion
(beginning-of-line)
(set-window-start (selected-window) (point)))
(setq enable-local-eval
(y-or-n-p (format "Process `eval' or hook local variables in %s? "
(if buffer-file-name
(concat "file " (file-name-nondirectory buffer-file-name))
(concat "buffer " (buffer-name)))))))))))
(hack-local-variables-confirm)))
(if (eq var 'eval)
(save-excursion (eval val))
(make-local-variable var)
@ -4875,5 +4864,5 @@ With prefix arg, silently save all file-visiting buffers, then kill."
(define-key ctl-x-5-map "\C-f" 'find-file-other-frame)
(define-key ctl-x-5-map "r" 'find-file-read-only-other-frame)
;;; arch-tag: bc68d3ea-19ca-468b-aac6-3a4a7766101f
;; arch-tag: bc68d3ea-19ca-468b-aac6-3a4a7766101f
;;; files.el ends here

104
lisp/font-lock.el
View file

@ -470,12 +470,27 @@ user-level keywords, but normally their values have been
optimized.")
(defvar font-lock-keywords-alist nil
"Alist of `font-lock-keywords' local to a `major-mode'.
"Alist of additional `font-lock-keywords' elements for major modes.
Each element has the form (MODE KEYWORDS . APPEND).
`font-lock-set-defaults' adds the elements in the list KEYWORDS to
`font-lock-keywords' when Font Lock is turned on in major mode MODE.
If APPEND is nil, KEYWORDS are added at the beginning of
`font-lock-keywords'. If it is `set', they are used to replace the
value of `font-lock-keywords'. If APPEND is any other non-nil value,
they are added at the end.
This is normally set via `font-lock-add-keywords' and
`font-lock-remove-keywords'.")
(defvar font-lock-removed-keywords-alist nil
"Alist of `font-lock-keywords' removed from `major-mode'.
"Alist of `font-lock-keywords' elements to be removed for major modes.
Each element has the form (MODE . KEYWORDS). `font-lock-set-defaults'
removes the elements in the list KEYWORDS from `font-lock-keywords'
when Font Lock is turned on in major mode MODE.
This is normally set via `font-lock-add-keywords' and
`font-lock-remove-keywords'.")
@ -1299,7 +1314,10 @@ START should be at the beginning of a line."
(defun font-lock-fontify-syntactically-region (start end &optional loudly ppss)
"Put proper face on each string and comment between START and END.
START should be at the beginning of a line."
(let (state face beg)
(let ((comment-end-regexp
(regexp-quote
(replace-regexp-in-string "^ *" "" comment-end)))
state face beg)
(if loudly (message "Fontifying %s... (syntactically...)" (buffer-name)))
(goto-char start)
;;
@ -1314,7 +1332,19 @@ START should be at the beginning of a line."
(setq beg (max (nth 8 state) start))
(setq state (parse-partial-sexp (point) end nil nil state
'syntax-table))
(when face (put-text-property beg (point) 'face face)))
(when face (put-text-property beg (point) 'face face))
(when (and (eq face 'font-lock-comment-face)
comment-start-skip)
;; Find the comment delimiters
;; and use font-lock-comment-delimiter-face for them.
(save-excursion
(goto-char beg)
(if (looking-at comment-start-skip)
(put-text-property beg (match-end 0) 'face
font-lock-comment-delimiter-face)))
(if (looking-back comment-end-regexp (point-at-bol))
(put-text-property (match-beginning 0) (point) 'face
font-lock-comment-delimiter-face))))
(< (point) end))
(setq state (parse-partial-sexp (point) end nil nil state
'syntax-table)))))
@ -1405,6 +1435,7 @@ LOUDLY, if non-nil, allows progress-meter bar."
(let ((case-fold-search font-lock-keywords-case-fold-search)
(keywords (cddr font-lock-keywords))
(bufname (buffer-name)) (count 0)
(pos (make-marker))
keyword matcher highlights)
;;
;; Fontify each item in `font-lock-keywords' from `start' to `end'.
@ -1439,12 +1470,14 @@ LOUDLY, if non-nil, allows progress-meter bar."
(while highlights
(if (numberp (car (car highlights)))
(font-lock-apply-highlight (car highlights))
(let ((pos (point)))
(font-lock-fontify-anchored-keywords (car highlights) end)
;; Ensure forward progress.
(if (< (point) pos) (goto-char pos))))
(set-marker pos (point))
(font-lock-fontify-anchored-keywords (car highlights) end)
;; Ensure forward progress. `pos' is a marker because anchored
;; keyword may add/delete text (this happens e.g. in grep.el).
(if (< (point) pos) (goto-char pos)))
(setq highlights (cdr highlights))))
(setq keywords (cdr keywords)))))
(setq keywords (cdr keywords)))
(set-marker pos nil)))
;;; End of Keyword regexp fontification functions.
@ -1622,27 +1655,6 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
;; But now we do it the custom way. Note that `defface' will not overwrite any
;; faces declared above via `custom-declare-face'.
(defface font-lock-comment-delimiter-face
'((((class grayscale) (background light))
(:foreground "DimGray" :weight bold :slant italic))
(((class grayscale) (background dark))
(:foreground "LightGray" :weight bold :slant italic))
(((class color) (min-colors 88) (background light))
(:foreground "Firebrick"))
(((class color) (min-colors 88) (background dark))
(:foreground "chocolate1"))
(((class color) (min-colors 16) (background light))
(:foreground "red"))
(((class color) (min-colors 16) (background dark))
(:foreground "red1"))
(((class color) (min-colors 8) (background light))
(:foreground "red"))
(((class color) (min-colors 8) (background dark))
(:foreground "red1"))
(t (:weight bold :slant italic)))
"Font Lock mode face used to highlight comment delimiters."
:group 'font-lock-highlighting-faces)
(defface font-lock-comment-face
'((((class grayscale) (background light))
(:foreground "DimGray" :weight bold :slant italic))
@ -1664,6 +1676,17 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
"Font Lock mode face used to highlight comments."
:group 'font-lock-highlighting-faces)
(defface font-lock-comment-delimiter-face
'((default :inherit font-lock-comment-face)
(((class grayscale)))
(((class color) (min-colors 16)))
(((class color) (min-colors 8) (background light))
:foreground "red")
(((class color) (min-colors 8) (background dark))
:foreground "red1"))
"Font Lock mode face used to highlight comment delimiters."
:group 'font-lock-highlighting-faces)
(defface font-lock-string-face
'((((class grayscale) (background light)) (:foreground "DimGray" :slant italic))
(((class grayscale) (background dark)) (:foreground "LightGray" :slant italic))
@ -1765,13 +1788,8 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
"Font Lock mode face used to highlight warnings."
:group 'font-lock-highlighting-faces)
;; Matches font-lock-builtin-face, because that is used for #ifndef and
;; font-lock-keyword-face, which alas make-mode uses for ifndef
(defface font-lock-negation-char-face
'((((class color) (min-colors 88) (background light)) (:foreground "VioletRed" :weight bold))
(((class color) (min-colors 88) (background dark)) (:foreground "MediumOrchid1" :weight bold))
(((class color) (min-colors 8)) (:foreground "red" :weight bold))
(t (:inverse-video t :weight bold)))
'((t nil))
"Font Lock mode face used to highlight easy to overlook negation."
:group 'font-lock-highlighting-faces)
@ -1823,7 +1841,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
; (put 'font-lock-fontify-more 'menu-enable '(identity))
; (put 'font-lock-fontify-less 'menu-enable '(identity)))
;
;;; Put the appropriate symbol property values on now. See above.
; ;; Put the appropriate symbol property values on now. See above.
;(put 'global-font-lock-mode 'menu-selected 'global-font-lock-mode)
;(put 'font-lock-mode 'menu-selected 'font-lock-mode)
;(put 'font-lock-fontify-more 'menu-enable '(nth 2 font-lock-fontify-level))
@ -1857,7 +1875,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
; (font-lock-fontify-level (1+ (car font-lock-fontify-level)))
; (error "No more decoration")))
;
;;; This should be called by `font-lock-set-defaults'.
; ;; This should be called by `font-lock-set-defaults'.
;(defun font-lock-set-menu ()
; ;; Activate less/more fontification entries if there are multiple levels for
; ;; the current buffer. Sets `font-lock-fontify-level' to be of the form
@ -1878,7 +1896,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
; (setq font-lock-fontify-level (list level (> level 1)
; (< level (1- (length keywords))))))))
;
;;; This should be called by `font-lock-unset-defaults'.
; ;; This should be called by `font-lock-unset-defaults'.
;(defun font-lock-unset-menu ()
; ;; Deactivate less/more fontification entries.
; (setq font-lock-fontify-level nil))
@ -1886,7 +1904,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
;;; End of Menu support.
;;; Various regexp information shared by several modes.
;;; Information specific to a single mode should go in its load library.
; ;; Information specific to a single mode should go in its load library.
;; Font Lock support for C, C++, Objective-C and Java modes is now in
;; cc-fonts.el (and required by cc-mode.el). However, the below function
@ -2038,9 +2056,9 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
;; ELisp and CLisp `&' keywords as types.
'("\\&\\sw+\\>" . font-lock-type-face)
;;
;;; This is too general -- rms.
;;; A user complained that he has functions whose names start with `do'
;;; and that they get the wrong color.
;;; This is too general -- rms.
;;; A user complained that he has functions whose names start with `do'
;;; and that they get the wrong color.
;;; ;; CL `with-' and `do-' constructs
;;; '("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
)))

110
lisp/generic-x.el
View file

@ -116,11 +116,6 @@
:group 'data
:version "20.3")
(defgroup generic-x-modes nil
"Individual modes in the collection of generic modes."
:group 'generic-x
:version "22.1")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Default-Generic mode
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -158,7 +153,7 @@ the regexp in `generic-find-file-regexp'. If the value is nil,
:type '(choice (const :tag "Don't check file names" nil) regexp))
;; This generic mode is always defined
(define-generic-mode default-generic-mode (list ?#) nil nil nil nil :group 'generic-x-modes)
(define-generic-mode default-generic-mode (list ?#) nil nil nil nil)
;; A more general solution would allow us to enter generic-mode for
;; *any* comment character, but would require us to synthesize a new
@ -308,8 +303,7 @@ your changes into effect."
'((nil "^\\([-A-Za-z0-9_]+\\)" 1)
("*Directories*" "^\\s-*<Directory\\s-*\\([^>]+\\)>" 1)
("*Locations*" "^\\s-*<Location\\s-*\\([^>]+\\)>" 1))))))
"Generic mode for Apache or HTTPD configuration files."
:group 'generic-x-modes))
"Generic mode for Apache or HTTPD configuration files."))
(when (memq 'apache-log-generic-mode generic-extras-enable-list)
@ -322,8 +316,7 @@ your changes into effect."
(2 font-lock-variable-name-face)))
'("access_log\\'")
nil
"Mode for Apache log files"
:group 'generic-x-modes))
"Mode for Apache log files"))
;;; Samba
(when (memq 'samba-generic-mode generic-extras-enable-list)
@ -337,8 +330,7 @@ your changes into effect."
(2 font-lock-type-face)))
'("smb\\.conf\\'")
'(generic-bracket-support)
"Generic mode for Samba configuration files."
:group 'generic-x-modes))
"Generic mode for Samba configuration files."))
;;; Fvwm
;; This is pretty basic. Also, modes for other window managers could
@ -363,8 +355,7 @@ your changes into effect."
nil
'("\\.fvwmrc\\'" "\\.fvwm2rc\\'")
nil
"Generic mode for FVWM configuration files."
:group 'generic-x-modes))
"Generic mode for FVWM configuration files."))
;;; X Resource
;; I'm pretty sure I've seen an actual mode to do this, but I don't
@ -377,8 +368,7 @@ your changes into effect."
'(("^\\([^:\n]+:\\)" 1 font-lock-variable-name-face))
'("\\.Xdefaults\\'" "\\.Xresources\\'" "\\.Xenvironment\\'" "\\.ad\\'")
nil
"Generic mode for X Resource configuration files."
:group 'generic-x-modes))
"Generic mode for X Resource configuration files."))
;;; Hosts
(when (memq 'hosts-generic-mode generic-extras-enable-list)
@ -389,8 +379,7 @@ your changes into effect."
'(("\\([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\\)" 1 font-lock-constant-face))
'("[hH][oO][sS][tT][sS]\\'")
nil
"Generic mode for HOSTS files."
:group 'generic-x-modes))
"Generic mode for HOSTS files."))
;;; Windows INF files
(when (memq 'inf-generic-mode generic-extras-enable-list)
@ -401,8 +390,7 @@ your changes into effect."
'(("^\\(\\[.*\\]\\)" 1 font-lock-constant-face))
'("\\.[iI][nN][fF]\\'")
'(generic-bracket-support)
"Generic mode for MS-Windows INF files."
:group 'generic-x-modes))
"Generic mode for MS-Windows INF files."))
;;; Windows INI files
;; Should define escape character as well!
@ -424,8 +412,7 @@ your changes into effect."
("*Variables*" "^\\s-*\\([^=]+\\)\\s-*=" 1))))))
"Generic mode for MS-Windows INI files.
You can use `ini-generic-mode-find-file-hook' to enter this mode
automatically for INI files whose names do not end in \".ini\"."
:group 'generic-x-modes)
automatically for INI files whose names do not end in \".ini\".")
(defun ini-generic-mode-find-file-hook ()
"Hook function to enter Ini-Generic mode automatically for INI files.
@ -453,8 +440,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(lambda ()
(setq imenu-generic-expression
'((nil "^\\s-*\\(.*\\)\\s-*=" 1))))))
"Generic mode for MS-Windows Registry files."
:group 'generic-x-modes))
"Generic mode for MS-Windows Registry files."))
;;; DOS/Windows BAT files
(when (memq 'bat-generic-mode generic-extras-enable-list)
@ -528,8 +514,7 @@ like an INI file. You can add this hook to `find-file-hook'."
"\\`[cC][oO][nN][fF][iI][gG]\\."
"\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\.")
'(generic-bat-mode-setup-function)
"Generic mode for MS-Windows BAT files."
:group 'generic-x-modes)
"Generic mode for MS-Windows BAT files.")
(defvar bat-generic-mode-syntax-table nil
"Syntax table in use in `bat-generic-mode' buffers.")
@ -608,8 +593,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(lambda ()
(setq imenu-generic-expression
'((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1))))))
"Mode for Mailagent rules files."
:group 'generic-x-modes))
"Mode for Mailagent rules files."))
;; Solaris/Sys V prototype files
(when (memq 'prototype-generic-mode generic-extras-enable-list)
@ -632,8 +616,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(2 font-lock-variable-name-face)))
'("prototype\\'")
nil
"Mode for Sys V prototype files."
:group 'generic-x-modes))
"Mode for Sys V prototype files."))
;; Solaris/Sys V pkginfo files
(when (memq 'pkginfo-generic-mode generic-extras-enable-list)
@ -646,8 +629,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(2 font-lock-variable-name-face)))
'("pkginfo\\'")
nil
"Mode for Sys V pkginfo files."
:group 'generic-x-modes))
"Mode for Sys V pkginfo files."))
;; Javascript mode
;; Includes extra keywords from Armando Singer [asinger@MAIL.COLGATE.EDU]
@ -726,8 +708,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(setq imenu-generic-expression
'((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1)
("*Variables*" "^var\\s-+\\([A-Za-z0-9_]+\\)" 1))))))
"Mode for JavaScript files."
:group 'generic-x-modes))
"Mode for JavaScript files."))
;; VRML files
(when (memq 'vrml-generic-mode generic-extras-enable-list)
@ -780,8 +761,7 @@ like an INI file. You can add this hook to `find-file-hook'."
("*Definitions*"
"DEF\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([A-Za-z0-9]+\\)\\s-*{"
1))))))
"Generic Mode for VRML files."
:group 'generic-x-modes))
"Generic Mode for VRML files."))
;; Java Manifests
(when (memq 'java-manifest-generic-mode generic-extras-enable-list)
@ -802,8 +782,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(2 font-lock-constant-face)))
'("[mM][aA][nN][iI][fF][eE][sS][tT]\\.[mM][fF]\\'")
nil
"Mode for Java Manifest files"
:group 'generic-x-modes))
"Mode for Java Manifest files"))
;; Java properties files
(when (memq 'java-properties-generic-mode generic-extras-enable-list)
@ -835,8 +814,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(lambda ()
(setq imenu-generic-expression
'((nil "^\\([^#! \t\n\r=:]+\\)" 1))))))
"Mode for Java properties files."
:group 'generic-x-modes))
"Mode for Java properties files."))
;; C shell alias definitions
(when (memq 'alias-generic-mode generic-extras-enable-list)
@ -854,8 +832,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(lambda ()
(setq imenu-generic-expression
'((nil "^\\(alias\\|unalias\\)\\s-+\\([-a-zA-Z0-9_]+\\)" 2))))))
"Mode for C Shell alias files."
:group 'generic-x-modes))
"Mode for C Shell alias files."))
;;; Windows RC files
;; Contributed by ACorreir@pervasive-sw.com (Alfred Correira)
@ -947,8 +924,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(2 font-lock-variable-name-face nil t))))
'("\\.[rR][cC]\\'")
nil
"Generic mode for MS-Windows Resource files."
:group 'generic-x-modes))
"Generic mode for MS-Windows Resource files."))
;; InstallShield RUL files
;; Contributed by Alfred.Correira@Pervasive.Com
@ -1568,8 +1544,7 @@ like an INI file. You can add this hook to `find-file-hook'."
font-lock-variable-name-face "[^_]" "[^_]"))) ; is this face the best choice?
'("\\.[rR][uU][lL]\\'")
'(generic-rul-mode-setup-function)
"Generic mode for InstallShield RUL files."
:group 'generic-x-modes)
"Generic mode for InstallShield RUL files.")
(define-skeleton rul-if
"Insert an if statement."
@ -1619,8 +1594,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(2 font-lock-variable-name-face)))
'("\\.mailrc\\'")
nil
"Mode for mailrc files."
:group 'generic-x-modes))
"Mode for mailrc files."))
;; Inetd.conf
(when (memq 'inetd-conf-generic-mode generic-extras-enable-list)
@ -1640,8 +1614,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(function
(lambda ()
(setq imenu-generic-expression
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
:group 'generic-x-modes))
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))))
;; Services
(when (memq 'etc-services-generic-mode generic-extras-enable-list)
@ -1659,8 +1632,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(function
(lambda ()
(setq imenu-generic-expression
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
:group 'generic-x-modes))
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))))
;; Password and Group files
(when (memq 'etc-passwd-generic-mode generic-extras-enable-list)
@ -1702,8 +1674,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(function
(lambda ()
(setq imenu-generic-expression
'((nil "^\\([-A-Za-z0-9_]+\\):" 1))))))
:group 'generic-x-modes))
'((nil "^\\([-A-Za-z0-9_]+\\):" 1))))))))
;; Fstab
(when (memq 'etc-fstab-generic-mode generic-extras-enable-list)
@ -1753,8 +1724,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(function
(lambda ()
(setq imenu-generic-expression
'((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))
:group 'generic-x-modes))
'((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))))
;; From Jacques Duthen <jacques.duthen@sncf.fr>
(when (memq 'show-tabs-generic-mode generic-extras-enable-list)
@ -1780,7 +1750,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(((class color)) (:background "red"))
(t (:weight bold)))
"Font Lock mode face used to highlight TABs."
:group 'generic-x-modes)
:group 'generic-x)
(defface show-tabs-space-face
'((((class grayscale) (background light)) (:background "DimGray" :weight bold))
@ -1789,7 +1759,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(((class color)) (:background "yellow"))
(t (:weight bold)))
"Font Lock mode face used to highlight spaces."
:group 'generic-x-modes)
:group 'generic-x)
(define-generic-mode show-tabs-generic-mode
nil ;; no comment char
@ -1798,8 +1768,7 @@ like an INI file. You can add this hook to `find-file-hook'."
nil ;; no auto-mode-alist
;; '(show-tabs-generic-mode-hook-fun)
nil
"Generic mode to show tabs and trailing spaces"
:group 'generic-x-modes))
"Generic mode to show tabs and trailing spaces"))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; DNS modes
@ -1822,8 +1791,7 @@ like an INI file. You can add this hook to `find-file-hook'."
;; List of additional automode-alist expressions
'("/etc/named.boot\\'")
;; List of set up functions to call
nil
:group 'generic-x-modes))
nil))
(when (memq 'named-database-generic-mode generic-extras-enable-list)
@ -1838,8 +1806,7 @@ like an INI file. You can add this hook to `find-file-hook'."
;; List of additional auto-mode-alist expressions
nil
;; List of set up functions to call
nil
:group 'generic-x-modes)
nil)
(defvar named-database-time-string "%Y%m%d%H"
"Timestring for named serial numbers.")
@ -1861,8 +1828,7 @@ like an INI file. You can add this hook to `find-file-hook'."
;; List of additional auto-mode-alist expressions
'("/etc/resolv[e]?.conf\\'")
;; List of set up functions to call
nil
:group 'generic-x-modes))
nil))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Modes for spice and common electrical engineering circuit netlist formats
@ -1906,8 +1872,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(function
(lambda()
(setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
"Generic mode for SPICE circuit netlist files."
:group 'generic-x-modes))
"Generic mode for SPICE circuit netlist files."))
(when (memq 'ibis-generic-mode generic-extras-enable-list)
@ -1918,8 +1883,7 @@ like an INI file. You can add this hook to `find-file-hook'."
("\\(\\(_\\|\\w\\)+\\)\\s-*=" 1 font-lock-variable-name-face))
'("\\.[iI][bB][sS]\\'")
'(generic-bracket-support)
"Generic mode for IBIS circuit netlist files."
:group 'generic-x-modes))
"Generic mode for IBIS circuit netlist files."))
(when (memq 'astap-generic-mode generic-extras-enable-list)
@ -1956,8 +1920,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(function
(lambda()
(setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
"Generic mode for ASTAP circuit netlist files."
:group 'generic-x-modes))
"Generic mode for ASTAP circuit netlist files."))
(when (memq 'etc-modules-conf-generic-mode generic-extras-enable-list)
@ -2001,8 +1964,7 @@ like an INI file. You can add this hook to `find-file-hook'."
;; List of additional automode-alist expressions
'("/etc/modules.conf" "/etc/conf.modules")
;; List of set up functions to call
nil
:group 'generic-x-modes))
nil))
(provide 'generic-x)

7
lisp/international/ccl.el
View file

@ -1,8 +1,9 @@
;;; ccl.el --- CCL (Code Conversion Language) compiler
;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 2002 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 2001, 2002 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1998, 1999, 2000
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: CCL, mule, multilingual, character set, coding-system

8
lisp/international/characters.el
View file

@ -1,8 +1,10 @@
;;; characters.el --- set syntax and category for multibyte characters
;; Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004
;; Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: multibyte character, character set, syntax, category

3
lisp/international/code-pages.el
View file

@ -1,6 +1,9 @@
;;; code-pages.el --- coding systems for assorted codepages -*-coding: utf-8;-*-
;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Copyright (C) 2004, 2005
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Author: Dave Love <fx@gnu.org>
;; Keywords: i18n

5
lisp/international/codepage.el
View file

@ -1,6 +1,9 @@
;;; codepage.el --- MS-DOS/MS-Windows specific coding systems
;; Copyright (C) 1998 Free Software Foundation, Inc.
;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
;; Copyright (C) 2000
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Author: Eli Zaretskii
;; Maintainer: FSF

6
lisp/international/encoded-kb.el
View file

@ -1,7 +1,9 @@
;;; encoded-kb.el --- handler to input multibyte characters encoded somehow
;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 1997 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2004, 2005
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; This file is part of GNU Emacs.

7
lisp/international/fontset.el
View file

@ -1,8 +1,9 @@
;;; fontset.el --- commands for handling fontset
;; Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 2001 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: mule, multilingual, fontset

7
lisp/international/isearch-x.el
View file

@ -1,8 +1,9 @@
;;; isearch-x.el --- extended isearch handling commands
;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 2001 Free Software Foundation, Inc.
;; Copyright (C) 1997, 2001, 2004 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1998, 2000
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: multilingual, isearch

2
lisp/international/iso-ascii.el
View file

@ -1,6 +1,6 @@
;;; iso-ascii.el --- set up char tables for ISO 8859/1 on ASCII terminals
;; Copyright (C) 1987, 1995 Free Software Foundation, Inc.
;; Copyright (C) 1987, 1995, 1998, 2003 Free Software Foundation, Inc.
;; Author: Howard Gayle
;; Maintainer: FSF

4
lisp/international/iso-cvt.el
View file

@ -1,8 +1,8 @@
;;; iso-cvt.el --- translate ISO 8859-1 from/to various encodings -*- coding: iso-latin-1 -*-
;; This file was formerly called gm-lingo.el.
;; Copyright (C) 1993, 1994, 1995, 1996, 1998, 2000, 2003, 2004
;; Free Software Foundation, Inc.
;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2003, 2004
;; Free Software Foundation, Inc.
;; Author: Michael Gschwind <mike@vlsivie.tuwien.ac.at>
;; Keywords: tex, iso, latin, i18n

3
lisp/international/iso-transl.el
View file

@ -1,6 +1,7 @@
;;; iso-transl.el --- keyboard input definitions for ISO 8859-1 -*- coding: iso-8859-1 -*-
;; Copyright (C) 1987, 1993, 1994, 1995, 2001 Free Software Foundation, Inc.
;; Copyright (C) 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
;; Free Software Foundation, Inc.
;; Author: Howard Gayle
;; Maintainer: FSF

5
lisp/international/ja-dic-cnv.el
View file

@ -1,7 +1,8 @@
;;; ja-dic-cnv.el --- convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp
;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 1995, 2000
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: mule, multilingual, Japanese

5
lisp/international/ja-dic-utl.el
View file

@ -1,7 +1,8 @@
;;; ja-dic-utl.el --- utilities for handling Japanese dictionary (SKK-JISYO.L)
;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 1995, 2000
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: mule, multilingual, Japanese

6
lisp/international/kinsoku.el
View file

@ -1,7 +1,9 @@
;;; kinsoku.el --- `Kinsoku' processing funcs -*- coding: iso-2022-7bit; -*-
;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 1997, 2003 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1998
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: mule, kinsoku

6
lisp/international/kkc.el
View file

@ -1,7 +1,9 @@
;;; kkc.el --- Kana Kanji converter -*- coding: iso-2022-7bit; -*-
;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 1997, 1998 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1998, 2000, 2001, 2003
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: mule, multilingual, Japanese

34
lisp/international/latexenc.el
View file

@ -120,24 +120,32 @@ coding system names is determined from `latex-inputenc-coding-alist'."
(save-excursion
;; try to find the coding system in this file
(goto-char (point-min))
(if (or
(re-search-forward "^[^%\n]*\\\\inputencoding{\\(.*\\)}" nil t)
(re-search-forward "^[^%\n]*\\\\usepackage\\[\\(.*\\)\\]{inputenc}" nil t))
(let* ((match (match-string 1))
(sym (intern match)))
(when (latexenc-inputenc-to-coding-system match)
(setq sym (latexenc-inputenc-to-coding-system match))
(when (coding-system-p sym)
sym
(if (and (require 'code-pages nil t) (coding-system-p sym))
sym
'undecided))))
(if (catch 'cs
(let ((case-fold-search nil))
(while (search-forward "inputenc" nil t)
(goto-char (match-beginning 0))
(beginning-of-line)
(if (or (looking-at "[^%\n]*\\\\usepackage\\[\\([^]]*\\)\\]{\\([^}]*,\\)?inputenc\\(,[^}]*\\)?}")
(looking-at "[^%\n]*\\\\inputencoding{\\([^}]*\\)}"))
(throw 'cs t)
(goto-char (match-end 0))))))
(let* ((match (match-string 1))
(sym (intern match)))
(when (latexenc-inputenc-to-coding-system match)
(setq sym (latexenc-inputenc-to-coding-system match)))
(when (coding-system-p sym)
sym
(if (and (require 'code-pages nil t) (coding-system-p sym))
sym
'undecided)))
;; else try to find it in the master/main file
(let (latexenc-main-file)
;; is there a TeX-master or tex-main-file in the local variable section
(unless latexenc-dont-use-TeX-master-flag
(goto-char (point-max))
(when (re-search-backward "^%+ *\\(TeX-master\\|tex-main-file\\): *\"\\(.+\\)\"" nil t)
(search-backward "\n\^L" (max (- (point-max) 3000) (point-min)) 'move)
(search-forward "Local Variables:" nil t)
(when (re-search-forward "^%+ *\\(TeX-master\\|tex-main-file\\): *\"\\(.+\\)\"" nil t)
(let ((file (concat (file-name-directory (nth 1 arg-list)) (match-string 2))))
(if (file-exists-p file)
(setq latexenc-main-file file)

2
lisp/international/latin1-disp.el
View file

@ -1,6 +1,6 @@
;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*-coding: iso-2022-7bit;-*-
;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
;; Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
;; Keywords: i18n

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

@ -1,8 +1,10 @@
;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*-
;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Copyright (C) 1995, 2003 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: mule, multilingual

8
lisp/international/mule-conf.el
View file

@ -1,8 +1,10 @@
;;; mule-conf.el --- configure multilingual environment -*- no-byte-compile: t -*-
;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 2005 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2005
;; Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: mule, multilingual, character set, coding system

8
lisp/international/mule-diag.el
View file

@ -1,8 +1,10 @@
;;; mule-diag.el --- show diagnosis of multilingual environment (Mule)
;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003
;; Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1999, 2000, 2001, 2002, 2003
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: multilingual, charset, coding system, fontset, diagnosis, i18n

8
lisp/international/mule-util.el
View file

@ -1,8 +1,10 @@
;;; mule-util.el --- utility functions for mulitilingual environment (mule)
;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004
;; Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1998, 1999, 2004
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: mule, multilingual

8
lisp/international/mule.el
View file

@ -1,8 +1,10 @@
;;; mule.el --- basic commands for mulitilingual environment
;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: mule, multilingual, character set, coding system

2
lisp/international/ogonek.el
View file

@ -1,6 +1,6 @@
;;; ogonek.el --- change the encoding of Polish diacritics
;; Copyright (C) 1997 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc.
;; Author: W{\l}odek Bzyl, Ryszard Kubiak
;; Maintainer: rysiek@ipipan.gda.pl (Ryszard Kubiak)

6
lisp/international/quail.el
View file

@ -1,9 +1,7 @@
;;; quail.el --- provides simple input method for multilingual text
;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
;; Copyright (C) 2005
;; Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021

3
lisp/international/subst-jis.el
View file

@ -1,5 +1,8 @@
;;; subst-jis.el --- Unicode/JISX translation -*-coding: euc-jp;-*-
;; Copyright (C) 2002, 2004 Free Software Foundation, Inc.
;; Copyright (C) 2004
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Author: Dave Love <fx@gnu.org>
;; Keywords: i18n

2
lisp/international/swedish.el
View file

@ -1,6 +1,6 @@
;;; swedish.el --- miscellaneous functions for dealing with Swedish
;; Copyright (C) 1988 Free Software Foundation, Inc.
;; Copyright (C) 1988, 2001 Free Software Foundation, Inc.
;; Author: Howard Gayle
;; Maintainer: FSF

6
lisp/international/titdic-cnv.el
View file

@ -1,7 +1,9 @@
;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*-
;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Keywords: Quail, TIT, cxterm

5
lisp/international/ucs-tables.el
View file

@ -1,6 +1,9 @@
;;; ucs-tables.el --- translation to, from and via Unicode -*- coding: iso-2022-7bit -*-
;; Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
;; Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
;; Copyright (C) 2002, 2003
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Author: Dave Love <fx@gnu.org>
;; Keywords: i18n

5
lisp/international/utf-16.el
View file

@ -1,6 +1,9 @@
;;; utf-16.el --- UTF-16 encoding/decoding
;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
;; Copyright (C) 2002, 2003, 2004
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Author: Dave Love <fx@gnu.org>
;; Keywords: Unicode, UTF-16, i18n

7
lisp/international/utf-8.el
View file

@ -1,8 +1,9 @@
;;; utf-8.el --- UTF-8 decoding/encoding support -*- coding: iso-2022-7bit -*-
;; Copyright (C) 2001, 2004 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
;; Copyright (C) 2001, 2002, 2003, 2004
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Author: TAKAHASHI Naoto <ntakahas@m17n.org>
;; Maintainer: FSF

53
lisp/mouse-sel.el
View file

@ -465,10 +465,12 @@ Clicking mouse-1 or mouse-3 kills the selected text.
This should be bound to a down-mouse event."
(interactive "@e")
(let (direction)
(let (select)
(unwind-protect
(setq direction (mouse-select-internal 'PRIMARY event))
(mouse-sel-primary-to-region direction))))
(setq select (mouse-select-internal 'PRIMARY event))
(if (and select (listp select))
(push (cons 'mouse-2 (cdr event)) unread-command-events)
(mouse-sel-primary-to-region select)))))
(defun mouse-select-secondary (event)
"Set secondary selection using the mouse.
@ -487,7 +489,14 @@ This should be bound to a down-mouse event."
(mouse-select-internal 'SECONDARY event))
(defun mouse-select-internal (selection event)
"Set SELECTION using the mouse."
"Set SELECTION using the mouse, with EVENT as the initial down-event.
Normally, this returns the direction in which the selection was
made: a value of 1 indicates that the mouse was dragged
left-to-right, otherwise it was dragged right-to-left.
However, if `mouse-1-click-follows-link' is non-nil and the
subsequent mouse events specify following a link, this returns
the final mouse-event. In that case, the selection is not set."
(mouse-sel-eval-at-event-end event
(let ((thing-symbol (mouse-sel-selection-thing selection))
(overlay (mouse-sel-selection-overlay selection)))
@ -501,7 +510,8 @@ This should be bound to a down-mouse event."
(car object-bounds) (cdr object-bounds)
(current-buffer)))
(move-overlay overlay (point) (point) (current-buffer)))))
(mouse-extend-internal selection)))
(catch 'follow-link
(mouse-extend-internal selection event t))))
;;=== Extend ==============================================================
@ -523,11 +533,12 @@ This should be bound to a down-mouse event."
(save-window-excursion
(mouse-extend-internal 'SECONDARY event)))
(defun mouse-extend-internal (selection &optional initial-event)
(defun mouse-extend-internal (selection &optional initial-event no-process)
"Extend specified SELECTION using the mouse.
Track mouse-motion events, adjusting the SELECTION appropriately.
Optional argument INITIAL-EVENT specifies an initial down-mouse event to
process.
Optional argument INITIAL-EVENT specifies an initial down-mouse event.
Optional argument NO-PROCESS means not to process the initial
event.
See documentation for mouse-select-internal for more details."
(mouse-sel-eval-at-event-end initial-event
@ -564,7 +575,8 @@ See documentation for mouse-select-internal for more details."
;; Handle dragging
(track-mouse
(while (if initial-event ; Use initial event
(while (if (and initial-event (not no-process))
;; Use initial event
(prog1
(setq event initial-event)
(setq initial-event nil))
@ -643,6 +655,10 @@ See documentation for mouse-select-internal for more details."
))) ; end track-mouse
;; Detect follow-link events
(when (mouse-sel-follow-link-p initial-event event)
(throw 'follow-link event))
;; Finish up after dragging
(let ((overlay-start (overlay-start overlay))
(overlay-end (overlay-end overlay)))
@ -679,6 +695,25 @@ See documentation for mouse-select-internal for more details."
))))
(defun mouse-sel-follow-link-p (initial final)
"Return t if we should follow a link, given INITIAL and FINAL mouse events.
See `mouse-1-click-follows-link' for details. Currently, Mouse
Sel mode does not support using a `double' value to follow links
using double-clicks."
(and initial final mouse-1-click-follows-link
(eq (car initial) 'down-mouse-1)
(mouse-on-link-p (posn-point (event-start initial)))
(= (posn-point (event-start initial))
(posn-point (event-end final)))
(= (event-click-count initial) 1)
(or (not (integerp mouse-1-click-follows-link))
(let ((t0 (posn-timestamp (event-start initial)))
(t1 (posn-timestamp (event-end final))))
(and (integerp t0) (integerp t1)
(if (> mouse-1-click-follows-link 0)
(<= (- t1 t0) mouse-1-click-follows-link)
(< (- t0 t1) mouse-1-click-follows-link)))))))
;;=== Paste ===============================================================
(defun mouse-insert-selection (event arg)

4
lisp/obsolete/float.el
View file

@ -423,7 +423,7 @@ are recognized."
(setq power (+ power (- decimal-digits (length digit-string)))))
; round up and add minus sign, if necessary
(f (* (+ (string-to-int digit-string)
(f (* (+ (string-to-number digit-string)
(if round-up 1 0))
(if mant-sign -1 1))))
@ -433,7 +433,7 @@ are recognized."
(expt 0) (chunks 0) (tens 0) (exponent _f1)
(func 'f*))
(setq expt (+ (* (string-to-int
(setq expt (+ (* (string-to-number
(substring expt-subst 0
(min expt-digits (length expt-subst))))
(if expt-sign -1 1))

2
lisp/obsolete/hilit19.el
View file

@ -1050,7 +1050,7 @@ Optionally, place the new pattern first in the pattern list"
(and (equal pstart "") (error "Must specify starting regex"))
(cond ((equal pend "") (setq pend 0))
((string-match "^[0-9]+$" pend) (setq pend (string-to-int pend))))
((string-match "^[0-9]+$" pend) (setq pend (string-to-number pend))))
(or mode (setq mode major-mode))
(let ((old-patterns (cdr (assq mode hilit-patterns-alist)))
(new-pat (list pstart pend face)))

12
lisp/obsolete/rnews.el
View file

@ -397,9 +397,9 @@ U unsubscribe from specified newsgroup."
to a list (a . b)"
(let ((n (string-match "-" number-string)))
(if n
(cons (string-to-int (substring number-string 0 n))
(string-to-int (substring number-string (1+ n))))
(setq n (string-to-int number-string))
(cons (string-to-number (substring number-string 0 n))
(string-to-number (substring number-string (1+ n))))
(setq n (string-to-number number-string))
(cons n n))))
;(defun is-in (elt lis)
@ -524,7 +524,7 @@ to a list (a . b)"
(news-select-message arg))
(defun news-select-message (arg)
(if (stringp arg) (setq arg (string-to-int arg)))
(if (stringp arg) (setq arg (string-to-number arg)))
(let ((file (concat news-path
(string-subst-char ?/ ?. news-current-news-group)
"/" arg)))
@ -803,7 +803,7 @@ Using ls was found to be too slow in a previous version."
;; don't get confused by directories that look like numbers
(file-directory-p
(concat file-directory "/" (car tem)))
(<= (string-to-int (car tem)) end-file-no))
(<= (string-to-number (car tem)) end-file-no))
(setq news-list-of-files
(delq (car tem) news-list-of-files)))
(setq tem (cdr tem)))
@ -811,7 +811,7 @@ Using ls was found to be too slow in a previous version."
(progn (setq news-current-group-end 0)
nil)
(setq news-list-of-files
(mapcar 'string-to-int news-list-of-files))
(mapcar 'string-to-number news-list-of-files))
(setq news-list-of-files (sort news-list-of-files '<))
(setq news-current-group-end
(elt news-list-of-files

2
lisp/play/5x5.el
View file

@ -1,6 +1,6 @@
;;; 5x5.el --- simple little puzzle game
;; Copyright (C) 1999,2000 Free Software Foundation, Inc.
;; Copyright (C) 1999,2000,2005 Free Software Foundation, Inc.
;; Author: Dave Pearson <davep@davep.org>
;; Maintainer: Dave Pearson <davep@davep.org>

2
lisp/play/animate.el
View file

@ -1,6 +1,6 @@
;;; animate.el --- make text dance
;; Copyright (C) 2001 Free Software Foundation, Inc.
;; Copyright (C) 2001,2005 Free Software Foundation, Inc.
;; Maintainer: Richard Stallman <rms@gnu.org>
;; Keywords: games

2
lisp/play/blackbox.el
View file

@ -1,6 +1,6 @@
;;; blackbox.el --- blackbox game in Emacs Lisp
;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002 Free Software Foundation, Inc.
;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2005 Free Software Foundation, Inc.
;; Author: F. Thomas May <uw-nsr!uw-warp!tom@beaver.cs.washington.edu>
;; Adapted-By: ESR

2
lisp/play/decipher.el
View file

@ -1,6 +1,6 @@
;;; decipher.el --- cryptanalyze monoalphabetic substitution ciphers
;;
;; Copyright (C) 1995, 1996, 2003 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 2003, 2005 Free Software Foundation, Inc.
;;
;; Author: Christopher J. Madsen <chris_madsen@geocities.com>
;; Keywords: games

2
lisp/play/doctor.el
View file

@ -1,6 +1,6 @@
;;; doctor.el --- psychological help for frustrated users
;; Copyright (C) 1985, 1987, 1994, 1996, 2000 Free Software Foundation, Inc.
;; Copyright (C) 1985, 1987, 1994, 1996, 2000, 2005 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: games

2
lisp/play/fortune.el
View file

@ -1,6 +1,6 @@
;;; fortune.el --- use fortune to create signatures
;; Copyright (C) 1999, 2001 Free Software Foundation, Inc.
;; Copyright (C) 1999, 2001, 2005 Free Software Foundation, Inc.
;; Author: Holger Schauer <Holger.Schauer@gmx.de>
;; Keywords: games utils mail

2
lisp/play/gamegrid.el
View file

@ -1,6 +1,6 @@
;;; gamegrid.el --- library for implementing grid-based games on Emacs
;; Copyright (C) 1997, 1998 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 2005 Free Software Foundation, Inc.
;; Author: Glynn Clements <glynn@sensei.co.uk>
;; Version: 1.02

2
lisp/play/gametree.el
View file

@ -1,6 +1,6 @@
;;; gametree.el --- manage game analysis trees in Emacs
;; Copyright (C) 1997 Free Software Foundation, Inc
;; Copyright (C) 1997, 1999 Free Software Foundation, Inc
;; Author: Ian T Zimmerman <itz@rahul.net>
;; Created: Wed Dec 10 07:41:46 PST 1997

2
lisp/play/handwrite.el
View file

@ -1,6 +1,6 @@
;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: iso-latin-1; -*-
;; (C) Copyright 1996 Free Software Foundation, Inc.
;; (C) Copyright 1996, 2005 Free Software Foundation, Inc.
;; Author: Danny Roozendaal (was: <danny@tvs.kun.nl>)
;; Created: October 21 1996

2
lisp/play/landmark.el
View file

@ -1,6 +1,6 @@
;;; landmark.el --- neural-network robot that learns landmarks
;; Copyright (c) 1996, 1997, 2000, 2003 Free Software Foundation, Inc.
;; Copyright (c) 1996, 1997, 2000, 2003, 2005 Free Software Foundation, Inc.
;; Author: Terrence Brannon (was: <brannon@rana.usc.edu>)
;; Created: December 16, 1996 - first release to usenet

2
lisp/play/life.el
View file

@ -1,6 +1,6 @@
;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
;; Copyright (C) 1988, 2001, 2004 Free Software Foundation, Inc.
;; Copyright (C) 1988, 2001, 2005 Free Software Foundation, Inc.
;; Author: Kyle Jones <kyleuunet.uu.net>
;; Maintainer: FSF

2
lisp/play/morse.el
View file

@ -1,6 +1,6 @@
;;; morse.el --- convert text to morse code and back -*- coding: utf-8 -*-
;; Copyright (C) 1995, 2002, 2004 Free Software Foundation, Inc.
;; Copyright (C) 1995, 2002, 2005 Free Software Foundation, Inc.
;; Author: Rick Farnbach <rick_farnbach@MENTORG.COM>
;; Keywords: games

2
lisp/play/mpuz.el
View file

@ -1,6 +1,6 @@
;;; mpuz.el --- multiplication puzzle for GNU Emacs
;; Copyright (C) 1990, 2002 Free Software Foundation, Inc.
;; Copyright (C) 1990, 2002, 2005 Free Software Foundation, Inc.
;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
;; Overhauled: Daniel Pfeiffer <occitan@esperanto.org>

2
lisp/play/pong.el
View file

@ -1,6 +1,6 @@
;;; pong.el --- classical implementation of pong
;; Copyright 1999, 2000, 2001 by Free Software Foundation, Inc.
;; Copyright 1999, 2000, 2001, 2005 by Free Software Foundation, Inc.
;; Author: Benjamin Drieu <bdrieu@april.org>
;; Keywords: games

2
lisp/play/snake.el
View file

@ -1,6 +1,6 @@
;;; snake.el --- implementation of Snake for Emacs
;; Copyright (C) 1997 Free Software Foundation, Inc.
;; Copyright (C) 1997, 2002 Free Software Foundation, Inc.
;; Author: Glynn Clements <glynn@sensei.co.uk>
;; Created: 1997-09-10

2
lisp/play/tetris.el
View file

@ -1,6 +1,6 @@
;;; tetris.el --- implementation of Tetris for Emacs
;; Copyright (C) 1997 Free Software Foundation, Inc.
;; Copyright (C) 1997, 2002 Free Software Foundation, Inc.
;; Author: Glynn Clements <glynn@sensei.co.uk>
;; Version: 2.01

2
lisp/play/zone.el
View file

@ -1,6 +1,6 @@
;;; zone.el --- idle display hacks
;; Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
;; Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc.
;; Author: Victor Zandy <zandy@cs.wisc.edu>
;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org>

12
lisp/progmodes/ada-mode.el
View file

@ -1364,6 +1364,11 @@ If you use ada-xref.el:
(add-hook 'local-write-file-hooks
(lambda () (untabify (point-min) (point-max))))))
(set (make-local-variable 'skeleton-further-elements)
'((< '(backward-delete-char-untabify
(min ada-indent (current-column))))))
(add-hook 'skeleton-end-hook 'ada-adjust-case-skeleton nil t)
(run-hooks 'ada-mode-hook)
;; To be run after the hook, in case the user modified
@ -1393,6 +1398,13 @@ If you use ada-xref.el:
(if ada-auto-case
(ada-activate-keys-for-case)))
(defun ada-adjust-case-skeleton ()
"Adjust the case of the text inserted by a skeleton."
(save-excursion
(let ((aa-end (point)))
(ada-adjust-case-region
(progn (goto-char (symbol-value 'beg)) (forward-word -1) (point))
(goto-char aa-end)))))
;; transient-mark-mode and mark-active are not defined in XEmacs
(defun ada-region-selected ()

16
lisp/progmodes/ada-stmt.el
View file

@ -466,22 +466,6 @@ Invoke right after `ada-function-spec' or `ada-procedure-spec'."
> "terminate;")
(defun ada-adjust-case-skeleton ()
"Adjust the case of the text inserted by a skeleton."
(save-excursion
(let ((aa-end (point)))
(ada-adjust-case-region
(progn (goto-char (symbol-value 'beg)) (forward-word -1) (point))
(goto-char aa-end)))))
(defun ada-stmt-mode-hook ()
(set (make-local-variable 'skeleton-further-elements)
'((< '(backward-delete-char-untabify
(min ada-indent (current-column))))))
(add-hook 'skeleton-end-hook 'ada-adjust-case-skeleton nil t))
(add-hook 'ada-mode-hook 'ada-stmt-mode-hook)
(provide 'ada-stmt)
;;; arch-tag: 94f51555-cc0e-44e5-8865-8788aae8ecd3

2
lisp/progmodes/cc-fonts.el
View file

@ -673,7 +673,7 @@ casts and declarations are fontified. Used on level 2 and higher."
(c-font-lock-objc-iip-decl)))
nil))))))
("!" . font-lock-negation-char-face)
("\\(!\\)[^=]" 1 font-lock-negation-char-face)
))
(defun c-font-lock-complex-decl-prepare (limit)

26
lisp/progmodes/executable.el
View file

@ -161,30 +161,6 @@ If PROGRAM is non-nil, use that instead of \"find\"."
(if (search-forward file nil t)
t))))
;;;###autoload
(defun executable-find (command)
"Search for COMMAND in `exec-path' and return the absolute file name.
Return nil if COMMAND is not found anywhere in `exec-path'."
(let ((list exec-path)
file)
(while list
(setq list
(if (and (setq file (expand-file-name command (car list)))
(let ((suffixes exec-suffixes)
candidate)
(while suffixes
(setq candidate (concat file (car suffixes)))
(if (and (file-executable-p candidate)
(not (file-directory-p candidate)))
(setq suffixes nil)
(setq suffixes (cdr suffixes))
(setq candidate nil)))
(setq file candidate)))
nil
(setq file nil)
(cdr list))))
file))
(defun executable-chmod ()
"This gets called after saving a file to assure that it be executable.
You can set the absolute or relative mode in variable `executable-chmod' for
@ -301,5 +277,5 @@ file modes."
(provide 'executable)
;;; arch-tag: 58458d1c-d9db-45ec-942b-8bbb1d5e319d
;; arch-tag: 58458d1c-d9db-45ec-942b-8bbb1d5e319d
;;; executable.el ends here

72
lisp/progmodes/gdb-ui.el
View file

@ -84,6 +84,8 @@
(defvar gdb-find-file-unhook nil)
(defvar gdb-active-process nil "GUD tooltips display variable values when t, \
and #define directives otherwise.")
(defvar gdb-macro-info nil
"Non-nil if GDB knows that the inferior includes preprocessor macro info.")
(defvar gdb-buffer-type nil
"One of the symbols bound in `gdb-buffer-rules'.")
@ -242,6 +244,18 @@ predefined macros."
(substring string 0 (- (length string) 1))))
gud-tooltip-echo-area))
;; If expr is a macro for a function don't print because of possible dangerous
;; side-effects. Also printing a function within a tooltip generates an
;; unexpected starting annotation (phase error).
(defun gdb-tooltip-print-1 (expr)
(with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
(goto-char (point-min))
(if (search-forward "expands to: " nil t)
(unless (looking-at "\\S+.*(.*).*")
(gdb-enqueue-input
(list (concat gdb-server-prefix "print " expr "\n")
'gdb-tooltip-print))))))
(defun gdb-set-gud-minor-mode (buffer)
"Set gud-minor-mode from find-file if appropriate."
(goto-char (point-min))
@ -336,6 +350,7 @@ predefined macros."
(setq gdb-flush-pending-output nil)
(setq gdb-location-alist nil)
(setq gdb-find-file-unhook nil)
(setq gdb-macro-info nil)
;;
(setq gdb-buffer-type 'gdba)
;;
@ -1293,27 +1308,27 @@ static char *magick[] = {
help-echo "mouse-2, RET: visit breakpoint"))
(unless (file-exists-p file)
(setq file (cdr (assoc bptno gdb-location-alist))))
(unless (string-equal file "File not found")
(if file
(with-current-buffer (find-file-noselect file)
(set (make-local-variable 'gud-minor-mode)
'gdba)
(set (make-local-variable 'tool-bar-map)
gud-tool-bar-map)
;; only want one breakpoint icon at each
;; location
(save-excursion
(goto-line (string-to-number line))
(gdb-put-breakpoint-icon (eq flag ?y) bptno)))
(gdb-enqueue-input
(list
(concat "list "
(match-string-no-properties 1) ":1\n")
'ignore))
(gdb-enqueue-input
(list "info source\n"
`(lambda () (gdb-get-location
,bptno ,line ,flag)))))))))))
(if (and file
(not (string-equal file "File not found")))
(with-current-buffer (find-file-noselect file)
(set (make-local-variable 'gud-minor-mode)
'gdba)
(set (make-local-variable 'tool-bar-map)
gud-tool-bar-map)
;; only want one breakpoint icon at each
;; location
(save-excursion
(goto-line (string-to-number line))
(gdb-put-breakpoint-icon (eq flag ?y) bptno)))
(gdb-enqueue-input
(list
(concat "list "
(match-string-no-properties 1) ":1\n")
'ignore))
(gdb-enqueue-input
(list "info source\n"
`(lambda () (gdb-get-location
,bptno ,line ,flag))))))))))
(end-of-line)))))
(if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
@ -2221,6 +2236,9 @@ buffers."
(if (and (search-forward "Located in " nil t)
(looking-at "\\S-*"))
(setq gdb-main-file (match-string 0)))
(goto-char (point-min))
(if (search-forward "Includes preprocessor macro info." nil t)
(setq gdb-macro-info t))
(if gdb-many-windows
(gdb-setup-windows)
(gdb-get-create-buffer 'gdb-breakpoints-buffer)
@ -2234,12 +2252,14 @@ Put in buffer and place breakpoint icon."
(goto-char (point-min))
(catch 'file-not-found
(if (search-forward "Located in " nil t)
(if (looking-at "\\S-*")
(push (cons bptno (match-string 0)) gdb-location-alist))
(when (looking-at "\\S-*")
(delete (cons bptno "File not found") gdb-location-alist)
(push (cons bptno (match-string 0)) gdb-location-alist))
(gdb-resync)
(push (cons bptno "File not found") gdb-location-alist)
(message-box "Cannot find source file for breakpoint location.\n\
Add directory to search path for source files using the GDB command, dir.")
(unless (assoc bptno gdb-location-alist)
(push (cons bptno "File not found") gdb-location-alist)
(message-box "Cannot find source file for breakpoint location.\n\
Add directory to search path for source files using the GDB command, dir."))
(throw 'file-not-found nil))
(with-current-buffer
(find-file-noselect (match-string 0))

14
lisp/progmodes/gud.el
View file

@ -3207,6 +3207,7 @@ This event can be examined by forms in GUD-TOOLTIP-DISPLAY.")
"Toggle the display of GUD tooltips."
:global t
:group 'gud
(require 'tooltip)
(if gud-tooltip-mode
(progn
(add-hook 'change-major-mode-hook 'gud-tooltip-change-major-mode)
@ -3253,7 +3254,7 @@ If GUD-TOOLTIP-DEREFERENCE is t, also prepend a `*' to EXPR."
(setq expr (concat "*" expr)))
(case gud-minor-mode
((gdb gdba) (concat "server print " expr))
(dbx (concat "print " expr))
((dbx gdbmi) (concat "print " expr))
(xdb (concat "p " expr))
(sdb (concat expr "/"))
(perldb expr)))
@ -3293,9 +3294,14 @@ This function must return nil if it doesn't handle EVENT."
expr))))
(let ((cmd (gud-tooltip-print-command expr)))
(unless (null cmd) ; CMD can be nil if unknown debugger
(if (eq gud-minor-mode 'gdba)
(gdb-enqueue-input
(list (concat cmd "\n") 'gdb-tooltip-print))
(if (memq gud-minor-mode '(gdba gdbmi))
(if gdb-macro-info
(gdb-enqueue-input
(list (concat
gdb-server-prefix "macro expand " expr "\n")
`(lambda () (gdb-tooltip-print-1 ,expr))))
(gdb-enqueue-input
(list (concat cmd "\n") 'gdb-tooltip-print)))
(setq gud-tooltip-original-filter (process-filter process))
(set-process-filter process 'gud-tooltip-process-output)
(gud-basic-call cmd))

12
lisp/progmodes/inf-lisp.el
View file

@ -214,10 +214,8 @@ processes, you can change `inferior-lisp-buffer' to another process
buffer with \\[set-variable].")
;;;###autoload
(defcustom inferior-lisp-mode-hook '()
"*Hook for customising Inferior Lisp mode."
:type 'hook
:group 'inferior-lisp)
(defvar inferior-lisp-mode-hook '()
"*Hook for customising Inferior Lisp mode.")
(put 'inferior-lisp-mode 'mode-class 'special)
@ -590,10 +588,8 @@ See variable `lisp-describe-sym-command'."
;;; Do the user's customisation...
;;;===============================
(defcustom inferior-lisp-load-hook nil
"This hook is run when the library `inf-lisp' is loaded."
:type 'hook
:group 'inferior-lisp)
(defvar inferior-lisp-load-hook nil
"This hook is run when the library `inf-lisp' is loaded.")
(run-hooks 'inferior-lisp-load-hook)

387
lisp/progmodes/make-mode.el
View file

@ -100,12 +100,35 @@
:prefix "makefile-")
(defface makefile-space-face
'((((class color)) (:background "hotpink"))
(t (:reverse-video t)))
'((((class color)) (:background "hotpink"))
(t (:reverse-video t)))
"Face to use for highlighting leading spaces in Font-Lock mode."
:group 'faces
:group 'makefile)
(defface makefile-targets-face
;; This needs to go along both with foreground and background colors (i.e. shell)
'((t (:underline t)))
"Face to use for additionally highlighting rule targets in Font-Lock mode."
:group 'faces
:group 'makefile)
(defface makefile-shell-face
'((((class color) (background light)) (:background "seashell1"))
(((class color) (background dark)) (:background "seashell4"))
(t (:reverse-video t)))
"Face to use for additionally highlighting Shell commands in Font-Lock mode."
:group 'faces
:group 'makefile)
(defface makefile-makepp-perl-face
'((((class color) (background light)) (:background "LightBlue1")) ; Camel Book
(((class color) (background dark)) (:background "DarkBlue"))
(t (:reverse-video t)))
"Face to use for additionally highlighting Perl code in Font-Lock mode."
:group 'faces
:group 'makefile)
(defcustom makefile-browser-buffer-name "*Macros and Targets*"
"*Name of the macro- and target browser buffer."
:type 'string
@ -235,16 +258,27 @@ not be enclosed in { } or ( )."
;; that if you change this regexp you might have to fix the imenu
;; index in makefile-imenu-generic-expression.
(defconst makefile-dependency-regex
"^ *\\([^ \n\t#:=]+\\([ \t]+\\([^ \t\n#:=]+\\|\\$[({][^ \t\n#})]+[})]\\)\\)*\\)[ \t]*:\\([ \t]*$\\|\\([^=\n].*$\\)\\)"
;; Allow for one nested level $($(var:a=b):c=d)
;; Scan non-$ constructs char by char, so we don't miss a $ while allowing $$.
;; Since we must allow space between targets, I then don't know how to evite a command starting with :.
"^ *\\(\\(?:\\$[({]\\(?:\\$[({][^ \t\n#})]+?[})]\\|[^\n#]\\)+?[})]\\|[^\n#:=]\\)+?\\)[ \t]*:\\(?:[ \t]*$\\|[^=\n].*$\\)"
"Regex used to find dependency lines in a makefile.")
;; Note that the first subexpression is used by font lock. Note
;; that if you change this regexp you might have to fix the imenu
;; index in makefile-imenu-generic-expression.
(defconst makefile-rule-action-regex
"^\t[ \t]*\\([-@]*\\)[ \t]*\\(.+\\)"
"Regex used to highlight rule action lines in font lock mode.")
;; Note that the first and second subexpression is used by font lock. Note
;; that if you change this regexp you might have to fix the imenu index in
;; makefile-imenu-generic-expression.
(defconst makefile-macroassign-regex
"^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*[*:+]?[:?]?="
"^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ \t]*\\(.*\\)\\|[*:+]?[:?]?=\\)"
"Regex used to find macro assignment lines in a makefile.")
(defconst makefile-var-use-regex
"[^$]\\$[({]\\([-a-zA-Z0-9_.]+\\|[@%<?^+*][FD]?\\)[}):]"
"Regex used to find $(macro) uses in a makefile.")
(defconst makefile-ignored-files-in-pickup-regex
"\\(^\\..*\\)\\|\\(.*~$\\)\\|\\(.*,v$\\)\\|\\(\\.[chy]\\)"
"Regex for filenames that will NOT be included in the target list.")
@ -254,50 +288,195 @@ not be enclosed in { } or ( )."
(defvar makefile-space-face 'makefile-space-face
"Face to use for highlighting leading spaces in Font-Lock mode.")
;; These lists were inspired by the old solution. But they are silly, because
;; you can't differentiate what follows. They need to be split up.
(defconst makefile-statements '("include")
"List of keywords understood by standard make.")
(defconst makefile-automake-statements
`("if" "else" "endif" ,@makefile-statements)
"List of keywords understood by automake.")
(defconst makefile-gmake-statements
`("-sinclude" "sinclude" "override" "vpath"
"ifdef" "ifndef" "ifeq" "ifneq" "-include" "define" "endef" "export"
"unexport"
,@(cdr makefile-automake-statements))
"List of keywords understood by gmake.")
;; These are even more silly, because you can have more spaces in between.
(defconst makefile-makepp-statements
`("and ifdef" "and ifndef" "and ifeq" "and ifneq" "and ifperl"
"and ifmakeperl" "and ifsys" "and ifnsys" "build_cache" "build_check"
"else ifdef" "else ifndef" "else ifeq" "else ifneq" "else ifperl"
"else ifmakeperl" "else ifsys" "else ifnsys" "enddef" "load_makefile"
"ifperl" "ifmakeperl" "ifsys" "ifnsys" "_include" "makeperl" "makesub"
"no_implicit_load" "perl" "perl-begin" "perl_begin" "perl-end" "perl_end"
"prebuild" "or ifdef" "or ifndef" "or ifeq" "or ifneq" "or ifperl"
"or ifmakeperl" "or ifsys" "or ifnsys" "register_command_parser"
"register_scanner" "repository" "runtime" "signature" "sub"
,@(nthcdr 4 makefile-gmake-statements))
"List of keywords understood by gmake.")
(defconst makefile-bsdmake-statements
`(".elif" ".elifdef" ".elifmake" ".elifndef" ".elifnmake" ".else" ".endfor"
".endif" ".for" ".if" ".ifdef" ".ifmake" ".ifndef" ".ifnmake" ".undef")
"List of keywords understood by BSD make.")
(defun makefile-make-font-lock-keywords (dependency action var keywords space
&optional negation
&rest font-lock-keywords)
`(;; Do macro assignments. These get the "variable-name" face.
(,makefile-macroassign-regex
(1 font-lock-variable-name-face)
;; This is for after !=
(2 'makefile-shell-face prepend t))
;; Do dependencies.
(,dependency 1 'makefile-targets-face prepend)
;; Rule actions.
(,action
(1 font-lock-type-face)
(2 'makefile-shell-face prepend)
;; Only makepp has builtin commands.
(3 font-lock-builtin-face prepend t))
;; Variable references even in targets/strings/comments.
(,var 1 font-lock-variable-name-face prepend)
;; Automatic variable references and single character variable references,
;; but not shell variables references.
("[^$]\\$\\([@%<?^+*_]\\|[a-zA-Z0-9]\\>\\)"
1 font-lock-constant-face prepend)
("[^$]\\(\\$[@%*]\\)"
1 'makefile-targets-face prepend)
;; Fontify conditionals and includes.
;; Note that plain `if' is an automake conditional, and not a bug.
(,(concat "^\\(?: [ \t]*\\)?"
(regexp-opt keywords t)
"\\>[ \t]*\\([^: \t\n#]*\\)")
(1 font-lock-keyword-face) (2 font-lock-variable-name-face))
,(if negation
`(,negation (1 font-lock-negation-char-face prepend)
(2 font-lock-negation-char-face prepend t)))
,@(if space
'(;; Highlight lines that contain just whitespace.
;; They can cause trouble, especially if they start with a tab.
("^[ \t]+$" . makefile-space-face)
;; Highlight shell comments that Make treats as commands,
;; since these can fool people.
("^\t+#" 0 makefile-space-face t)
;; Highlight spaces that precede tabs.
;; They can make a tab fail to be effective.
("^\\( +\\)\t" 1 makefile-space-face)))
,@font-lock-keywords))
(defconst makefile-font-lock-keywords
(list
(makefile-make-font-lock-keywords
makefile-dependency-regex
makefile-rule-action-regex
makefile-var-use-regex
makefile-statements
t))
;; Do macro assignments. These get the "variable-name" face rather
;; arbitrarily.
(list makefile-macroassign-regex 1 'font-lock-variable-name-face)
(defconst makefile-automake-font-lock-keywords
(makefile-make-font-lock-keywords
makefile-dependency-regex
makefile-rule-action-regex
makefile-var-use-regex
makefile-automake-statements
t))
;; Do dependencies. These get the function name face.
(list makefile-dependency-regex 1 'font-lock-function-name-face)
(defconst makefile-gmake-font-lock-keywords
(makefile-make-font-lock-keywords
makefile-dependency-regex
makefile-rule-action-regex
makefile-var-use-regex
makefile-gmake-statements
t
"^\\(?: [ \t]*\\)?if\\(n\\)\\(?:def\\|eq\\)\\>"
;; Variable references even in targets/strings/comments.
'("[^$]\\$[({]\\([-a-zA-Z0-9_.]+\\|[@%<?^+*][FD]?\\)[}):]"
1 font-lock-constant-face prepend)
'("[^$]\\(\\$[({][@%*][DF][})]\\)"
1 'makefile-targets-face prepend)
;; Automatic variable references and single character variable references,
;; but not shell variables references.
'("[^$]\\$\\([@%<?^+*_]\\|[a-zA-Z0-9]\\>\\)"
1 font-lock-constant-face prepend)
;; $(function ...) ${function ...}
'("[^$]\\$[({]\\(\\S +\\s \\)"
1 font-lock-function-name-face)
;; Fontify conditionals and includes.
;; Note that plain `if' is an automake conditional, and not a bug.
(list
(concat "^\\(?: [ \t]*\\)?"
(regexp-opt '("-include" "-sinclude" "include" "sinclude" "ifeq"
"if" "ifneq" "ifdef" "ifndef" "endif" "else"
"define" "endef" "override"
"export" "unexport" "vpath") t)
"\\>[ \t]*\\([^: \t\n#]*\\)")
'(1 font-lock-keyword-face) '(2 font-lock-variable-name-face))
;; $(shell ...) ${shell ...}
'("[^$]\\$\\([({]\\)shell[ \t]+"
makefile-match-function-end nil nil
(1 'makefile-shell-face prepend t))))
'("^\\(?: [ \t]*\\)?if\\(n\\)\\(?:def\\|eq\\)\\>"
1 font-lock-negation-char-face prepend)
(defconst makefile-makepp-font-lock-keywords
(makefile-make-font-lock-keywords
makefile-dependency-regex
;; Don't care about initial tab, but I don't know how to font-lock correctly without.
"^\t[ \t]*\\(\\(?:[ \t]*noecho\\>\\|[ \t]*ignore[-_]error\\>\\|[ \t]*[-@]+\\)*\\)[ \t]*\\(\\(&\\S +\\)?.+\\)"
makefile-var-use-regex
makefile-makepp-statements
nil
"^\\(?: [ \t]*\\)?\\(?:and[ \t]+\\|else[ \t]+\\|or[ \t]+\\)?if\\(n\\)\\(?:def\\|eq\\|sys\\)\\>"
;; Highlight lines that contain just whitespace.
;; They can cause trouble, especially if they start with a tab.
'("^[ \t]+$" . makefile-space-face)
'("[^$]\\(\\$[({]\\(?:target\\|output\\)s?[})]\\)"
1 'makefile-targets-face prepend)
;; Highlight shell comments that Make treats as commands,
;; since these can fool people.
'("^\t+#" 0 makefile-space-face t)
;; Colon modifier keywords.
'(":\\s *\\(build_c\\(?:ache\\|heck\\)\\|env\\(?:ironment\\)?\\|foreach\\|signature\\|scanner\\|quickscan\\|smartscan\\)\\>"
1 font-lock-keyword-face t)
;; $(function ...) $((function ...)) ${function ...} ${{function ...}}
'("[^$]\\$\\(((?\\|{{?\\)\\(\\S +\\s \\)"
2 font-lock-function-name-face)
;; $(shell ...) $((shell ...)) ${shell ...} ${{shell ...}}
'("[^$]\\$\\(((?\\|{{?\\)shell\\(?:[-_]\\(?:global[-_]\\)?once\\)?[ \t]+"
makefile-match-function-end nil nil
(1 'makefile-shell-face prepend t))
;; $(perl ...) $((perl ...)) ${perl ...} ${{perl ...}}
'("[^$]\\$\\(((?\\|{{?\\)makeperl[ \t]+"
makefile-match-function-end nil nil
(1 'makefile-makepp-perl-face prepend t))
'("[^$]\\$\\(((?\\|{{?\\)perl[ \t]+"
makefile-match-function-end nil nil
(1 'makefile-makepp-perl-face t t))
;; Can we unify these with (if (match-end 1) 'prepend t)?
'("ifmakeperl\\s +\\(.*\\)" 1 'makefile-makepp-perl-face prepend)
'("ifperl\\s +\\(.*\\)" 1 'makefile-makepp-perl-face t)
;; Perl block single- or multiline, as statement or rule action.
;; Don't know why the initial newline in 2nd variant of group 2 doesn't get skipped.
'("\\<make\\(?:perl\\|sub\\s +\\S +\\)\\s *\n?\\s *{\\(?:{\\s *\n?\\(\\(?:.*\n\\)+?\\)\\s *}\\|\\s *\\(\\(?:.*?\\|\n?\\(?:.*\n\\)+?\\)\\)\\)}"
(1 'makefile-makepp-perl-face prepend t)
(2 'makefile-makepp-perl-face prepend t))
'("\\<\\(?:perl\\|sub\\s +\\S +\\)\\s *\n?\\s *{\\(?:{\\s *\n?\\(\\(?:.*\n\\)+?\\)\\s *}\\|\\s *\\(\\(?:.*?\\|\n?\\(?:.*\n\\)+?\\)\\)\\)}"
(1 'makefile-makepp-perl-face t t)
(2 'makefile-makepp-perl-face t t))
;; Statement style perl block.
'("perl[-_]begin\\s *\\(?:\\s #.*\\)?\n\\(\\(?:.*\n\\)+?\\)\\s *perl[-_]end\\>"
1 'makefile-makepp-perl-face t)))
;; A lot more could be done for variables here:
(defconst makefile-bsdmake-font-lock-keywords
(makefile-make-font-lock-keywords
"^ *\\(\\(?:\\$[({]\\(?:\\$[({][^\n#})]+?[})]\\|[^\n#]\\)+?[})]\\|[^\n#:=]\\)+?\\)[ \t]*[:!]\\(?:[ \t]*$\\|[^=\n].*$\\)"
"^\t[ \t]*\\([-+@]*\\)[ \t]*\\(.+\\)"
makefile-var-use-regex
makefile-bsdmake-statements
t
"^\\(?: [ \t]*\\)?\\.\\(?:el\\)?if\\(n?\\)\\(?:def\\|make\\)?\\>[ \t]*\\(!?\\)"
'("^[ \t]*\\.for[ \t].+[ \t]\\(in\\)\\>" 1 font-lock-keyword-face)))
;; Highlight spaces that precede tabs.
;; They can make a tab fail to be effective.
'("^\\( +\\)\t" 1 makefile-space-face)))
(defconst makefile-font-lock-syntactic-keywords
;; From sh-script.el.
@ -371,47 +550,50 @@ The function must satisfy this calling convention:
()
(define-abbrev-table 'makefile-mode-abbrev-table ()))
(defvar makefile-mode-map nil
(defvar makefile-mode-map
(let ((map (make-sparse-keymap)))
;; set up the keymap
(define-key map "\C-c:" 'makefile-insert-target-ref)
(if makefile-electric-keys
(progn
(define-key map "$" 'makefile-insert-macro-ref)
(define-key map ":" 'makefile-electric-colon)
(define-key map "=" 'makefile-electric-equal)
(define-key map "." 'makefile-electric-dot)))
(define-key map "\C-c\C-f" 'makefile-pickup-filenames-as-targets)
(define-key map "\C-c\C-b" 'makefile-switch-to-browser)
(define-key map "\C-c\C-c" 'comment-region)
(define-key map "\C-c\C-p" 'makefile-pickup-everything)
(define-key map "\C-c\C-u" 'makefile-create-up-to-date-overview)
(define-key map "\C-c\C-i" 'makefile-insert-gmake-function)
(define-key map "\C-c\C-\\" 'makefile-backslash-region)
(define-key map "\C-c\C-m\C-a" 'makefile-automake-mode)
(define-key map "\C-c\C-m\C-b" 'makefile-bsdmake-mode)
(define-key map "\C-c\C-m\C-g" 'makefile-gmake-mode)
(define-key map "\C-c\C-m\C-m" 'makefile-mode)
(define-key map "\C-c\C-m\C-p" 'makefile-makepp-mode)
(define-key map "\M-p" 'makefile-previous-dependency)
(define-key map "\M-n" 'makefile-next-dependency)
(define-key map "\e\t" 'makefile-complete)
;; Make menus.
(define-key map [menu-bar makefile-mode]
(cons "Makefile" (make-sparse-keymap "Makefile")))
(define-key map [menu-bar makefile-mode browse]
'("Pop up Makefile Browser" . makefile-switch-to-browser))
(define-key map [menu-bar makefile-mode complete]
'("Complete Target or Macro" . makefile-complete))
(define-key map [menu-bar makefile-mode pickup]
'("Find Targets and Macros" . makefile-pickup-everything))
(define-key map [menu-bar makefile-mode prev]
'("Move to Previous Dependency" . makefile-previous-dependency))
(define-key map [menu-bar makefile-mode next]
'("Move to Next Dependency" . makefile-next-dependency))
map)
"The keymap that is used in Makefile mode.")
(if makefile-mode-map
()
(setq makefile-mode-map (make-sparse-keymap))
;; set up the keymap
(define-key makefile-mode-map "\C-c:" 'makefile-insert-target-ref)
(if makefile-electric-keys
(progn
(define-key makefile-mode-map "$" 'makefile-insert-macro-ref)
(define-key makefile-mode-map ":" 'makefile-electric-colon)
(define-key makefile-mode-map "=" 'makefile-electric-equal)
(define-key makefile-mode-map "." 'makefile-electric-dot)))
(define-key makefile-mode-map "\C-c\C-f" 'makefile-pickup-filenames-as-targets)
(define-key makefile-mode-map "\C-c\C-b" 'makefile-switch-to-browser)
(define-key makefile-mode-map "\C-c\C-c" 'comment-region)
(define-key makefile-mode-map "\C-c\C-p" 'makefile-pickup-everything)
(define-key makefile-mode-map "\C-c\C-u" 'makefile-create-up-to-date-overview)
(define-key makefile-mode-map "\C-c\C-i" 'makefile-insert-gmake-function)
(define-key makefile-mode-map "\C-c\C-\\" 'makefile-backslash-region)
(define-key makefile-mode-map "\M-p" 'makefile-previous-dependency)
(define-key makefile-mode-map "\M-n" 'makefile-next-dependency)
(define-key makefile-mode-map "\e\t" 'makefile-complete)
;; Make menus.
(define-key makefile-mode-map [menu-bar makefile-mode]
(cons "Makefile" (make-sparse-keymap "Makefile")))
(define-key makefile-mode-map [menu-bar makefile-mode browse]
'("Pop up Makefile Browser" . makefile-switch-to-browser))
(define-key makefile-mode-map [menu-bar makefile-mode complete]
'("Complete Target or Macro" . makefile-complete))
(define-key makefile-mode-map [menu-bar makefile-mode pickup]
'("Find Targets and Macros" . makefile-pickup-everything))
(define-key makefile-mode-map [menu-bar makefile-mode prev]
'("Move to Previous Dependency" . makefile-previous-dependency))
(define-key makefile-mode-map [menu-bar makefile-mode next]
'("Move to Next Dependency" . makefile-next-dependency)))
(defvar makefile-browser-map nil
"The keymap that is used in the macro- and target browser.")
(if makefile-browser-map
@ -504,8 +686,14 @@ The function must satisfy this calling convention:
;;;###autoload
(defun makefile-mode ()
"Major mode for editing Makefiles.
This function ends by invoking the function(s) `makefile-mode-hook'.
"Major mode for editing standard Makefiles.
If you are editing a file for a different make, try one of the
variants `makefile-automake-mode', `makefile-gmake-mode',
`makefile-makepp-mode' or `makefile-bsdmake-mode'. All but the
last should be correctly chosen based on the file name, except if
it is *.mk. This function ends by invoking the function(s)
`makefile-mode-hook'.
\\{makefile-mode-map}
@ -645,6 +833,31 @@ Makefile mode can be configured by modifying the following variables:
(setq indent-tabs-mode t)
(run-hooks 'makefile-mode-hook))
;; These should do more than just differentiate font-lock.
;;;###autoload
(define-derived-mode makefile-automake-mode makefile-mode "Makefile.am"
"An adapted `makefile-mode' that knows about automake."
(setq font-lock-defaults
`(makefile-automake-font-lock-keywords ,@(cdr font-lock-defaults))))
;;;###autoload
(define-derived-mode makefile-gmake-mode makefile-mode "GNUmakefile"
"An adapted `makefile-mode' that knows about gmake."
(setq font-lock-defaults
`(makefile-gmake-font-lock-keywords ,@(cdr font-lock-defaults))))
;;;###autoload
(define-derived-mode makefile-makepp-mode makefile-mode "Makeppfile"
"An adapted `makefile-mode' that knows about makepp."
(setq font-lock-defaults
`(makefile-makepp-font-lock-keywords ,@(cdr font-lock-defaults))))
;;;###autoload
(define-derived-mode makefile-bsdmake-mode makefile-mode "BSDmakefile"
"An adapted `makefile-mode' that knows about BSD make."
(setq font-lock-defaults
`(makefile-bsdmake-font-lock-keywords ,@(cdr font-lock-defaults))))
;;; Motion code.
@ -1453,6 +1666,16 @@ Then prompts for all required parameters."
;;; Utility functions
;;; ------------------------------------------------------------
(defun makefile-match-function-end (end)
"To be called as an anchored matcher by font-lock.
The anchor must have matched the opening parens in the first group."
(let ((s (match-string-no-properties 1)))
(setq s (cond ((string= s "(") "\\(.*?\\)[ \t]*)")
((string= s "{") "\\(.*?\\)[ \t]*}")
((string= s "((") "\\(.*?\\)[ \t]*))")
((string= s "{{") "\\(.*?\\)[ \t]*}}")))
(if s (looking-at s))))
(defun makefile-do-macro-insertion (macro-name)
"Insert a macro reference."
(if (not (zerop (length macro-name)))

6
lisp/progmodes/sh-script.el
View file

@ -414,6 +414,10 @@ This is buffer-local in every such buffer.")
?\" "\"\""
?\' "\"'"
?\` "\"`"
;; ?$ might also have a ". p" syntax. Both "'" and ". p" seem
;; to work fine. This is needed so that dabbrev-expand
;; $VARNAME works.
?$ "'"
?! "_"
?% "_"
?: "_"
@ -1126,7 +1130,7 @@ does not affect then else elif or fi statements themselves."
:type `(choice ,@ sh-number-or-symbol-list )
:group 'sh-indentation)
(defcustom sh-indent-for-do '*
(defcustom sh-indent-for-do 0
"*How much to indent a do statement.
This is relative to the statement before the do, i.e. the
while until or for statement."

2
lisp/startup.el
View file

@ -1112,7 +1112,7 @@ Values less than twice `fancy-splash-delay' are ignored."
Arguments from ARGS should be either strings, functions called
with no args that return a string, or pairs `:face FACE',
where FACE is a valid face specification, as it can be used with
`put-text-properties'."
`put-text-property'."
(let ((current-face nil))
(while args
(if (eq (car args) :face)

9
lisp/term/mac-win.el
View file

@ -1,6 +1,6 @@
;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*-
;; Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005
;; Copyright (C) 1999, 2000, 2002, 2003, 2005
;; Free Software Foundation, Inc.
;; Author: Andrew Choi <akochoi@mac.com>
@ -1328,6 +1328,13 @@ in `selection-converter-alist', which see."
coding 'utf-16)))
(setq str (or s (encode-coding-string str 'utf-16-mac)))))
((eq type 'com.apple.traditional-mac-plain-text)
(let ((encodables (find-coding-systems-string str))
(rest mac-script-code-coding-systems))
(unless (memq coding encodables)
(while (and rest (not (memq (cdar rest) encodables)))
(setq rest (cdr rest)))
(if rest
(setq coding (cdar rest)))))
(setq coding (coding-system-change-eol-conversion coding 'mac))
(setq str (encode-coding-string str coding)))
(t

2
lisp/term/sun.el
View file

@ -1,6 +1,6 @@
;;; sun.el --- keybinding for standard default sunterm keys
;; Copyright (C) 1987 Free Software Foundation, Inc.
;; Copyright (C) 1987, 2001 Free Software Foundation, Inc.
;; Author: Jeff Peck <peck@sun.com>
;; Keywords: terminals

2
lisp/term/tty-colors.el
View file

@ -1,6 +1,6 @@
;;; tty-colors.el --- color support for character terminals
;; Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
;; Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
;; Author: Eli Zaretskii
;; Maintainer: FSF

2
lisp/term/w32-win.el
View file

@ -1,6 +1,6 @@
;;; w32-win.el --- parse switches controlling interface with W32 window system
;; Copyright (C) 1993, 1994, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Copyright (C) 1993, 1994, 2003, 2005 Free Software Foundation, Inc.
;; Author: Kevin Gallo
;; Keywords: terminals

2
lisp/term/x-win.el
View file

@ -1,6 +1,6 @@
;;; x-win.el --- parse relevant switches and set up for X -*-coding: iso-2022-7bit;-*-
;; Copyright (C) 1993, 1994, 2001, 2002 Free Software Foundation, Inc.
;; Copyright (C) 1993, 1994, 2001, 2002, 2005 Free Software Foundation, Inc.
;; Author: FSF
;; Keywords: terminals, i18n

2
lisp/term/xterm.el
View file

@ -1,6 +1,6 @@
;;; xterm.el --- define function key sequences and standard colors for xterm
;; Copyright (C) 1995, 2002, 2004, 2005 Free Software Foundation, Inc.
;; Copyright (C) 1995, 2002, 2005 Free Software Foundation, Inc.
;; Author: FSF
;; Keywords: terminals

24
lispref/ChangeLog
View file

@ -1,3 +1,27 @@
2005-05-12 Lute Kamstra <lute@gnu.org>
* modes.texi (Generic Modes): Update.
(Major Modes): Refer to node "Generic Modes".
* elisp.texi (Top): Update to the current structure of the manual.
* processes.texi (Processes): Add menu description.
* customize.texi (Customization): Add menu descriptions.
2005-05-11 Thien-Thi Nguyen <ttn@gnu.org>
* processes.texi (Signals to Processes)
(Low-Level Network): Fix typos.
2005-05-11 Lute Kamstra <lute@gnu.org>
* elisp.texi (Top): Add some nodes from the chapter "Major and
Minor Modes" to the detailed node listing.
2005-05-10 Richard M. Stallman <rms@gnu.org>
* keymaps.texi (Extended Menu Items): Menu item filter functions
can be called at any time.
2005-05-08 Luc Teirlinck <teirllm@auburn.edu>
* variables.texi (File Local Variables): `(hack-local-variables t)'

11
lispref/customize.texi
View file

@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
@c Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2005 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/customize
@node Customization, Loading, Macros, Top
@ -12,10 +12,11 @@ and also customization groups for classifying them. We use the term
definitions---as well as face definitions (@pxref{Defining Faces}).
@menu
* Common Keywords::
* Group Definitions::
* Variable Definitions::
* Customization Types::
* Common Keywords:: Common keyword arguments for all kinds of
customization declarations.
* Group Definitions:: Writing customization group definitions.
* Variable Definitions:: Declaring user options.
* Customization Types:: Specifying the type of a user option.
@end menu
@node Common Keywords

277
lispref/elisp.texi
View file

@ -101,7 +101,6 @@ Reference Manual, corresponding to GNU Emacs version 22.1.
@menu
* Introduction:: Introduction and conventions used.
* Standards: Coding Conventions. Coding conventions for Emacs Lisp.
* Lisp Data Types:: Data types of objects in Emacs Lisp.
* Numbers:: Numbers and arithmetic functions.
@ -184,6 +183,7 @@ Introduction
* Caveats:: Flaws and a request for help.
* Lisp History:: Emacs Lisp is descended from Maclisp.
* Conventions:: How the manual is formatted.
* Version Info:: Which Emacs version is running?
* Acknowledgements:: The authors, editors, and sponsors of this manual.
Conventions
@ -196,14 +196,6 @@ Conventions
* Buffer Text Notation:: The format we use for buffer contents in examples.
* Format of Descriptions:: Notation for describing functions, variables, etc.
Tips and Conventions
* Coding Conventions:: Conventions for clean and robust programs.
* Compilation Tips:: Making compiled code run fast.
* Documentation Tips:: Writing readable documentation strings.
* Comment Tips:: Conventions for writing comments.
* Library Headers:: Standard headers for library packages.
Format of Descriptions
* A Sample Function Description::
@ -215,6 +207,7 @@ Lisp Data Types
* Comments:: Comments and their formatting conventions.
* Programming Types:: Types found in all Lisp systems.
* Editing Types:: Types specific to Emacs.
* Circular Objects:: Read syntax for circular structure.
* Type Predicates:: Tests related to types.
* Equality Predicates:: Tests of equality between any two objects.
@ -224,13 +217,16 @@ Programming Types
* Floating Point Type:: Numbers with fractional parts and with a large range.
* Character Type:: The representation of letters, numbers and
control characters.
* Symbol Type:: A multi-use object that refers to a function,
variable, property list, or itself.
* Sequence Type:: Both lists and arrays are classified as sequences.
* Cons Cell Type:: Cons cells, and lists (which are made from cons cells).
* Array Type:: Arrays include strings and vectors.
* String Type:: An (efficient) array of characters.
* Vector Type:: One-dimensional arrays.
* Symbol Type:: A multi-use object that refers to a function,
variable, property list, or itself.
* Char-Table Type:: One-dimensional sparse arrays indexed by characters.
* Bool-Vector Type:: One-dimensional arrays of @code{t} or @code{nil}.
* Hash Table Type:: Super-fast lookup tables.
* Function Type:: A piece of executable code you can call from elsewhere.
* Macro Type:: A method of expanding an expression into another
expression, more fundamental but less pretty.
@ -239,17 +235,20 @@ Programming Types
* Autoload Type:: A type used for automatically loading seldom-used
functions.
List Type
Cons Cell and List Types
* Box Diagrams:: Drawing pictures of lists.
* Dotted Pair Notation:: An alternative syntax for lists.
* Association List Type:: A specially constructed list.
Editing Types
* Buffer Type:: The basic object of editing.
* Window Type:: What makes buffers visible.
* Window Configuration Type::Save what the screen looks like.
* Marker Type:: A position in a buffer.
* Window Type:: What makes buffers visible.
* Frame Type:: Windows subdivide frames.
* Window Configuration Type::Save what the screen looks like.
* Frame Configuration Type::Recording the status of all frames.
* Process Type:: A process running on the underlying OS.
* Stream Type:: Receive or send characters.
* Keymap Type:: What function a keystroke invokes.
@ -261,9 +260,10 @@ Numbers
* Float Basics:: Representation and range of floating point.
* Predicates on Numbers:: Testing for numbers.
* Comparison of Numbers:: Equality and inequality predicates.
* Arithmetic Operations:: How to add, subtract, multiply and divide.
* Bitwise Operations:: Logical and, or, not, shifting.
* Numeric Conversions:: Converting float to integer and vice versa.
* Arithmetic Operations:: How to add, subtract, multiply and divide.
* Rounding Operations:: Explicitly rounding floating point numbers.
* Bitwise Operations:: Logical and, or, not, shifting.
* Math Functions:: Trig, exponential and logarithmic functions.
* Random Numbers:: Obtaining random integers, predictable or not.
@ -272,10 +272,12 @@ Strings and Characters
* String Basics:: Basic properties of strings and characters.
* Predicates for Strings:: Testing whether an object is a string or char.
* Creating Strings:: Functions to allocate new strings.
* Modifying Strings:: Altering the contents of an existing string.
* Text Comparison:: Comparing characters or strings.
* String Conversion:: Converting characters or strings and vice versa.
* Formatting Strings:: @code{format}: Emacs's analogue of @code{printf}.
* Case Conversion:: Case conversion functions.
* Case Tables:: Customizing case conversion.
Lists
@ -300,6 +302,16 @@ Sequences, Arrays, and Vectors
* Arrays:: Characteristics of arrays in Emacs Lisp.
* Array Functions:: Functions specifically for arrays.
* Vectors:: Functions specifically for vectors.
* Vector Functions:: Functions specifically for vectors.
* Char-Tables:: How to work with char-tables.
* Bool-Vectors:: How to work with bool-vectors.
Hash Tables
* Creating Hash:: Functions to create hash tables.
* Hash Access:: Reading and writing the hash table contents.
* Defining Hash:: Defining new comparison methods
* Other Hash:: Miscellaneous.
Symbols
@ -313,16 +325,18 @@ Symbols
Evaluation
* Intro Eval:: Evaluation in the scheme of things.
* Eval:: How to invoke the Lisp interpreter explicitly.
* Forms:: How various sorts of objects are evaluated.
* Quoting:: Avoiding evaluation (to put constants in
the program).
* Eval:: How to invoke the Lisp interpreter explicitly.
Kinds of Forms
* Self-Evaluating Forms:: Forms that evaluate to themselves.
* Symbol Forms:: Symbols evaluate as variables.
* Classifying Lists:: How to distinguish various sorts of list forms.
* Function Indirection:: When a symbol appears as the car of a list,
we find the real function via the symbol.
* Function Forms:: Forms that call functions.
* Macro Forms:: Forms that call macros.
* Special Forms:: ``Special forms'' are idiosyncratic primitives,
@ -333,7 +347,7 @@ Kinds of Forms
Control Structures
* Sequencing:: Evaluation in textual order.
* Conditionals:: @code{if}, @code{cond}.
* Conditionals:: @code{if}, @code{cond}, @code{when}, @code{unless}.
* Combining Conditions:: @code{and}, @code{or}, @code{not}.
* Iteration:: @code{while} loops.
* Nonlocal Exits:: Jumping out of a sequence.
@ -360,11 +374,19 @@ Variables
* Local Variables:: Variable values that exist only temporarily.
* Void Variables:: Symbols that lack values.
* Defining Variables:: A definition says a symbol is used as a variable.
* Tips for Defining:: Things you should think about when you
define a variable.
* Accessing Variables:: Examining values of variables whose names
are known only at run time.
* Setting Variables:: Storing new values in variables.
* Variable Scoping:: How Lisp chooses among local and global values.
* Buffer-Local Variables:: Variable values in effect only in one buffer.
* Frame-Local Variables:: Variable values in effect only in one frame.
* Future Local Variables:: New kinds of local values we might add some day.
* Variable Aliases:: Variables that are aliases for other variables.
* File Local Variables:: Handling local variable lists in files.
* Variables with Restricted Values:: Non-constant variables whose value can
@emph{not} be an arbitrary Lisp object.
Scoping Rules for Variable Bindings
@ -393,6 +415,9 @@ Functions
* Anonymous Functions:: Lambda-expressions are functions with no names.
* Function Cells:: Accessing or setting the function definition
of a symbol.
* Obsolete Functions:: Declaring functions obsolete.
* Inline Functions:: Defining functions that the compiler will open code.
* Function Safety:: Determining whether a function is safe to call.
* Related Topics:: Cross-references to specific Lisp primitives
that have a special bearing on how
functions work.
@ -415,6 +440,14 @@ Macros
Don't hide the user's variables.
* Indenting Macros:: Specifying how to indent macro calls.
Writing Customization Definitions
* Common Keywords:: Common keyword arguments for all kinds of
customization declarations.
* Group Definitions:: Writing customization group definitions.
* Variable Definitions:: Declaring user options.
* Customization Types:: Specifying the type of a user option.
Loading
* How Programs Do Loading:: The @code{load} function and others.
@ -430,13 +463,20 @@ Loading
Byte Compilation
* Speed of Byte-Code:: An example of speedup from byte compilation.
* Compilation Functions:: Byte compilation functions.
* Docs and Compilation:: Dynamic loading of documentation strings.
* Dynamic Loading:: Dynamic loading of individual functions.
* Eval During Compile:: Code to be evaluated when you compile.
* Compiler Errors:: Handling compiler error messages.
* Byte-Code Objects:: The data type used for byte-compiled functions.
* Disassembly:: Disassembling byte-code; how to read byte-code.
Advising Functions
Advising Emacs Lisp Functions
* Simple Advice:: A simple example to explain the basics of advice.
* Defining Advice:: Detailed description of @code{defadvice}.
* Around-Advice:: Wrapping advice around a function's definition.
* Computed Advice:: ...is to @code{defadvice} as @code{fset} is to @code{defun}.
* Activation of Advice:: Advice doesn't do anything until you activate it.
* Enabling Advice:: You can enable or disable each piece of advice.
@ -449,14 +489,16 @@ Advising Functions
Debugging Lisp Programs
* Debugger:: How the Emacs Lisp debugger is implemented.
* Edebug:: A source-level Emacs Lisp debugger.
* Syntax Errors:: How to find syntax errors.
* Test Coverage:: Ensuring you have tested all branches in your code.
* Compilation Errors:: How to find errors that show up in
byte compilation.
* Edebug:: A source-level Emacs Lisp debugger.
The Lisp Debugger
* Error Debugging:: Entering the debugger when an error happens.
* Infinite Loops:: Stopping and debugging a program that doesn't exit.
* Function Debugging:: Entering it when a certain function is called.
* Explicit Debug:: Entering it at a certain point in the program.
* Using Debugger:: What the debugger does; what you see while in it.
@ -464,6 +506,27 @@ The Lisp Debugger
* Invoking the Debugger:: How to call the function @code{debug}.
* Internals of Debugger:: Subroutines of the debugger, and global variables.
Edebug
* Using Edebug:: Introduction to use of Edebug.
* Instrumenting:: You must instrument your code
in order to debug it with Edebug.
* Edebug Execution Modes:: Execution modes, stopping more or less often.
* Jumping:: Commands to jump to a specified place.
* Edebug Misc:: Miscellaneous commands.
* Breakpoints:: Setting breakpoints to make the program stop.
* Trapping Errors:: Trapping errors with Edebug.
* Edebug Views:: Views inside and outside of Edebug.
* Edebug Eval:: Evaluating expressions within Edebug.
* Eval List:: Expressions whose values are displayed
each time you enter Edebug.
* Printing in Edebug:: Customization of printing.
* Trace Buffer:: How to produce trace output in a buffer.
* Coverage Testing:: How to test evaluation coverage.
* The Outside Context:: Data that Edebug saves and restores.
* Instrumenting Macro Calls:: Specifying how to handle macro calls.
* Edebug Options:: Option variables for customizing Edebug.
Debugging Invalid Lisp Syntax
* Excess Open:: How to find a spurious open paren or missing close.
@ -478,14 +541,21 @@ Reading and Printing Lisp Objects
* Output Streams:: Various data types that can be used as
output streams.
* Output Functions:: Functions to print Lisp objects as text.
* Output Variables:: Variables that control what the printing
functions do.
Minibuffers
* Intro to Minibuffers:: Basic information about minibuffers.
* Text from Minibuffer:: How to read a straight text string.
* Object from Minibuffer:: How to read a Lisp object or expression.
* Minibuffer History:: Recording previous minibuffer inputs
so the user can reuse them.
* Initial Input:: Specifying initial contents for the minibuffer.
* Completion:: How to invoke and customize completion.
* Yes-or-No Queries:: Asking a question with a simple answer.
* Multiple Queries:: Asking a series of similar questions.
* Reading a Password:: Reading a password from the terminal.
* Minibuffer Misc:: Various customization hooks and variables.
Completion
@ -505,8 +575,10 @@ Command Loop
* Defining Commands:: Specifying how a function should read arguments.
* Interactive Call:: Calling a command, so that it will read arguments.
* Command Loop Info:: Variables set by the command loop for you to examine.
* Adjusting Point:: Adjustment of point after a command.
* Input Events:: What input looks like when you read it.
* Reading Input:: How to read input events from the keyboard or mouse.
* Special Events:: Events processed immediately and individually.
* Waiting:: Waiting for user input or elapsed time.
* Quitting:: How @kbd{C-g} works. How to catch or defer quitting.
* Prefix Command Arguments:: How the commands to set prefix args work.
@ -531,8 +603,6 @@ Keymaps
* Inheritance and Keymaps:: How one keymap can inherit the bindings
of another keymap.
* Prefix Keys:: Defining a key with a keymap as its definition.
* Menu Keymaps:: A keymap can define a menu for X
or for use from the terminal.
* Active Keymaps:: Each buffer has a local keymap
to override the standard (global) bindings.
Each minor mode can also override them.
@ -542,12 +612,19 @@ Keymaps
* Remapping Commands:: Bindings that translate one command to another.
* Key Binding Commands:: Interactive interfaces for redefining keys.
* Scanning Keymaps:: Looking through all keymaps, for printing help.
* Menu Keymaps:: A keymap can define a menu for X
or for use from the terminal.
Major and Minor Modes
* Major Modes:: Defining major modes.
* Minor Modes:: Defining minor modes.
* Mode Line Format:: Customizing the text that appears in the mode line.
* Imenu:: How a mode can provide a menu
of definitions in the buffer.
* Font Lock Mode:: How modes can highlight text according to syntax.
* Desktop Save Mode:: How modes can have buffer state saved between
Emacs sessions.
* Hooks:: How to use hooks; how to write code that
provides hooks.
@ -557,17 +634,26 @@ Major Modes
* Example Major Modes:: Text mode and Lisp modes.
* Auto Major Mode:: How Emacs chooses the major mode automatically.
* Mode Help:: Finding out how to use a mode.
* Derived Modes:: Defining a new major mode based on another major
mode.
* Generic Modes:: Defining a simple major mode that supports
comment syntax and Font Lock mode.
* Mode Hooks:: Hooks run at the end of major mode functions.
Minor Modes
* Minor Mode Conventions:: Tips for writing a minor mode.
* Keymaps and Minor Modes:: How a minor mode can have its own keymap.
* Defining Minor Modes:: A convenient facility for defining minor modes.
Mode Line Format
* Mode Line Data:: The data structure that controls the mode line.
* Mode Line Variables:: Variables used in that data structure.
* %-Constructs:: Putting information into a mode line.
* Properties in Mode:: Using text properties in the mode line.
* Header Lines:: Like a mode line, but at the top.
* Emulating Mode Line:: Formatting text as the mode line would.
Documentation
@ -586,11 +672,15 @@ Files
* Reading from Files:: Reading files into other buffers.
* Writing to Files:: Writing new files from parts of buffers.
* File Locks:: Locking and unlocking files, to prevent
simultaneous editing by two people.
* Information about Files:: Testing existence, accessibility, size of files.
* Contents of Directories:: Getting a list of the files in a directory.
simultaneous editing by two people.
* Information about Files:: Testing existence, accessibility, size of files.
* Changing Files:: Renaming files, changing protection, etc.
* File Names:: Decomposing and expanding file names.
* Contents of Directories:: Getting a list of the files in a directory.
* Create/Delete Dirs:: Creating and Deleting Directories.
* Magic File Names:: Defining "magic" special handling
for certain file names.
* Format Conversion:: Conversion to and from various file formats.
Visiting Files
@ -600,19 +690,22 @@ Visiting Files
Information about Files
* Testing Accessibility:: Is a given file readable? Writable?
* Kinds of Files:: Is it a directory? A link?
* Kinds of Files:: Is it a directory? A symbolic link?
* Truenames:: Eliminating symbolic links from a file name.
* File Attributes:: How large is it? Any other names? Etc.
File Names
* File Name Components:: The directory part of a file name, and the rest.
* Directory Names:: A directory's name as a directory
is different from its name as a file.
* Relative File Names:: Some file names are relative to a
current directory.
* Directory Names:: A directory's name as a directory
is different from its name as a file.
* File Name Expansion:: Converting relative file names to absolute ones.
* Unique File Names:: Generating names for temporary files.
* File Name Completion:: Finding the completions for a given file name.
* Standard File Names:: If your package uses a fixed file name,
how to handle various operating systems simply.
Backups and Auto-Saving
@ -634,6 +727,8 @@ Backup Files
Buffers
* Buffer Basics:: What is a buffer?
* Current Buffer:: Designating a buffer as current
so primitives will access its contents.
* Buffer Names:: Accessing and changing buffer names.
* Buffer File Name:: The buffer file name indicates which file
is visited.
@ -645,8 +740,9 @@ Buffers
* The Buffer List:: How to look at all the existing buffers.
* Creating Buffers:: Functions that create buffers.
* Killing Buffers:: Buffers exist until explicitly killed.
* Current Buffer:: Designating a buffer as current
so primitives will access its contents.
* Indirect Buffers:: An indirect buffer shares text with some
other buffer.
* Buffer Gap:: The gap in the buffer.
Windows
@ -658,14 +754,20 @@ Windows
* Buffers and Windows:: Each window displays the contents of a buffer.
* Displaying Buffers:: Higher-lever functions for displaying a buffer
and choosing a window for it.
* Choosing Window:: How to choose a window for displaying a buffer.
* Window Point:: Each window has its own location of point.
* Window Start:: The display-start position controls which text
is on-screen in the window.
* Vertical Scrolling:: Moving text up and down in the window.
* Horizontal Scrolling:: Moving text sideways on the window.
* Textual Scrolling:: Moving text up and down through the window.
* Vertical Scrolling:: Moving the contents up and down on the window.
* Horizontal Scrolling:: Moving the contents sideways on the window.
* Size of Window:: Accessing the size of a window.
* Resizing Windows:: Changing the size of a window.
* Coordinates and Windows:: Converting coordinates to windows.
* Window Configurations:: Saving and restoring the state of the screen.
* Window Hooks:: Hooks for scrolling, window size changes,
redisplay going past a certain point,
or window configuration changes.
Frames
@ -690,6 +792,7 @@ Frames
* Pointer Shapes:: Specifying the shape of the mouse pointer.
* Window System Selections::Transferring text to and from other windows.
* Color Names:: Getting the definitions of color names.
* Text Terminal Colors:: Defining colors for text-only terminals.
* Resources:: Getting resource values from the server.
* Display Feature Testing:: Determining the features of a terminal.
@ -715,8 +818,10 @@ Markers
* Overview of Markers:: The components of a marker, and how it relocates.
* Predicates on Markers:: Testing whether an object is a marker.
* Creating Markers:: Making empty markers or markers at certain places.
* Information from Markers:: Finding the marker's buffer or character
position.
* Information from Markers::Finding the marker's buffer or character
position.
* Marker Insertion Types:: Two ways a marker can relocate when you
insert where it points.
* Moving Markers:: Moving the marker to a new buffer or position.
* The Mark:: How ``the mark'' is implemented with a marker.
* The Region:: How to access ``the region''.
@ -725,6 +830,7 @@ Text
* Near Point:: Examining text in the vicinity of point.
* Buffer Contents:: Examining text in a general fashion.
* Comparing Text:: Comparing substrings of buffers.
* Insertion:: Adding new text to a buffer.
* Commands for Insertion:: User-level commands to insert text.
* Deletion:: Removing text from a buffer.
@ -732,21 +838,25 @@ Text
* The Kill Ring:: Where removed text sometimes is saved for
later use.
* Undo:: Undoing changes to the text of a buffer.
* Auto Filling:: How auto-fill mode is implemented to break lines.
* Maintaining Undo:: How to enable and disable undo information.
How to control how much information is kept.
* Filling:: Functions for explicit filling.
* Margins:: How to specify margins for filling commands.
* Adaptive Fill:: Adaptive Fill mode chooses a fill prefix
from context.
* Auto Filling:: How auto-fill mode is implemented to break lines.
* Sorting:: Functions for sorting parts of the buffer.
* Indentation:: Functions to insert or adjust indentation.
* Columns:: Computing horizontal positions, and using them.
* Indentation:: Functions to insert or adjust indentation.
* Case Changes:: Case conversion of parts of the buffer.
* Text Properties:: Assigning Lisp property lists to text characters.
* Substitution:: Replacing a given character wherever it appears.
* Transposition:: Swapping two portions of a buffer.
* Registers:: How registers are implemented. Accessing
the text or position stored in a register.
* Atomic Changes:: Installing several buffer changes ``atomically''.
* Base 64:: Conversion to or from base 64 encoding.
* MD5 Checksum:: Compute the MD5 ``message digest''/``checksum''.
* Atomic Changes:: Installing several buffer changes ``atomically''.
* Change Hooks:: Supplying functions to be run when text is changed.
The Kill Ring
@ -782,6 +892,7 @@ Text Properties
only when text is examined.
* Clickable Text:: Using text properties to make regions of text
do something when you click on them.
* Links and Mouse-1:: How to make @key{Mouse-1} follow a link.
* Fields:: The @code{field} property defines
fields within the buffer.
* Not Intervals:: Why text properties do not use
@ -810,25 +921,31 @@ Searching and Matching
* String Search:: Search for an exact match.
* Regular Expressions:: Describing classes of strings.
* Regexp Search:: Searching for a match for a regexp.
* POSIX Regexps:: Searching POSIX-style for the longest match.
* Search and Replace:: Internals of @code{query-replace}.
* Match Data:: Finding out which part of the text matched
various parts of a regexp, after regexp search.
* Saving Match Data:: Saving and restoring this information.
* Standard Regexps:: Useful regexps for finding sentences, pages,...
* Searching and Case:: Case-independent or case-significant searching.
* Standard Regexps:: Useful regexps for finding sentences, pages,...
Regular Expressions
* Syntax of Regexps:: Rules for writing regular expressions.
* Regexp Example:: Illustrates regular expression syntax.
* Regexp Functions:: Functions for operating on regular expressions.
Syntax Tables
* Syntax Basics:: Basic concepts of syntax tables.
* Syntax Descriptors:: How characters are classified.
* Syntax Table Functions:: How to create, examine and alter syntax tables.
* Syntax Properties:: Overriding syntax with text properties.
* Motion and Syntax:: Moving over characters with certain syntaxes.
* Parsing Expressions:: Parsing balanced expressions
using the syntax table.
* Standard Syntax Tables:: Syntax tables used by various major modes.
* Syntax Table Internals:: How syntax table information is stored.
* Categories:: Another way of classifying character syntax.
Syntax Descriptors
@ -838,15 +955,16 @@ Syntax Descriptors
Abbrevs And Abbrev Expansion
* Abbrev Mode:: Setting up Emacs for abbreviation.
* Tables: Abbrev Tables. Creating and working with abbrev tables.
* Abbrev Tables:: Creating and working with abbrev tables.
* Defining Abbrevs:: Specifying abbreviations and their expansions.
* Files: Abbrev Files. Saving abbrevs in files.
* Expansion: Abbrev Expansion. Controlling expansion; expansion subroutines.
* Abbrev Files:: Saving abbrevs in files.
* Abbrev Expansion:: Controlling expansion; expansion subroutines.
* Standard Abbrev Tables:: Abbrev tables used by various major modes.
Processes
* Subprocess Creation:: Functions that start subprocesses.
* Shell Arguments:: Quoting an argument to pass it to a shell.
* Synchronous Processes:: Details of using synchronous subprocesses.
* Asynchronous Processes:: Starting up an asynchronous subprocess.
* Deleting Processes:: Eliminating an asynchronous subprocess.
@ -856,7 +974,13 @@ Processes
an asynchronous subprocess.
* Output from Processes:: Collecting output from an asynchronous subprocess.
* Sentinels:: Sentinels run when process run-status changes.
* Query Before Exit:: Whether to query if exiting will kill a process.
* Transaction Queues:: Transaction-based communication with subprocesses.
* Network:: Opening network connections.
* Network Servers:: Network servers let Emacs accept net connections.
* Datagrams:: UDP network connections.
* Low-Level Network:: Lower-level but more general function
to create connections and servers.
Receiving Output from Processes
@ -865,14 +989,53 @@ Receiving Output from Processes
* Decoding Output:: Filters can get unibyte or multibyte strings.
* Accepting Output:: How to wait until process output arrives.
Emacs Display
* Refresh Screen:: Clearing the screen and redrawing everything on it.
* Forcing Redisplay:: Forcing redisplay.
* Truncation:: Folding or wrapping long text lines.
* The Echo Area:: Where messages are displayed.
* Warnings:: Displaying warning messages for the user.
* Progress:: Informing user about progress of a long operation.
* Invisible Text:: Hiding part of the buffer text.
* Selective Display:: Hiding part of the buffer text.
* Temporary Displays:: Displays that go away automatically.
* Overlays:: Use overlays to highlight parts of the buffer.
* Width:: How wide a character or string is on the screen.
* Line Height:: Controlling the height of lines.
* Faces:: A face defines a graphics style
for text characters: font, colors, etc.
* Fringes:: Controlling window fringes.
* Scroll Bars:: Controlling vertical scroll bars.
* Pointer Shape:: Controlling the mouse pointer shape.
* Display Property:: Enabling special display features.
* Images:: Displaying images in Emacs buffers.
* Buttons:: Adding clickable buttons to Emacs buffers.
* Blinking:: How Emacs shows the matching open parenthesis.
* Inverse Video:: Specifying how the screen looks.
* Usual Display:: The usual conventions for displaying nonprinting chars.
* Display Tables:: How to specify other conventions.
* Beeping:: Audible signal to the user.
* Window Systems:: Which window system is being used.
Operating System Interface
* Starting Up:: Customizing Emacs start-up processing.
* Getting Out:: How exiting works (permanent or temporary).
* System Environment:: Distinguish the name and kind of system.
* User Identification:: Finding the name and user id of the user.
* Time of Day:: Getting the current time.
* Time Conversion:: Converting a time from numeric form to a string, or
to calendrical data (or vice versa).
* Processor Run Time:: Getting the run time used by Emacs.
* Time Calculations:: Adding, subtracting, comparing times, etc.
* Timers:: Setting a timer to call a function at a certain time.
* Terminal Input:: Recording terminal input for debugging.
* Terminal Output:: Recording terminal output for debugging.
* Sound Output:: Playing sounds on the computer's speaker.
* X11 Keysyms:: Operating on key symbols for X Windows
* Batch Mode:: Running Emacs without terminal interaction.
* Session Management:: Saving and restoring state with X Session Management.
Starting Up Emacs
@ -887,36 +1050,22 @@ Getting out of Emacs
* Killing Emacs:: Exiting Emacs irreversibly.
* Suspending Emacs:: Exiting Emacs reversibly.
Emacs Display
Tips and Conventions
* Refresh Screen:: Clearing the screen and redrawing everything on it.
* Truncation:: Folding or wrapping long text lines.
* The Echo Area:: Where messages are displayed.
* Warnings:: Displaying warning messages for the user.
* Selective Display:: Hiding part of the buffer text.
* Overlay Arrow:: Display of an arrow to indicate position.
* Temporary Displays:: Displays that go away automatically.
* Overlays:: Use overlays to highlight parts of the buffer.
* Width:: How wide a character or string is on the screen.
* Faces:: A face defines a graphics style
for text characters: font, colors, etc.
* Fringes:: Controlling window fringes.
* Display Property:: Enabling special display features.
* Images:: Displaying images in Emacs buffers.
* Blinking:: How Emacs shows the matching open parenthesis.
* Inverse Video:: Specifying how the screen looks.
* Usual Display:: The usual conventions for displaying nonprinting chars.
* Display Tables:: How to specify other conventions.
* Beeping:: Audible signal to the user.
* Window Systems:: Which window system is being used.
* Coding Conventions:: Conventions for clean and robust programs.
* Compilation Tips:: Making compiled code run fast.
* Documentation Tips:: Writing readable documentation strings.
* Comment Tips:: Conventions for writing comments.
* Library Headers:: Standard headers for library packages.
GNU Emacs Internals
* Building Emacs:: How to preload Lisp libraries into Emacs.
* Pure Storage:: A kludge to make preloaded Lisp functions sharable.
* Garbage Collection:: Reclaiming space for Lisp objects no longer used.
* Object Internals:: Data formats of buffers, windows, processes.
* Memory Usage:: Info about total size of Lisp objects made so far.
* Writing Emacs Primitives:: Writing C code for Emacs.
* Object Internals:: Data formats of buffers, windows, processes.
Object Internals

4
lispref/keymaps.texi
View file

@ -1909,6 +1909,10 @@ This property provides a way to compute the menu item dynamically.
The property value @var{filter-fn} should be a function of one argument;
when it is called, its argument will be @var{real-binding}. The
function should return the binding to use instead.
Emacs can call this function at any time that it does redisplay or
operates on menu data structures, so you should write it so it can
safely be called at any time.
@end table
@node Menu Separators

18
lispref/modes.texi
View file

@ -71,10 +71,9 @@ it is convenient to use @code{define-derived-mode} with a @code{nil}
parent argument, since it automatically enforces the most important
coding conventions for you.
@findex define-generic-mode
For a very simple programming language major mode that handles
comments and fontification, you can use @code{define-generic-mode}
in @file{generic.el}.
comments and fontification, you can use @code{define-generic-mode}.
@xref{Generic Modes}.
Rmail Edit mode offers an example of changing the major mode
temporarily for a buffer, so it can be edited in a different way (with
@ -873,7 +872,7 @@ configuration files. To define a generic mode, use the macro
@code{define-generic-mode}. See the file @file{generic-x.el} for some
examples of the use of @code{define-generic-mode}.
@defmac define-generic-mode mode comment-list keyword-list font-lock-list auto-mode-list function-list &optional docstring &rest custom-keyword-args
@defmac define-generic-mode mode comment-list keyword-list font-lock-list auto-mode-list function-list &optional docstring
This macro creates a new generic mode. The argument @var{mode} (an
unquoted symbol) is the major mode command. The optional argument
@var{docstring} is the documentation for the mode command. If you do
@ -902,16 +901,7 @@ when Emacs runs the macro expansion.
@var{function-list} is a list of functions to call to do some
additional setup. The mode command calls these functions just before
it runs the mode hook.
The optional @var{custom-keyword-args} are pairs of keywords and
values to include in the generated @code{defcustom} form for the mode
hook variable @code{@var{mode}-hook}. The default value for the
@samp{:group} keyword is @var{mode} with the final @samp{-mode} (if
any) removed. Don't use this default group name unless you have
written a @code{defgroup} to define that group properly (@pxref{Group
Definitions}). You can specify keyword arguments without specifying a
docstring.
it runs the mode hook variable @code{@var{mode}-hook}.
@end defmac
@node Mode Hooks

8
lispref/processes.texi
View file

@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2005
@c Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/processes
@ -49,7 +49,7 @@ This function returns @code{t} if @var{object} is a process,
* Transaction Queues:: Transaction-based communication with subprocesses.
* Network:: Opening network connections.
* Network Servers:: Network servers let Emacs accept net connections.
* Datagrams::
* Datagrams:: UDP network connections.
* Low-Level Network:: Lower-level but more general function
to create connections and servers.
@end menu
@ -870,7 +870,7 @@ processes. (@code{SIGHUP} is a signal that usually indicates that the
user hung up the phone.)
Each of the signal-sending functions takes two optional arguments:
@var{process-name} and @var{current-group}.
@var{process} and @var{current-group}.
The argument @var{process} must be either a process, a process
name, a buffer, a buffer name, or @code{nil}. A buffer or buffer name
@ -1767,7 +1767,7 @@ equivalent to specifying it with value @code{nil}, except for
are the meaningful keywords:
@table @asis
@item :name name
@item :name @var{name}
Use the string @var{name} as the process name. It is modified if
necessary to make it unique.

45
mac/ChangeLog
View file

@ -1,6 +1,47 @@
2005-05-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* makefile.MPW (buildobj.lst): New target.
(Clean): Delete file buildobj.lst.
(Emacs, {DocTarget}DOC): Depend on buildobj.lst.
(EmacsSource, MacSource, LispSource, LispSourceDontCompile):
Remove variables.
(SOME_MACHINE_OBJECTS, shortlisp, SOME_MACHINE_LISP): New
variables.
({DocTarget}DOC): Use them.
(Make-DocFile-PPCCOptions): Add `-d MAC_OS -d MAC_OS8'.
* inc/config.h: Sync with src/config.in.
(DO_BLOCK_INPUT, HAVE_DIFFTIME, HAVE_LOCALE_H, HAVE_MEMCMP)
(HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET, HAVE_SETITIMER)
(HAVE_SIZE_T, HAVE_SYS_IOCTL_H, HAVE_SYS_PARAM_H, HAVE_SYS_STAT_H)
(HAVE_SYS_TYPES_H, TIME_WITH_SYS_TIME, SYNC_INPUT): Define them.
[__MRC__] (HAVE_ALLOCA_H): Likewise.
(config_machfile, config_opsysfile, my_strftime): New macros.
(HAVE_PWD_H): Move from s-mac.h.
(HAVE_ALLOCA, C_ALLOCA): Move from m-mac.h.
(PTR): Move to s-mac.h.
* inc/m-mac.h: (HAVE_ALLOCA, C_ALLOCA): Move to config.h.
* inc/s-mac.h: Sync with src/s/template.h. Don't include fcntl.h,
time.h, or signal.h.
(index, rindex): New macros.
[__MRC__] (sigmask, __signal_max, NSIG): Adjust signal numbers for
compatibility with predefined ones.
(PTR): Move from s-mac.h.
(HAVE_PWD_H): Move to config.h.
(volatile): Remove macro.
[__MRC__] (strftime): Likewise.
(read_input_waiting, sys_gmtime, sys_localtime, sys_ctime)
(sys_time, sys_signal, atof): Remove declarations.
* inc/sys/time.h (ITIMER_REAL): New macro.
(struct itimerval): New struct.
(setitimer): New extern.
2005-05-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* inc/config.h [HAVE_CARBON]: Define USE_TOOLKIT_SCROLL_BARS.
* inc/config.h [HAVE_CARBON] (USE_TOOLKIT_SCROLL_BARS): Define.
2005-04-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
@ -10,7 +51,7 @@
* Emacs.app/Contents/Info.plist: Add NSServices key and data.
* inc/s-mac.h: Define HAVE_PWD_H.
* inc/s-mac.h (HAVE_PWD_H): Define.
2005-04-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

1240
mac/inc/config.h
View file

File diff suppressed because it is too large Load diff

26
mac/inc/m-mac.h
View file

@ -80,19 +80,6 @@ Boston, MA 02111-1307, USA. */
#define VIRT_ADDR_VARIES
/* Define C_ALLOCA if this machine does not support a true alloca
and the one written in C should be used instead.
Define HAVE_ALLOCA to say that the system provides a properly
working alloca function and it should be used.
Define neither one if an assembler-language alloca
in the file alloca.s should be used. */
#ifdef __MRC__
#define HAVE_ALLOCA
#else
#define C_ALLOCA
#endif
/* Define NO_REMAP if memory segmentation makes it not work well
to change the boundary between the text section and data section
when Emacs is dumped. If you define this, the preloaded Lisp
@ -129,18 +116,5 @@ Boston, MA 02111-1307, USA. */
#define IEEE_FLOATING_POINT 1
#endif
#if 0
/* The usual definition of XINT, which involves shifting, does not
sign-extend properly on this machine. */
#define XINT(i) (((sign_extend_temp=(i)) & 0x00800000) \
? (sign_extend_temp | 0xFF000000) \
: (sign_extend_temp & 0x00FFFFFF))
#ifdef emacs /* Don't do this when making xmakefile! */
extern int sign_extend_temp;
#endif
#endif
/* arch-tag: 9e759031-ab7b-4c76-99d7-3ae94a98de38
(do not change this comment) */

77
mac/inc/s-mac.h
View file

@ -53,8 +53,8 @@ Boston, MA 02111-1307, USA. */
Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
Emacs uses the presence or absence of the SIGIO macro to indicate
whether or not signal-driven I/O is possible. It uses
Emacs uses the presence or absence of the SIGIO and BROKEN_SIGIO macros
to indicate whether or not signal-driven I/O is possible. It uses
INTERRUPT_INPUT to decide whether to use it by default.
SIGIO can be used only on systems that implement it (4.2 and 4.3).
@ -96,8 +96,6 @@ Boston, MA 02111-1307, USA. */
/* #define HAVE_PTYS */
#define HAVE_PWD_H 1
/*
* Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
* The 4.2 opendir, etc., library functions.
@ -148,6 +146,9 @@ Boston, MA 02111-1307, USA. */
is not ':', #define this to be the appropriate character constant. */
/* #define SEPCHAR ':' */
/* Define this if the system can use mmap for buffer text allocation. */
/* #define USE_MMAP_FOR_BUFFERS 1 */
/* ============================================================ */
/* Here, add any special hacks needed
@ -164,6 +165,14 @@ Boston, MA 02111-1307, USA. */
/* #define static */
/* If the system's imake configuration file defines `NeedWidePrototypes'
as `NO', we must define NARROWPROTO manually. Such a define is
generated in the Makefile generated by `xmkmf'. If we don't
define NARROWPROTO, we will see the wrong function prototypes
for X functions taking float or double parameters. */
/* #define NARROWPROTO 1 */
/* ============================================================ */
/* After adding support for a new system, modify the large case
@ -176,7 +185,12 @@ Boston, MA 02111-1307, USA. */
of known problems in that configuration should be updated. */
#ifdef __MRC__
#define __signal_max SIGTERM /* largest one in signal.h */
/* MrC predefines signal numbers as powers of 2. */
#define sigmask(no) (((no) & (no) - 1) ? 1L << ((no) - 1) : (no))
#define __signal_max 8 /* There's enough room for the following
signals between 8 and 16, and the
maximum predefined one (32) is less
than 8th power of 2. */
#endif
#define SIGHUP (__signal_max+1)
@ -185,7 +199,12 @@ Boston, MA 02111-1307, USA. */
#define SIGKILL (__signal_max+4)
#define SIGALRM (__signal_max+5)
#define SIGPIPE (__signal_max+6)
#ifdef __MRC__
#define NSIG SIGTERM /* largest one in signal.h */
#else
#define NSIG (__signal_max+6)
#endif
#ifdef __MRC__
#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)
@ -230,19 +249,11 @@ Boston, MA 02111-1307, USA. */
#define READ_BUF_SIZE (8 << 10)
#include <utsname.h>
void read_input_waiting ();
/* #define GETTIMEOFDAY_ONE_ARGUMENT */
#define SYSV_SYSTEM_DIR
#define SYSTEM_MALLOC
/* Constants such as O_RDONLY are defined in fcntl.h. Best solution is
really to patch individual files to include it: callproc.c, doc.c,
fileio.c, getloadavg.c, lread.c, and termcap.c. */
#include <fcntl.h>
#define _setjmp setjmp
#define _longjmp longjmp
@ -284,44 +295,10 @@ void read_input_waiting ();
#define ctime sys_ctime
#define time sys_time
#ifndef bcmp
#define bcmp(s1, s2, n) memcmp ((s1), (s2), (n))
#endif
#ifndef bcopy
#define bcopy(s, d, n) memcpy ((d), (s), (n))
#endif
#ifndef bzero
#define bzero(s, n) memset ((s), 0, (n))
#endif
#define index strchr
#define rindex strrchr
extern char *index (const char *, int);
/* MPW strftime broken for "%p" format */
#ifdef __MRC__
#define strftime sys_strftime
#endif
#include <time.h>
/* Editfns.c includes types.h which indirectly includes time.h before config.h.
So gmtime (localtime) is defined and not sys_gmtime (sys_localtime). Define
here explicitly. */
extern struct tm *sys_gmtime (const time_t *);
extern struct tm *sys_localtime (const time_t *);
extern char *sys_ctime (const time_t *);
extern time_t sys_time (time_t *);
/* Emacs.c includes signal.h before config.h. Define this to make it happy. */
#ifdef __MRC__
#include <signal.h>
extern __sigfun sys_signal (int signal_num, __sigfun signal_func);
#elif __MWERKS__
#include <signal.h>
extern __signal_func_ptr sys_signal (int signal_num, __signal_func_ptr signal_func);
#endif
extern double atof (const char *);
#define volatile
#define PTR POINTER_TYPE * /* For strftime.c. */
#define SYMS_SYSTEM syms_of_mac()

15
mac/inc/sys/time.h
View file

@ -28,6 +28,21 @@ struct timeval {
long tv_usec; /* microseconds */
};
#define ITIMER_REAL 0
#if 0
#define ITIMER_VIRTUAL 1
#define ITIMER_PROF 2
#endif
struct itimerval {
#if 0
struct timeval it_interval; /* timer interval */
#endif
struct timeval it_value; /* current value */
};
extern int setitimer(int, const struct itimerval *, struct itimerval *);
#endif /* _SYS_TYPES_H */
/* arch-tag: f85ed04d-0e99-4f97-892b-fe029d0e92f9

188
mac/makefile.MPW
View file

@ -26,8 +26,6 @@
# Clean - remove all object and executable files to prepare for a fresh build.
# Doc - generate the "DOC" file in ~emacs/etc/.
# Make-DocFile - build the make-docfile tool, utility for generating "DOC".
# PrepSource - prepare the source files after unstuffing the distribution.
# PrepDist - prepare for distribution: generate diff files; move mac-win.el to {Patches}.
Src = ::src: # emacs's src directory
Includes = :inc: # mac includes directory (common for MPW and CW)
@ -156,7 +154,7 @@ NonCarbonLibs =
# The next two are the dependency rules for building Emacs.
Emacs ÄÄ {Makefile} {DocTarget}DOC {EmacsObjects} {MacObjects}
Emacs ÄÄ {Makefile} buildobj.lst {DocTarget}DOC {EmacsObjects} {MacObjects}
PPCLink ¶
{LinkOptions} ¶
{EmacsObjects} {MacObjects} ¶
@ -182,6 +180,9 @@ NonCarbon
"{Source}"EmacsMPW.maclf.r Ä "{Source}"EmacsMPW.r
translate ¶0x0a ¶n < "{Source}"EmacsMPW.r > "{Source}"EmacsMPW.maclf.r
buildobj.lst Ä
Echo "{EmacsObjects} {MacObjects}" | StreamEdit -e '1,$ Replace -c ° /[Â ]*:([Â: ]*)¨1.c.x/ ¨1".o"' > buildobj.lst
# Here comes a long boring list of rules saying which files depend on which
# other ones. I generated them by hand using the "-p" option of the MrC compiler.
# Know about MakeMake, but this is probably more accurate.
@ -984,6 +985,7 @@ Clean
Delete -i {Make-DocFile-Objects} {Make-DocFileDir}make-docfile
Delete -i "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r
Delete -i "{NonCarbonMakeOut}"
Delete -i buildobj.lst
DistClean Ä Clean
Delete -i "Emacs CW"Å
@ -994,97 +996,22 @@ DistClean
# Variables and rules for target "Doc" #
#--------------------------------------#
EmacsSource = ¶
"{Src}abbrev.c" ¶
"{Src}alloc.c" ¶
"{Src}atimer.c" ¶
"{Src}buffer.c" ¶
"{Src}bytecode.c" ¶
"{Src}callint.c" ¶
"{Src}callproc.c" ¶
"{Src}casefiddle.c" ¶
"{Src}casetab.c" ¶
"{Src}category.c" ¶
"{Src}ccl.c" ¶
"{Src}charset.c" ¶
"{Src}cm.c" ¶
"{Src}cmds.c" ¶
"{Src}coding.c" ¶
"{Src}composite.c" ¶
"{Src}data.c" ¶
"{Src}dired.c" ¶
"{Src}dispnew.c" ¶
"{Src}doc.c" ¶
"{Src}doprnt.c" ¶
"{Src}editfns.c" ¶
"{Src}emacs.c" ¶
"{Src}eval.c" ¶
"{Src}fileio.c" ¶
"{Src}filemode.c" ¶
"{Src}floatfns.c" ¶
"{Src}fns.c" ¶
"{Src}fontset.c" ¶
"{Src}frame.c" ¶
"{Src}fringe.c" ¶
"{Src}getloadavg.c" ¶
"{Src}image.c" ¶
"{Src}indent.c" ¶
"{Src}insdel.c" ¶
"{Src}intervals.c" ¶
"{Src}keyboard.c" ¶
"{Src}keymap.c" ¶
"{Src}lastfile.c" ¶
"{Src}lread.c" ¶
"{Src}macros.c" ¶
"{Src}marker.c" ¶
"{Src}minibuf.c" ¶
"{Src}mktime.c" ¶
"{Src}print.c" ¶
"{Src}process.c" ¶
"{Src}regex.c" ¶
"{Src}region-cache.c" ¶
"{Src}scroll.c" ¶
"{Src}search.c" ¶
"{Src}strftime.c" ¶
"{Src}syntax.c" ¶
"{Src}sysdep.c" ¶
"{Src}term.c" ¶
"{Src}termcap.c" ¶
"{Src}textprop.c" ¶
"{Src}tparam.c" ¶
"{Src}undo.c" ¶
"{Src}window.c" ¶
"{Src}xdisp.c" ¶
"{Src}xfaces.c" ¶
"{Src}xmenu.c"
SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o ¶
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o ¶
mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o ¶
w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o ¶
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o
MacSource = ¶
"{Src}mac.c" ¶
"{Src}macfns.c" ¶
"{Src}macterm.c"
LispSource = ¶
{Lisp}menu-bar.elc ¶
{Lisp}mouse.elc ¶
{Lisp}select.elc ¶
{Lisp}scroll-bar.elc ¶
{Lisp}vmsproc.elc ¶
{Lisp}vms-patch.elc ¶
{Lisp}ls-lisp.elc ¶
{Lisp}dos-fns.elc ¶
{Lisp}w32-fns.elc ¶
{Lisp}dos-w32.elc ¶
{Lisp}disp-table.elc ¶
{Lisp}dos-vars.elc ¶
{Lisp}international:ccl.elc ¶
{Lisp}international:codepage.elc ¶
shortlisp = ¶
{Lisp}abbrev.elc ¶
{Lisp}buff-menu.elc ¶
{Lisp}button.elc ¶
{Lisp}server.elc ¶
{Lisp}emacs-lisp:byte-run.elc ¶
{Lisp}cus-start.el ¶
{Lisp}cus-face.elc ¶
{Lisp}cus-start.elc ¶
{Lisp}custom.elc ¶
{Lisp}emacs-lisp:backquote.elc ¶
{Lisp}emacs-lisp:lisp-mode.elc ¶
{Lisp}emacs-lisp:lisp.elc ¶
{Lisp}facemenu.elc ¶
@ -1100,38 +1027,32 @@ LispSource =
{Lisp}loaddefs.el ¶
{Lisp}bindings.elc ¶
{Lisp}emacs-lisp:map-ynp.elc ¶
{Lisp}env.elc ¶
{Lisp}international:mule.elc ¶
{Lisp}international:mule-conf.el ¶
{Lisp}international:mule-cmds.elc ¶
{Lisp}international:characters.elc ¶
{Lisp}international:ucs-tables.elc ¶
{Lisp}international:utf-8.elc ¶
{Lisp}international:utf-16.elc ¶
{Lisp}international:latin-1.el ¶
{Lisp}international:latin-2.el ¶
{Lisp}international:latin-3.el ¶
{Lisp}international:latin-4.el ¶
{Lisp}international:latin-5.el ¶
{Lisp}international:latin-8.el ¶
{Lisp}international:latin-9.el ¶
{Lisp}case-table.elc ¶
{Lisp}language:chinese.elc ¶
{Lisp}language:cyrillic.elc ¶
{Lisp}language:indian.elc ¶
{Lisp}language:devanagari.el ¶
{Lisp}language:kannada.el ¶
{Lisp}language:malayalam.el ¶
{Lisp}language:tamil.el ¶
{Lisp}language:english.el ¶
{Lisp}language:ethiopic.elc ¶
{Lisp}language:european.elc ¶
{Lisp}language:tibetan.elc ¶
{Lisp}language:vietnamese.elc ¶
{Lisp}paths.el ¶
{Lisp}register.elc ¶
{Lisp}replace.elc ¶
{Lisp}simple.elc ¶
{Lisp}startup.elc ¶
{Lisp}subr.elc ¶
{Lisp}term:tty-colors.elc ¶
{Lisp}textmodes:fill.elc ¶
{Lisp}textmodes:page.elc ¶
{Lisp}textmodes:paragraphs.elc ¶
{Lisp}textmodes:text-mode.elc ¶
{Lisp}vc-hooks.elc ¶
{Lisp}ediff-hook.elc ¶
{Lisp}widget.elc ¶
{Lisp}window.elc ¶
{Lisp}version.el
LispSourceDontCompile = ¶
{Lisp}language:devanagari.el ¶
{Lisp}language:english.el ¶
{Lisp}language:czech.el ¶
{Lisp}language:slovak.el ¶
{Lisp}language:romanian.el ¶
@ -1141,15 +1062,47 @@ LispSourceDontCompile =
{Lisp}language:korean.el ¶
{Lisp}language:lao.el ¶
{Lisp}language:thai.el ¶
{Lisp}language:misc-lang.el
{Lisp}language:tibetan.elc ¶
{Lisp}language:vietnamese.elc ¶
{Lisp}language:misc-lang.el ¶
{Lisp}language:utf-8-lang.el ¶
{Lisp}language:georgian.el ¶
{Lisp}menu-bar.elc ¶
{Lisp}paths.el ¶
{Lisp}register.elc ¶
{Lisp}replace.elc ¶
{Lisp}simple.elc ¶
{Lisp}startup.elc ¶
{Lisp}subr.elc ¶
{Lisp}term:tty-colors.elc ¶
{Lisp}font-core.elc ¶
{Lisp}textmodes:fill.elc ¶
{Lisp}textmodes:page.elc ¶
{Lisp}textmodes:paragraphs.elc ¶
{Lisp}textmodes:text-mode.elc ¶
{Lisp}emacs-lisp:timer.elc ¶
{Lisp}vc-hooks.elc ¶
{Lisp}jka-cmpr-hook.elc ¶
{Lisp}ediff-hook.elc ¶
{Lisp}widget.elc ¶
{Lisp}window.elc ¶
{Lisp}version.el
SOME_MACHINE_LISP = {Lisp}mouse.elc ¶
{Lisp}select.elc {Lisp}scroll-bar.elc ¶
{Lisp}vmsproc.elc {Lisp}vms-patch.elc ¶
{Lisp}ls-lisp.elc {Lisp}dos-fns.elc ¶
{Lisp}w32-fns.elc {Lisp}dos-w32.elc ¶
{Lisp}disp-table.elc {Lisp}dos-vars.elc ¶
{Lisp}tooltip.elc ¶
{Lisp}international:ccl.elc ¶
{Lisp}international:codepage.elc
Doc Ä {DocTarget}DOC
{DocTarget}DOC Ä {Makefile} {EmacsSource} {MacSource} {LispSource} {LispSourceDontCompile} {Make-DocFileDir}Make-DocFile
{Make-DocFileDir}make-docfile {EmacsSource} > {DocTarget}DOC
{Make-DocFileDir}make-docfile {MacSource} >> {DocTarget}DOC
{Make-DocFileDir}make-docfile {LispSource} >> {DocTarget}DOC
{Make-DocFileDir}make-docfile {LispSourceDontCompile} >> {DocTarget}DOC
{DocTarget}DOC Ä {Makefile} {shortlisp} {SOME_MACHINE_LISP} {Make-DocFileDir}Make-DocFile buildobj.lst
{Make-DocFileDir}make-docfile -d {Src} {SOME_MACHINE_OBJECTS} `Catenate buildobj.lst` > {DocTarget}DOC
{Make-DocFileDir}make-docfile -a {DocTarget}DOC -d {Src} {SOME_MACHINE_LISP} {shortlisp}
#-----------------------------------------------#
@ -1160,7 +1113,8 @@ Make-DocFile-Includes = -i :inc:
Make-DocFile-Sym =
Make-DocFile-PPCCOptions = -typecheck relaxed -w off -noMapCR ¶
{Make-DocFile-Includes} {Make-DocFile-Sym}
-d MAC_OS -d MAC_OS8 ¶
{Make-DocFile-Includes} {Make-DocFile-Sym}
Make-DocFile-Objects = ¶
"{Lib-Src}make-docfile.c.x" ¶

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