From eadb04b5326a1fde76eca69b06def192d73413b1 Mon Sep 17 00:00:00 2001
From: "Andrew V. Samoilov" <sav@bcs.zp.ua>
Date: Fri, 18 Mar 2005 10:26:35 +0000
Subject: [PATCH]         * syntax/assembler.syntax: Add syntax file for the
 x86 assembler.         * syntax/povray.syntax: Add syntax file for the
 POVRay.         * syntax/Syntax: Add syntax file for x86 assembler and
 POVRay.         * syntax/Makefile.am: Likewise.         * mc.qpg.in:
 Likewise.         * NEWS: Likewise.

---
 ChangeLog          |  9 +++++++++
 NEWS               | 16 ++++++++++++++++
 mc.qpg.in          |  2 ++
 syntax/Makefile.am |  2 ++
 syntax/Syntax      |  6 ++++++
 5 files changed, 35 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 87ca545a8..d97cda216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-18  Mike Gorchak  <mike@malva.ua>
+
+        * syntax/assembler.syntax: Add syntax file for the x86 assembler.
+        * syntax/povray.syntax: Add syntax file for the POVRay.
+        * syntax/Syntax: Add syntax file for x86 assembler and POVRay.
+        * syntax/Makefile.am: Likewise.
+        * mc.qpg.in: Likewise.
+        * NEWS: Likewise.
+
 2005-03-14  Leonard den Ottolander  <leonard * den ottolander nl>
 
 	* syntax/diff.syntax: Changed default color from gray, which was
diff --git a/NEWS b/NEWS
index a81565d29..db77e2900 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,22 @@ Current
 	- zipfs can handle zip files that contain pathnames starting
 	  with "./".
 
+
+Version 4.6.1-pre4.
+
+- Editor.
+	- Add syntax file for the x86 assembler.
+	- Add syntax file for the Vision(tm) Ray Tracer.
+
+
+Version 4.6.1-pre3.
+
+- Core functionality.
+	- Improve support for tcsh.
+- Translations.
+	- Updated translations: Spain.
+
+
 Version 4.6.1-pre2.
 
 Release candidate for 4.6.1.
diff --git a/mc.qpg.in b/mc.qpg.in
index d2b16b93b..bfb5f1c5f 100644
--- a/mc.qpg.in
+++ b/mc.qpg.in
@@ -87,6 +87,7 @@
          <QPG:Add file="./syntax/Syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
          <QPG:Add file="./syntax/ada95.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
          <QPG:Add file="./syntax/aspx.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
+         <QPG:Add file="./syntax/assembler.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
          <QPG:Add file="./syntax/c.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
          <QPG:Add file="./syntax/changelog.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
          <QPG:Add file="./syntax/cs.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
@@ -110,6 +111,7 @@
          <QPG:Add file="./syntax/perl.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
          <QPG:Add file="./syntax/php.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
          <QPG:Add file="./syntax/po.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
+         <QPG:Add file="./syntax/povray.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
          <QPG:Add file="./syntax/python.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
          <QPG:Add file="./syntax/ruby.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
          <QPG:Add file="./syntax/sh.syntax" permissions="0644" install="/opt/share/mc/syntax/"/>
diff --git a/syntax/Makefile.am b/syntax/Makefile.am
index e1d0027ec..052ecbafa 100644
--- a/syntax/Makefile.am
+++ b/syntax/Makefile.am
@@ -2,6 +2,7 @@ SYNTAXFILES =			\
 	Syntax			\
 	ada95.syntax		\
 	aspx.syntax		\
+	assembler.syntax	\
 	c.syntax		\
 	cs.syntax		\
 	changelog.syntax	\
@@ -25,6 +26,7 @@ SYNTAXFILES =			\
 	perl.syntax		\
 	php.syntax		\
 	po.syntax		\
+	povray.syntax		\
 	python.syntax		\
 	ruby.syntax		\
 	sh.syntax		\
diff --git a/syntax/Syntax b/syntax/Syntax
index be3085d55..ab7e77205 100644
--- a/syntax/Syntax
+++ b/syntax/Syntax
@@ -125,6 +125,12 @@ include dos.syntax
 file ..\*\\.(po|pot|pox)$ PO\sFile
 include po.syntax
 
+file ..\*\\.([Aa][Ss][Mm]|s|S)$ ASM\sProgram
+include assembler.syntax
+ 
+file ..\*\\.([Pp][Oo][Vv])$ POV\sScript
+include povray.syntax
+
 file Don_t_match_me Mail\sfolder ^From\s
 include mail.syntax