[Anyedit-cvs]AnyEditv2 AnyEditDoc.cpp,1.51,1.52

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24055

Modified Files:
	AnyEditDoc.cpp 
Log Message:
Fix: Don't change the language back to Default on save, when we have manually overridden it.

Index: AnyEditDoc.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** AnyEditDoc.cpp	24 Mar 2005 09:20:59 -0000	1.51
--- AnyEditDoc.cpp	11 Apr 2005 06:34:48 -0000	1.52
***************
*** 1,2 ****
--- 1,26 ----
+ /****************************************************************************
+    Copyright (C) AnyEdit Team
+ 
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+ 
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+ 
+    1. The origin of this software must not be misrepresented; you must not
+       claim that you wrote the original software. If you use this software
+       in a product, an acknowledgment in the product documentation would be
+       appreciated but is not required.
+ 
+    2. Altered source versions must be plainly marked as such, and must not be
+       misrepresented as being the original software.
+ 
+    3. This notice may not be removed or altered from any source distribution.
+ 
+    http://www.anyedit.org
+ *****************************************************************************/
+ 
  // AnyEditDoc.cpp : implementation of the CAnyEditDoc class
  //
***************
*** 276,282 ****
  
  	// Check if we need to update the scintilla properties
  	CMisc misc;
  	int iTempLanguage = theApp.GetFileTypeManager()->GetLanguageNrFromExtension(misc.GetFileExtension(lpszPathName));
! 	if(m_iLanguage != iTempLanguage)
  	{
  		// Save the language nr.
--- 300,308 ----
  
  	// Check if we need to update the scintilla properties
+ 	// We only do this if we have non-default value for the iTempLanguage,
+ 	// because we don't want to switch Default when we did a manual override.
  	CMisc misc;
  	int iTempLanguage = theApp.GetFileTypeManager()->GetLanguageNrFromExtension(misc.GetFileExtension(lpszPathName));
! 	if(iTempLanguage != 0 && m_iLanguage != iTempLanguage)
  	{
  		// Save the language nr.