Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 624-636)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 200-201)

   - Merge from emacs--devo--0
   - Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-171

2 files changed, 57 insertions, 27 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 0a1cdf1bb85..77673fb41ad 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,6 +1,19 @@
+2007-02-05  Francesco Potort,Al(B  <pot@gnu.org>
+
+        * etags.c (default_C_help, Cplusplus_help, PHP_help, print_help)
+        (main): Now --members is the default for etags, not for ctags yet.
+
+2007-02-04  Per Cederqvist  <ceder@ingate.com>  (tiny change)
+
+        * etags.c (gperf, in_word_set): Change attribute for Java to
+        (C_JAVA & ~C_PLPL).  The previous change introduced 2004-09-13 was
+        broken, as (C_JAVA & !C_PLPL) always evaluates to 0.  This caused
+        import, package, extends, implements and interface to be treated
+        specially for all kinds of C-style files, not just Java files.
+
 2007-01-02  Francesco Potort,Al(B  <pot@gnu.org>
 
-        * etags.c: (longopts): New undocumented option --no-duplicates.
+        * etags.c (longopts): New undocumented option --no-duplicates.
         (no_duplicates): Static variables for the above option.
         (print_help): Do not print help for --no-warn, now undocumented.
         (add_node): Allow duplicate tags in ctags mode unless --no-duplicates.
@@ -20,7 +33,7 @@
 
         * makefile.w32-in (make-docfile, ctags, etags, ebrowse, hexl)
         (movemail, fakemail, sorted-doc, digest-doc, emacsclient)
-        (test-distrib, $(DOC), all): depend on stamp_BLD instead of $(BLD).
+        (test-distrib, $(DOC), all): Depend on stamp_BLD instead of $(BLD).
         ($(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O))
         ($(BLD)/sorted-doc.$(O) $(BLD)/digest-doc.$(O))
         ($(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS))
@@ -6199,7 +6212,22 @@
     Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
         1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
         2006, 2007 Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  GNU Emacs is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2, or (at your option)
+  any later version.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNU Emacs; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
 
 ;;; arch-tag: 2d979296-954c-448e-95c1-b46d134513dc
diff --git a/lib-src/etags.c b/lib-src/etags.c
index a3ce46a888a..69b92084fd6 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -453,8 +453,8 @@ static bool constantypedefs;	/* -d: create tags for C #define, enum */
                                 /* constants and variables. */
                                 /* -D: opposite of -d.  Default under ctags. */
 static bool globals;            /* create tags for global variables */
-static bool declarations;       /* --declarations: tag them and extern in C&Co*/
 static bool members;            /* create tags for C member variables */
+static bool declarations;       /* --declarations: tag them and extern in C&Co*/
 static bool no_line_directive;  /* ignore #line directives (undocumented) */
 static bool no_duplicates;      /* no duplicate tags for ctags (undocumented) */
 static bool update;             /* -u: update tags */
@@ -577,10 +577,11 @@ static char default_C_help [] =
 definitions of `struct', `union' and `enum'.  `#define' macro\n\
 definitions and `enum' constants are tags unless you specify\n\
 `--no-defines'.  Global variables are tags unless you specify\n\
-`--no-globals'.  Use of `--no-globals' and `--no-defines'\n\
-can make the tags table file much smaller.\n\
+`--no-globals' and so are struct members unless you specify\n\
+`--no-members'.  Use of `--no-globals', `--no-defines' and\n\
+`--no-members' can make the tags table file much smaller.\n\
 You can tag function declarations and external variables by\n\
-using `--declarations', and struct members by using `--members'.";
+using `--declarations'.";
 
 static char *Cplusplus_suffixes [] =
   { "C", "c++", "cc", "cpp", "cxx", "H", "h++", "hh", "hpp", "hxx",
@@ -590,8 +591,8 @@ static char *Cplusplus_suffixes [] =
 static char Cplusplus_help [] =
 "In C++ code, all the tag constructs of C code are tagged.  (Use\n\
 --help --lang=c --lang=c++ for full help.)\n\
-In addition to C tags, member functions are also recognized, and\n\
-optionally member variables if you use the `--members' option.\n\
+In addition to C tags, member functions are also recognized.  Member\n\
+variables are recognized unless you use the `--no-members' option.\n\
 Tags for variables and functions in classes are named `CLASS::VARIABLE'\n\
 and `CLASS::FUNCTION'.  `operator' definitions have tag names like\n\
 `operator+'.";
@@ -686,8 +687,8 @@ defined in the default package is `main::SUB'.";
 static char *PHP_suffixes [] =
   { "php", "php3", "php4", NULL };
 static char PHP_help [] =
-"In PHP code, tags are functions, classes and defines.  When using\n\
-the `--members' option, vars are tags too.";
+"In PHP code, tags are functions, classes and defines.  Unless you use\n\
+the `--no-members' option, vars are tags too.";
 
 static char *plain_C_suffixes [] =
   { "pc",                       /* Pro*C file */
@@ -929,8 +930,9 @@ Relative ones are stored relative to the output file's directory.\n");
     puts ("--no-globals\n\
         Do not create tag entries for global variables in some\n\
         languages.  This makes the tags file smaller.");
-  puts ("--members\n\
-        Create tag entries for members of structures in some languages.");
+  puts ("--no-members\n\
+        Do not create tag entries for members of structures\n\
+        in some languages.");
 
   puts ("-r REGEXP, --regex=REGEXP or --regex=@regexfile\n\
         Make a tag for each line matching a regular expression pattern\n\
@@ -1168,8 +1170,8 @@ main (argc, argv)
 
   /*
    * If etags, always find typedefs and structure tags.  Why not?
-   * Also default to find macro constants, enum constants and
-   * global variables.
+   * Also default to find macro constants, enum constants, struct
+   * members and global variables.
    */
   if (!CTAGS)
     {
@@ -2418,12 +2420,12 @@ __attribute__,	0,			st_C_attribute
 @protocol,      0,                      st_C_objprot
 @implementation,0,                      st_C_objimpl
 @end,           0,                      st_C_objend
-import,         (C_JAVA & !C_PLPL),     st_C_ignore
-package,        (C_JAVA & !C_PLPL),     st_C_ignore
+import,         (C_JAVA & ~C_PLPL),     st_C_ignore
+package,        (C_JAVA & ~C_PLPL),     st_C_ignore
 friend,         C_PLPL,                 st_C_ignore
-extends,        (C_JAVA & !C_PLPL),     st_C_javastruct
-implements,     (C_JAVA & !C_PLPL),     st_C_javastruct
-interface,      (C_JAVA & !C_PLPL),     st_C_struct
+extends,        (C_JAVA & ~C_PLPL),     st_C_javastruct
+implements,     (C_JAVA & ~C_PLPL),     st_C_javastruct
+interface,      (C_JAVA & ~C_PLPL),     st_C_struct
 class,          0,                      st_C_class
 namespace,      C_PLPL,                 st_C_struct
 domain,         C_STAR,                 st_C_struct
@@ -2534,19 +2536,19 @@ in_word_set (str, len)
       {"@end",          0,                      st_C_objend},
       {"union",         0,                      st_C_struct},
       {"define",                0,                      st_C_define},
-      {"import",                (C_JAVA & !C_PLPL),     st_C_ignore},
+      {"import",                (C_JAVA & ~C_PLPL),     st_C_ignore},
       {"template",      0,                      st_C_template},
       {"operator",      C_PLPL,                 st_C_operator},
       {"@interface",    0,                      st_C_objprot},
-      {"implements",    (C_JAVA & !C_PLPL),     st_C_javastruct},
+      {"implements",    (C_JAVA & ~C_PLPL),     st_C_javastruct},
       {"friend",                C_PLPL,                 st_C_ignore},
       {"typedef",       0,                      st_C_typedef},
       {"return",                0,                      st_C_ignore},
       {"@implementation",0,                     st_C_objimpl},
       {"@protocol",     0,                      st_C_objprot},
-      {"interface",     (C_JAVA & !C_PLPL),     st_C_struct},
+      {"interface",     (C_JAVA & ~C_PLPL),     st_C_struct},
       {"extern",                0,                      st_C_extern},
-      {"extends",       (C_JAVA & !C_PLPL),     st_C_javastruct},
+      {"extends",       (C_JAVA & ~C_PLPL),     st_C_javastruct},
       {"struct",                0,                      st_C_struct},
       {"domain",                C_STAR,                 st_C_struct},
       {"switch",                0,                      st_C_ignore},
@@ -2556,7 +2558,7 @@ in_word_set (str, len)
       {"class",         0,                      st_C_class},
       {"while",         0,                      st_C_ignore},
       {"undef",         0,                      st_C_define},
-      {"package",       (C_JAVA & !C_PLPL),     st_C_ignore},
+      {"package",       (C_JAVA & ~C_PLPL),     st_C_ignore},
       {"__attribute__", 0,                      st_C_attribute},
       {"SYSCALL",       0,                      st_C_gnumacro},
       {"ENTRY",         0,                      st_C_gnumacro},
@@ -6894,7 +6896,7 @@ xrealloc (ptr, size)
  * tab-width: 8
  * fill-column: 79
  * c-font-lock-extra-types: ("FILE" "bool" "language" "linebuffer" "fdesc" "node" "regexp")
- * c-file-style: gnu
+ * c-file-style: "gnu"
  * End:
  */