From 2be1639518a932a1d42989df6b1aae2ab9fc7d0d Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Sun, 2 Feb 1997 07:20:38 +0000
Subject: Dave Bodenstab's fixes.

svn path=/trunk/; revision=855
---
 rcfile_y.y | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'rcfile_y.y')

diff --git a/rcfile_y.y b/rcfile_y.y
index e9a381b0..693bcb9e 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -355,6 +355,7 @@ static void prc_register(void)
     FLAG_FORCE(flush);
     FLAG_FORCE(fetchall);
     FLAG_FORCE(no_rewrite);
+    FLAG_FORCE(stripcr);
     FLAG_FORCE(limit);
     FLAG_FORCE(fetchlimit);
     FLAG_FORCE(batchlimit);
@@ -396,6 +397,7 @@ void optmerge(struct query *h2, struct query *h1)
     FLAG_MERGE(flush);
     FLAG_MERGE(fetchall);
     FLAG_MERGE(no_rewrite);
+    FLAG_MERGE(stripcr);
     FLAG_MERGE(limit);
     FLAG_MERGE(fetchlimit);
     FLAG_MERGE(batchlimit);
-- 
cgit v1.2.3