From 4ee6cfe5b6b33172a3dacb45d0c69a7bfcd4a013 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Thu, 14 Apr 2022 17:55:08 +0100
Subject: [PATCH] Disable all use of the default instance reference prefix for
 annotation.

Fixes https://gitlab.com/kicad/code/kicad/issues/11385
---
 eeschema/annotate.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp
index 56cf5681d4..5388adf37e 100644
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@@ -87,14 +87,12 @@ void SCH_EDIT_FRAME::DeleteAnnotation( ANNOTATE_SCOPE_T aAnnotateScope, bool* aA
     case ANNOTATE_ALL:
     {
         for( const SCH_SHEET_PATH& sheet : Schematic().GetSheets() )
-            clearSheetAnnotation( sheet.LastScreen(), nullptr, true );
+            clearSheetAnnotation( sheet.LastScreen(), nullptr, false );
 
         break;
     }
     case ANNOTATE_CURRENT_SHEET:
     {
-        // One could make an argument that this should clear prefixes.  I have no idea what
-        // the right answer is.
         clearSheetAnnotation( screen, &currentSheet, false );
         break;
     }
@@ -107,11 +105,7 @@ void SCH_EDIT_FRAME::DeleteAnnotation( ANNOTATE_SCOPE_T aAnnotateScope, bool* aA
         for( EDA_ITEM* item : selection.Items() )
         {
             if( item->Type() == SCH_SYMBOL_T )
-            {
-                // One could make an argument that this should clear prefixes.  I have no idea
-                // what the right answer is.
                 clearSymbolAnnotation( item, screen, &currentSheet, false );
-            }
         }
         break;
     }