[5459] &= to |=

[Gavin D. Smith]

Revision: 5459
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5459
Author:   gavin
Date:     2014-04-16 18:59:03 +0000 (Wed, 16 Apr 2014)
Log Message:
-----------
&= to |=

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/nodes.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-04-16 18:49:00 UTC (rev 5458)
+++ trunk/ChangeLog     2014-04-16 18:59:03 UTC (rev 5459)
@@ -1,5 +1,10 @@
 2014-04-16  Gavin Smith  <address@hidden>
 
+       * nodes.c (info_node_of_file_buffer_tags): Use |= where intended.
+       * nodes.c: Comments edited.
+
+2014-04-16  Gavin Smith  <address@hidden>
+
        * nodes.c (init_file_buffer_tag): New function.  Conditonally set
        N_HasTagsTable and N_TagsIndirect on tag table entries.
        (get_nodes_of_info_file, get_nodes_of_tag_table): Create tag table

Modified: trunk/info/nodes.c
===================================================================
--- trunk/info/nodes.c  2014-04-16 18:49:00 UTC (rev 5458)
+++ trunk/info/nodes.c  2014-04-16 18:59:03 UTC (rev 5459)
@@ -1147,9 +1147,9 @@
 /* Find the actual starting memory location of NODE.  Because of the
    way that tags are implemented, the physical nodestart may
    not actually be where the tag says it is.  If that is the case,
-   set N_UpdateTags in NODE->flags.  If the node is
-   found, return non-zero.  Set NODE->nodestart directly on the separator
-   that precedes this node.  If the node could not be found, return 0. */
+   set N_UpdateTags in NODE->flags.  If the node is found, return non-zero.
+   Set NODE->nodestart directly on the separator that precedes this node.
+   If the node could not be found, return 0. */
 static int
 adjust_nodestart (FILE_BUFFER *fb, NODE *node)
 {
@@ -1263,8 +1263,7 @@
             /* If TAG->nodelen hasn't been calculated yet, then we aren't
                in a position to trust the entry pointer.  Adjust things so
                that ENTRY->nodestart gets the exact address of the start of
-               the node separator which starts this node, and NODE->contents
-               gets the address of the line defining this node.  If we cannot
+               the node separator which starts this node.  If we cannot
                do that, the node isn't really here. */
             if (tag->nodelen == -1)
               {
@@ -1290,7 +1289,7 @@
               {  
                 tag->contents = new_contents;
                 tag->nodelen = new_nodelen;
-                tag->flags &= N_WasRewritten;
+                tag->flags |= N_WasRewritten;
               }
  
             node_set_body_start (tag);