mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-18 22:20:56 -08:00
Code Issues Projects Releases Wiki Activity

Merged in changes from CVS trunk.

Browse source 
Patches applied:

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679
   Merge from gnus--rel--5.10

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689
   Merge from gnus--rel--5.10

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

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

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-267
This commit is contained in:
Karoly Lorentey 2004-11-13 18:34:40 +00:00
commit e417405015
106 changed files with 3851 additions and 1901 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib-src/ChangeLog
View file

@ -1,3 +1,18 @@
2004-11-09 Kim F. Storm <storm@cua.dk>
* make-docfile.c (scan_c_file): Set defvarperbufferflag to
silence compiler.
* hexl.c (main): Init local var c to silence compiler.
* etags.c (main, consider_token, C_entries): Add misc switch
default targets to silence compiler.
2004-11-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* makefile.w32-in (obj): Add all files (X and Mac) to doc so the
resulting DOC file can be used on Unix/Mac also.
2004-09-13 Francesco Potort,Al(B <pot@gnu.org>
* etags.c (main): When relative file names are given as argument,

38
lib-src/etags.c
View file

@ -1400,6 +1400,8 @@ main (argc, argv)
this_file = argbuffer[i].what;
process_file (stdin, this_file, lang);
break;
case at_end:
break;
}
}
@ -2900,6 +2902,8 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var)
case tkeyseen:
switch (toktype)
{
default:
break;
case st_none:
case st_C_class:
case st_C_struct:
@ -2917,12 +2921,16 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var)
case tend:
switch (toktype)
{
default:
break;
case st_C_class:
case st_C_struct:
case st_C_enum:
return FALSE;
}
return TRUE;
default:
break;
}
/*
@ -2960,6 +2968,8 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var)
fvdef = fvnone;
}
return FALSE;
default:
break;
}
if (structdef == skeyseen)
@ -2983,6 +2993,8 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var)
case st_C_objimpl:
objdef = oimplementation;
return FALSE;
default:
break;
}
break;
case oimplementation:
@ -3039,6 +3051,8 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var)
objdef = onone;
}
return FALSE;
default:
break;
}
/* A function, variable or enum constant? */
@ -3091,6 +3105,8 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var)
return FALSE;
}
break;
default:
break;
}
/* FALLTHRU */
case fvnameseen:
@ -3107,8 +3123,12 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var)
fvdef = fvnameseen; /* function or variable */
*is_func_or_var = TRUE;
return TRUE;
default:
break;
}
break;
default:
break;
}
return FALSE;
@ -3584,6 +3604,8 @@ C_entries (c_ext, inf)
fvdef = fignore;
}
break;
default:
break;
}
if (structdef == stagseen && !cjava)
{
@ -3594,6 +3616,8 @@ C_entries (c_ext, inf)
case dsharpseen:
savetoken = token;
break;
default:
break;
}
if (!yacc_rules || lp == newlb.buffer + 1)
{
@ -3632,6 +3656,8 @@ C_entries (c_ext, inf)
linebuffer_setlen (&token_name, token_name.len + 1);
strcat (token_name.buffer, ":");
break;
default:
break;
}
if (structdef == stagseen)
{
@ -3709,6 +3735,8 @@ C_entries (c_ext, inf)
make_C_tag (TRUE); /* an Objective C method */
objdef = oinbody;
break;
default:
break;
}
switch (fvdef)
{
@ -3779,6 +3807,8 @@ C_entries (c_ext, inf)
fvdef = fvnone;
}
break;
default:
break;
}
break;
case '(':
@ -3812,6 +3842,8 @@ C_entries (c_ext, inf)
case flistseen:
fvdef = finlist;
break;
default:
break;
}
parlev++;
break;
@ -3837,6 +3869,8 @@ C_entries (c_ext, inf)
case finlist:
fvdef = flistseen;
break;
default:
break;
}
if (!instruct
&& (typdef == tend
@ -3886,6 +3920,8 @@ C_entries (c_ext, inf)
bracelev = -1;
}
break;
default:
break;
}
switch (structdef)
{
@ -3899,6 +3935,8 @@ C_entries (c_ext, inf)
structdef = snone;
make_C_tag (FALSE); /* a struct or enum */
break;
default:
break;
}
bracelev++;
break;

4
lib-src/hexl.c
View file

@ -173,7 +173,7 @@ main (argc, argv)
#endif
for (;;)
{
register int i, c, d;
register int i, c = 0, d;
#define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10)
@ -225,7 +225,7 @@ main (argc, argv)
string[17] = '\0';
for (;;)
{
register int i, c;
register int i, c = 0;
for (i=0; i < 16; ++i)
{

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

@ -617,6 +617,7 @@ scan_c_file (filename, mode)
c = getc (infile);
defunflag = c == 'U';
defvarflag = 0;
defvarperbufferflag = 0;
}
else continue;

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

@ -124,9 +124,30 @@ $(BLD)/ctags.$(O): ctags.c
# $(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O)
#
# From ..\src\makefile.nt.
# From ..\src\Makefile.in
# It doesn't matter if the real name is *.obj for the files in this list,
# make-docfile blindly replaces .o with .c anyway. Keep .o in this list
# as it is required by code in doc.c.
#
obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c casetab.c category.c ccl.c charset.c cm.c cmds.c coding.c data.c dired.c dispnew.c doc.c doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c floatfns.c fns.c fontset.c frame.c fringe.c gmalloc.c image.c indent.c insdel.c intervals.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c print.c process.c ralloc.c regex.c region-cache.c scroll.c search.c sound.c strftime.c syntax.c sysdep.c term.c termcap.c textprop.c tparam.c undo.c unexw32.c vm-limit.c w32.c w32console.c w32fns.c w32heap.c w32inevt.c w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c window.c xdisp.c xfaces.c xfaces.c
obj= sunfns.o dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o fringe.o image.o \
mac.o macterm.o macfns.o macmenu.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 \
dispnew.o frame.o scroll.o xdisp.o window.o \
charset.o coding.o category.o ccl.o \
cm.o term.o xfaces.o \
emacs.o keyboard.o macros.o keymap.o sysdep.o \
buffer.o filelock.o insdel.o marker.o \
minibuf.o fileio.o dired.o filemode.o \
cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \
alloc.o data.o doc.o editfns.o callint.o \
eval.o floatfns.o fns.o print.o lread.o \
abbrev.o syntax.o bytecode.o \
process.o callproc.o \
region-cache.o sound.o atimer.o \
doprnt.o strftime.o intervals.o textprop.o composite.o md5.o
#
# These are the lisp files that are loaded up in loadup.el
#