1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 616-696)

   - Add lisp/mh-e/.arch-inventory
   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
   - lisp/gnus/ChangeLog: Remove duplicate entry

 * gnus--rel--5.10  (patch 147-181)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: lisp/mml.el (mml-preview): Doc fix.
   - Update from CVS: texi/message.texi: Fix default values.
   - Update from CVS: texi/gnus.texi (RSS): Addition.
This commit is contained in:
Miles Bader 2006-01-16 08:37:27 +00:00
commit 41882805d6
566 changed files with 62573 additions and 32764 deletions

View file

@ -1,3 +1,24 @@
2005-12-30 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (MOUSE_SUPPORT): Add tooltip.elc.
(lisp1): Add rfn-eshadow.elc, international/utf-16.elc, image.elc,
international/fontset.elc, dnd.elc, mwheel.elc, and tool-bar.elc.
Rearrange the list to be similar to $(shortlisp) in
src/Makefile.in.
(lisp2): Add language/kannada.el, emacs-lisp/syntax.elc,
emacs-lisp/timer.elc, jka-cmpr-hook.elc, font-lock.elc,
jit-lock.elc. Rearrange the list to be similar to $(shortlisp) in
src/Makefile.in.
2005-12-22 Richard M. Stallman <rms@gnu.org>
* Makefile.in (update-game-score.o): Delete spurious final `\'.
2005-11-18 Hideki IWAMOTO <h-iwamoto@kit.hi-ho.ne.jp> (tiny change)
* etags.c (main): Cxref mode writes to stdout: do not close tagf,
which was never opened.
2005-10-20 Olli Savia <ops@iki.fi> (tiny change)
* etags.c: Undef STDIN if defined. (LynxOS defines it in system

View file

@ -465,7 +465,7 @@ update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS)
update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H)
$(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \
-DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
-DHAVE_SHARED_GAME_DIR="\"$(gamedir)\""
/* These are NOT included in INSTALLABLES or UTILITIES.
See ../src/Makefile.in. */

View file

@ -41,7 +41,7 @@
* configuration file containing regexp definitions for etags.
*/
char pot_etags_version[] = "@(#) pot revision number is 17.14";
char pot_etags_version[] = "@(#) pot revision number is 17.15";
#define TRUE 1
#define FALSE 0
@ -479,7 +479,7 @@ static bool packages_only; /* --packages-only: in Ada, only tag packages*/
/* STDIN is defined in LynxOS system headers */
#ifdef STDIN
#undef STDIN
# undef STDIN
#endif
#define STDIN 0x1001 /* returned by getopt_long on --parse-stdin */
@ -994,9 +994,9 @@ Relative ones are stored relative to the output file's directory.\n");
if (CTAGS)
{
puts ("-v, --vgrind\n\
Generates an index of items intended for human consumption,\n\
similar to the output of vgrind. The index is sorted, and\n\
gives the page number of each item.");
Print on the standard output an index of items intended for\n\
human consumption, similar to the output of vgrind. The index\n\
is sorted, and gives the page number of each item.");
puts ("-w, --no-warn\n\
Suppress warning messages about entries defined in multiple\n\
files.");
@ -1428,7 +1428,8 @@ main (argc, argv)
if (!CTAGS || cxref_style)
{
put_entries (nodehead); /* write the remaining tags (ETAGS) */
/* Write the remaining tags to tagf (ETAGS) or stdout (CXREF). */
put_entries (nodehead);
free_tree (nodehead);
nodehead = NULL;
if (!CTAGS)
@ -1442,10 +1443,11 @@ main (argc, argv)
while (nincluded_files-- > 0)
fprintf (tagf, "\f\n%s,include\n", *included_files++);
if (fclose (tagf) == EOF)
pfatal (tagfile);
}
if (fclose (tagf) == EOF)
pfatal (tagfile);
exit (EXIT_SUCCESS);
}

View file

@ -154,7 +154,7 @@ obj= sunfns.o dosfns.o msdos.o \
#
lispsource = ../lisp/
MOUSE_SUPPORT = $(lispsource)select.elc $(lispsource)scroll-bar.elc $(lispsource)mouse.elc
MOUSE_SUPPORT = $(lispsource)select.elc $(lispsource)scroll-bar.elc $(lispsource)mouse.elc $(lispsource)tooltip.elc
WINNT_SUPPORT = $(lispsource)ls-lisp.elc $(lispsource)disp-table.elc $(lispsource)w32-fns.elc $(lispsource)dos-w32.elc $(lispsource)w32-vars.elc
# lisp files that are loaded up on other platforms
@ -166,31 +166,37 @@ lisp1= \
$(lispsource)buff-menu.elc \
$(lispsource)button.elc \
$(lispsource)emacs-lisp/byte-run.elc \
$(lispsource)cus-face.elc \
$(lispsource)cus-start.elc \
$(lispsource)custom.elc \
$(lispsource)emacs-lisp/backquote.elc \
$(lispsource)emacs-lisp/lisp-mode.elc \
$(lispsource)emacs-lisp/lisp.elc \
$(lispsource)env.elc \
$(lispsource)faces.elc \
$(lispsource)files.elc \
$(lispsource)format.elc \
$(lispsource)facemenu.elc \
$(MOUSE_SUPPORT) \
$(lispsource)faces.elc \
$(lispsource)files.elc \
$(lispsource)emacs-lisp/float-sup.elc \
$(lispsource)format.elc \
$(lispsource)frame.elc \
$(lispsource)help.elc \
$(lispsource)indent.elc \
$(lispsource)isearch.elc \
$(lispsource)rfn-eshadow.elc \
$(lispsource)loadup.el \
$(lispsource)loaddefs.el \
$(lispsource)bindings.elc \
$(lispsource)emacs-lisp/map-ynp.elc \
$(lispsource)menu-bar.elc \
$(lispsource)env.elc \
$(lispsource)international/mule.elc \
$(lispsource)international/mule-conf.el \
$(lispsource)international/mule-cmds.elc \
$(lispsource)international/characters.elc \
$(lispsource)image.elc \
$(lispsource)international/fontset.elc \
$(lispsource)dnd.elc \
$(lispsource)mwheel.elc \
$(lispsource)tool-bar.elc \
$(lispsource)case-table.elc
lisp2 = \
@ -198,6 +204,7 @@ lisp2 = \
$(lispsource)language/cyrillic.elc \
$(lispsource)language/indian.elc \
$(lispsource)language/devanagari.el \
$(lispsource)language/kannada.el \
$(lispsource)language/malayalam.el \
$(lispsource)language/tamil.el \
$(lispsource)language/english.el \
@ -217,6 +224,7 @@ lisp2 = \
$(lispsource)language/misc-lang.el \
$(lispsource)language/utf-8-lang.el \
$(lispsource)language/georgian.el \
$(lispsource)menu-bar.elc \
$(lispsource)paths.el \
$(lispsource)register.elc \
$(lispsource)replace.elc \
@ -225,11 +233,16 @@ lisp2 = \
$(lispsource)subr.elc \
$(lispsource)term/tty-colors.elc \
$(lispsource)font-core.elc \
$(lispsource)emacs-lisp/syntax.elc \
$(lispsource)font-lock.elc \
$(lispsource)jit-lock.elc \
$(lispsource)textmodes/fill.elc \
$(lispsource)textmodes/page.elc \
$(lispsource)textmodes/paragraphs.elc \
$(lispsource)textmodes/text-mode.elc \
$(lispsource)emacs-lisp/timer.elc \
$(lispsource)vc-hooks.elc \
$(lispsource)jka-cmpr-hook.elc \
$(lispsource)ediff-hook.elc \
$(VMS_SUPPORT) \
$(MSDOS_SUPPORT) \