# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1015427521 0
# Node ID c37076b8a3cd9820e79551d828e656a41e04823a
# Parent  91939e9a62ec17f0c3630573735481b8bf18bad0
*** empty log message ***

diff -r 91939e9a62ec -r c37076b8a3cd lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Mar 06 15:11:20 2002 +0000
+++ b/lisp/ChangeLog	Wed Mar 06 15:12:01 2002 +0000
@@ -1,3 +1,15 @@
+2002-03-06  Andreas Schwab  <schwab@suse.de>
+
+	* progmodes/hideif.el: Augment expression parser to handle
+	conditional expressions.
+	(hif-token-regexp): Also match `?' and `:'.
+	(hif-tokenize): Handle `?' and ':' as tokens.
+	(hif-expr): Parse conditional expressions.
+	(hif-or-expr): Parse `||' expressions.
+	(hif-and-expr): Renamed from hif-term.
+	(hif-conditional): New function to evaluate a conditional
+	expression.
+
 2002-03-06  Gerd Moellmann  <gerd@gnu.org>
 
 	* vc.el (vc-branch-part): Add autoload cookie.  This function can