2 files changed, 4 insertions, 38 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 8d6e7f2b734..994102f5a87 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-17  Kim F. Storm  <storm@cua.dk>
+
+        * etags.c: Undo last change.
+
 2004-11-09  Kim F. Storm  <storm@cua.dk>
 
         * make-docfile.c (scan_c_file): Set defvarperbufferflag to
diff --git a/lib-src/etags.c b/lib-src/etags.c
index e435c4d3926..a6004a048a9 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1400,8 +1400,6 @@ main (argc, argv)
           this_file = argbuffer[i].what;
           process_file (stdin, this_file, lang);
           break;
-        case at_end:
-          break;
         }
     }
 
@@ -2902,8 +2900,6 @@ 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:
@@ -2921,16 +2917,12 @@ 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;
      }
 
    /*
@@ -2968,8 +2960,6 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var)
              fvdef = fvnone;
          }
        return FALSE;
-     default:
-       break;
      }
 
    if (structdef == skeyseen)
@@ -2993,8 +2983,6 @@ 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:
@@ -3051,8 +3039,6 @@ 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? */
@@ -3105,8 +3091,6 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var)
                    return FALSE;
                  }
                break;
-             default:
-               break;
              }
           /* FALLTHRU */
           case fvnameseen:
@@ -3123,12 +3107,8 @@ 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;
@@ -3604,8 +3584,6 @@ C_entries (c_ext, inf)
                           fvdef = fignore;
                         }
                       break;
-                    default:
-                      break;
                     }
                   if (structdef == stagseen && !cjava)
                     {
@@ -3616,8 +3594,6 @@ C_entries (c_ext, inf)
                 case dsharpseen:
                   savetoken = token;
                   break;
-                default:
-                  break;
                 }
               if (!yacc_rules || lp == newlb.buffer + 1)
                 {
@@ -3656,8 +3632,6 @@ C_entries (c_ext, inf)
               linebuffer_setlen (&token_name, token_name.len + 1);
               strcat (token_name.buffer, ":");
               break;
-            default:
-              break;
             }
           if (structdef == stagseen)
             {
@@ -3735,8 +3709,6 @@ C_entries (c_ext, inf)
               make_C_tag (TRUE); /* an Objective C method */
               objdef = oinbody;
               break;
-            default:
-              break;
             }
           switch (fvdef)
             {
@@ -3807,8 +3779,6 @@ C_entries (c_ext, inf)
                   fvdef = fvnone;
                 }
               break;
-            default:
-              break;
             }
           break;
         case '(':
@@ -3842,8 +3812,6 @@ C_entries (c_ext, inf)
             case flistseen:
               fvdef = finlist;
               break;
-            default:
-              break;
             }
           parlev++;
           break;
@@ -3869,8 +3837,6 @@ C_entries (c_ext, inf)
                 case finlist:
                   fvdef = flistseen;
                   break;
-                default:
-                  break;
                 }
               if (!instruct
                   && (typdef == tend
@@ -3920,8 +3886,6 @@ C_entries (c_ext, inf)
                     bracelev = -1;
                 }
               break;
-            default:
-              break;
             }
           switch (structdef)
             {
@@ -3935,8 +3899,6 @@ C_entries (c_ext, inf)
               structdef = snone;
               make_C_tag (FALSE);  /* a struct or enum */
               break;
-            default:
-              break;
             }
           bracelev++;
           break;