Index: /FCKeditor/branches/features/anchors/editor/_source/commandclasses/fck_othercommands.js
===================================================================
--- /FCKeditor/branches/features/anchors/editor/_source/commandclasses/fck_othercommands.js	(revision 23)
+++ /FCKeditor/branches/features/anchors/editor/_source/commandclasses/fck_othercommands.js	(revision 24)
@@ -5,4 +5,5 @@
 </FileDescription>
 <Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
+<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
 */
 
@@ -294,5 +295,16 @@
 FCKUnlinkCommand.prototype.GetState = function()
 {
-	return FCK.GetNamedCommandState( this.Name ) ;
+	var state = FCK.GetNamedCommandState( this.Name ) ;
+
+	// Check that it isn't an anchor
+	if ( state == FCK_TRISTATE_OFF && FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+	{
+		var oLink = FCKSelection.MoveToAncestorNode( 'A' ) ; 
+		var bIsAnchor = ( oLink && oLink.name.length > 0 && oLink.href.length == 0 ) ;
+		if ( bIsAnchor )
+			state = FCK_TRISTATE_DISABLED ;
+	}
+
+	return state ;
 }
 
Index: /FCKeditor/branches/features/anchors/editor/_source/internals/fck_contextmenu.js
===================================================================
--- /FCKeditor/branches/features/anchors/editor/_source/internals/fck_contextmenu.js	(revision 23)
+++ /FCKeditor/branches/features/anchors/editor/_source/internals/fck_contextmenu.js	(revision 24)
@@ -5,4 +5,5 @@
 </FileDescription>
 <Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
+<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
 */
 
@@ -119,5 +120,5 @@
 				// Go up to the anchor to test its properties
 				var oLink = FCKSelection.MoveToAncestorNode( 'A' ) ; 
-				var bIsAnchor = ( oLink && oLink.name.length > 0 && oLink.href.length == 0 ) ;
+				var bIsAnchor = ( oLink && oLink.name.length > 0 ) ;
 
 				if ( bIsAnchor || ( tagName == 'IMG' && tag.getAttribute( '_fckanchor' ) ) )
Index: /FCKeditor/branches/features/anchors/editor/_source/internals/fckdocumentprocessor.js
===================================================================
--- /FCKeditor/branches/features/anchors/editor/_source/internals/fckdocumentprocessor.js	(revision 23)
+++ /FCKeditor/branches/features/anchors/editor/_source/internals/fckdocumentprocessor.js	(revision 24)
@@ -4,4 +4,5 @@
 </FileDescription>
 <Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
+<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
 */
 
@@ -34,5 +35,5 @@
 
 // Link Anchors
-if ( FCKBrowserInfo.IsIE )
+if ( FCKBrowserInfo.IsIE || FCKBrowserInfo.IsOpera )
 {
 	var FCKAnchorsProcessor = FCKDocumentProcessor.AppendNew() ;
@@ -51,5 +52,6 @@
 				if ( oLink.innerHTML != '' )
 				{
-					oLink.className += ' FCK__AnchorC' ;
+					if ( FCKBrowserInfo.IsIE )
+						oLink.className += ' FCK__AnchorC' ;
 				}
 				else
Index: /FCKeditor/branches/features/anchors/editor/_source/internals/fckregexlib.js
===================================================================
--- /FCKeditor/branches/features/anchors/editor/_source/internals/fckregexlib.js	(revision 23)
+++ /FCKeditor/branches/features/anchors/editor/_source/internals/fckregexlib.js	(revision 24)
@@ -4,4 +4,5 @@
 </FileDescription>
 <Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
+<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
 */
 
Index: /FCKeditor/branches/features/anchors/editor/_source/internals/fcktools.js
===================================================================
--- /FCKeditor/branches/features/anchors/editor/_source/internals/fcktools.js	(revision 23)
+++ /FCKeditor/branches/features/anchors/editor/_source/internals/fcktools.js	(revision 24)
@@ -4,4 +4,5 @@
 </FileDescription>
 <Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
+<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
 */
 
Index: /FCKeditor/branches/features/anchors/editor/_source/internals/fckxhtml.js
===================================================================
--- /FCKeditor/branches/features/anchors/editor/_source/internals/fckxhtml.js	(revision 23)
+++ /FCKeditor/branches/features/anchors/editor/_source/internals/fckxhtml.js	(revision 24)
@@ -4,4 +4,5 @@
 </FileDescription>
 <Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
+<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
 */
 
Index: /FCKeditor/branches/features/anchors/editor/css/fck_editorarea.css
===================================================================
--- /FCKeditor/branches/features/anchors/editor/css/fck_editorarea.css	(revision 23)
+++ /FCKeditor/branches/features/anchors/editor/css/fck_editorarea.css	(revision 24)
@@ -9,4 +9,5 @@
 </FileDescription>
 <Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
+<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
 */
 
Index: /FCKeditor/branches/features/anchors/editor/css/fck_internal.css
===================================================================
--- /FCKeditor/branches/features/anchors/editor/css/fck_internal.css	(revision 23)
+++ /FCKeditor/branches/features/anchors/editor/css/fck_internal.css	(revision 24)
@@ -4,4 +4,5 @@
 </FileDescription>
 <Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
+<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
 */
 
@@ -37,4 +38,5 @@
 .FCK__Anchor
 {
+	border: 1px dotted #00F;
 	background-position: center center;
 	background-image: url(images/fck_anchor.gif);
Index: /FCKeditor/branches/features/anchors/editor/dialog/fck_anchor.html
===================================================================
--- /FCKeditor/branches/features/anchors/editor/dialog/fck_anchor.html	(revision 23)
+++ /FCKeditor/branches/features/anchors/editor/dialog/fck_anchor.html	(revision 24)
@@ -5,4 +5,5 @@
 </FileDescription>
 <Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
+<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
 -->
 <html>
@@ -94,14 +95,16 @@
 
 	// IE does require special processing to show the Anchor's image
-	if ( FCKBrowserInfo.IsIE )
+	// Opera doesn't allow to select empty anchors
+	if ( FCKBrowserInfo.IsIE || FCKBrowserInfo.IsOpera )
 	{
 		if ( oAnchor.innerHTML != '' )
 		{
-			oAnchor.className += ' FCK__AnchorC' ;
+			if ( FCKBrowserInfo.IsIE )
+				oAnchor.className += ' FCK__AnchorC' ;
 		}
 		else
 		{
 			var oImg = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oAnchor.cloneNode(true) ) ;
-			oAnchor.setAttribute( '_fckanchor', 'true', 0 ) ;
+			oImg.setAttribute( '_fckanchor', 'true', 0 ) ;
 			
 			oAnchor.parentNode.insertBefore( oImg, oAnchor ) ;
Index: /FCKeditor/branches/features/anchors/editor/dialog/fck_link/fck_link.js
===================================================================
--- /FCKeditor/branches/features/anchors/editor/dialog/fck_link/fck_link.js	(revision 23)
+++ /FCKeditor/branches/features/anchors/editor/dialog/fck_link/fck_link.js	(revision 24)
@@ -5,4 +5,5 @@
 <Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
 <Author name="Dominik Pesch ?dom? (empty selection patch)" email="d.pesch@11com7.de" />
+<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
 */
 
@@ -11,4 +12,5 @@
 var FCKLang		= oEditor.FCKLang ;
 var FCKConfig	= oEditor.FCKConfig ;
+var FCKRegexLib			= oEditor.FCKRegexLib ;
 
 //#### Dialog Tabs
@@ -276,14 +278,19 @@
 	GetE('txtAttCharSet').value		= oLink.charset ;
 
+	var sClass ;
 	if ( oEditor.FCKBrowserInfo.IsIE )
 	{
-		GetE('txtAttClasses').value	= oLink.getAttribute('className',2) || '' ;
+		sClass	= oLink.getAttribute('className',2) || '' ;
+		// Clean up temporary classes for internal use:
+		sClass = sClass.replace( FCKRegexLib.FCK_Class, '' ) ;
+
 		GetE('txtAttStyle').value	= oLink.style.cssText ;
 	}
 	else
 	{
-		GetE('txtAttClasses').value	= oLink.getAttribute('class',2) || '' ;
-		GetE('txtAttStyle').value	= oLink.getAttribute('style',2) ;
-	}
+		sClass	= oLink.getAttribute('class',2) || '' ;
+		GetE('txtAttStyle').value	= oLink.getAttribute('style',2) || '' ;
+	}
+	GetE('txtAttClasses').value	= sClass ;
 
 	// Update the Link type combo.
@@ -534,5 +541,5 @@
 	// Advances Attributes
 	SetAttribute( oLink, 'id'		, GetE('txtAttId').value ) ;
-	SetAttribute( oLink, 'name'		, GetE('txtAttName').value ) ;		// No IE. Set but doesnt't update the outerHTML.
+	SetAttribute( oLink, 'name'		, GetE('txtAttName').value ) ;		
 	SetAttribute( oLink, 'dir'		, GetE('cmbAttLangDir').value ) ;
 	SetAttribute( oLink, 'lang'		, GetE('txtAttLangCode').value ) ;
@@ -545,5 +552,10 @@
 	if ( oEditor.FCKBrowserInfo.IsIE )
 	{
-		SetAttribute( oLink, 'className', GetE('txtAttClasses').value ) ;
+		var sClass = GetE('txtAttClasses').value ;
+		// If it's also an anchor add an internal class
+		if ( GetE('txtAttName').value.length != 0 )
+			sClass += ' FCK__AnchorC' ;
+		SetAttribute( oLink, 'className', sClass ) ;
+
 		oLink.style.cssText = GetE('txtAttStyle').value ;
 	}