From 977c201bc0d795a96a3cc8eb80f9327dc7bb5f4b Mon Sep 17 00:00:00 2001
From: Stephen Swaney <sswaney@centurytel.net>
Date: Thu, 23 Feb 2006 16:27:41 +0000
Subject: [PATCH] patch #3830 Fix for commenting a block of text with highlight
 enabled

Highlighting would not update when you un/commented a block of code.
Contributed by Ricki Myers (themyers).
---
 source/blender/src/drawtext.c    | 9 ++++++++-
 source/blender/src/header_text.c | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 7b85ac83232..684acf15e10 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1539,7 +1539,14 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			break; /* BREAK C */
 		case DKEY:
-			if (G.qual == LR_CTRLKEY) {
+			if (G.qual == (LR_CTRLKEY|LR_SHIFTKEY)) {
+				//uncommenting
+				txt_order_cursors(text);
+				uncomment(text);
+				do_draw = 1;
+				if (st->showsyntax) get_format_string();
+				break;
+			} else if (G.qual == LR_CTRLKEY) {
 				txt_delete_char(text);
 				if (st->showsyntax) get_format_string();
 				do_draw= 1;
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index 9a6236bb3f7..e0f1153f9d4 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -365,6 +365,7 @@ static void do_text_formatmenu(void *arg, int event)
 		if ( txt_has_sel(text)) {
 			txt_order_cursors(text);
 			comment(text);
+			if (st->showsyntax) get_format_string();
 			break;
 		}
 		break;
@@ -372,6 +373,7 @@ static void do_text_formatmenu(void *arg, int event)
 		if ( txt_has_sel(text)) {
 			txt_order_cursors(text);
 			uncomment(text);
+			if (st->showsyntax) get_format_string();
 			break;
 		}
 		break;
@@ -437,7 +439,7 @@ static uiBlock *text_formatmenu(void *arg_unused)
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Unindent|Shift Tab", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
 	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Comment", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Uncomment", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Uncomment|Ctrl Shift D", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, "");
 	
 	if(curarea->headertype==HEADERTOP) {
 		uiBlockSetDirection(block, UI_DOWN);