Index: trunk/src/action.c =================================================================== --- trunk/src/action.c (revision 302) +++ trunk/src/action.c (revision 303) @@ -5913,7 +5913,7 @@ if (strcasecmp (function, "ElementToBuffer") == 0) { notify_crosshair_change (false); - if (LoadElementToBuffer (PASTEBUFFER, name, true)) + if (LoadElementToBuffer (PASTEBUFFER, name)) SetMode (PASTEBUFFER_MODE); notify_crosshair_change (true); } Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 302) +++ trunk/src/buffer.c (revision 303) @@ -492,13 +492,11 @@ * if successful, update some other stuff and reposition the pastebuffer */ bool -LoadElementToBuffer (BufferTypePtr Buffer, char *Name, bool FromFile) +LoadElementToBuffer (BufferTypePtr Buffer, char *Name) { ElementTypePtr element; ClearBuffer (Buffer); - if (FromFile) - { if (!ParseElement (Buffer->Data, Name)) { if (Settings.ShowSolderSide) @@ -517,26 +515,7 @@ } return (true); } - } - else - { - if (!ParseElement(Buffer->Data, Name) - && Buffer->Data->ElementN != 0) - { - element = Buffer->Data->Element->data; - /* always add elements using top-side coordinates */ - if (Settings.ShowSolderSide) - MirrorElementCoordinates (Buffer->Data, element, 0); - SetElementBoundingBox (Buffer->Data, element, &PCB->Font); - - /* set buffer offset to 'mark' position */ - Buffer->X = element->MarkX; - Buffer->Y = element->MarkY; - SetBufferBoundingBox (Buffer); - return (true); - } - } /* release memory which might have been acquired */ ClearBuffer (Buffer); return (false); @@ -730,7 +709,7 @@ menu = & Library.Menu[fpe->menu_idx]; entry = & menu->Entry[fpe->entry_idx]; - i = LoadElementToBuffer (Buffer, entry->AllocatedMemory, true); + i = LoadElementToBuffer (Buffer, entry->AllocatedMemory); if (with_fp) free (with_fp); return i ? 0 : 1; Index: trunk/src/buffer.h =================================================================== --- trunk/src/buffer.h (revision 302) +++ trunk/src/buffer.h (revision 303) @@ -39,7 +39,7 @@ void SetBufferBoundingBox (BufferTypePtr); void ClearBuffer (BufferTypePtr); void AddSelectedToBuffer (BufferTypePtr, Coord, Coord, bool); -bool LoadElementToBuffer (BufferTypePtr, char *, bool); +bool LoadElementToBuffer (BufferTypePtr, char *); bool ConvertBufferToElement (BufferTypePtr); bool SmashBufferElement (BufferTypePtr); bool LoadLayoutToBuffer (BufferTypePtr, char *); Index: trunk/src/command.c =================================================================== --- trunk/src/command.c (revision 302) +++ trunk/src/command.c (revision 303) @@ -169,7 +169,7 @@ { case 1: /* filename is passed in commandline */ filename = argv[0]; - if (filename && LoadElementToBuffer (PASTEBUFFER, filename, true)) + if (filename && LoadElementToBuffer (PASTEBUFFER, filename)) SetMode (PASTEBUFFER_MODE); break; Index: trunk/src/hid/gtk/gui-library-window.c =================================================================== --- trunk/src/hid/gtk/gui-library-window.c (revision 302) +++ trunk/src/hid/gtk/gui-library-window.c (revision 303) @@ -376,7 +376,7 @@ /* -1 flags this is an element file part and the file path is in | entry->AllocateMemory. */ - if (LoadElementToBuffer (PASTEBUFFER, entry->AllocatedMemory, true)) + if (LoadElementToBuffer (PASTEBUFFER, entry->AllocatedMemory)) SetMode (PASTEBUFFER_MODE); /* update the preview with new symbol data */ Index: trunk/src/hid/lesstif/library.c =================================================================== --- trunk/src/hid/lesstif/library.c (revision 302) +++ trunk/src/hid/lesstif/library.c (revision 303) @@ -73,7 +73,7 @@ LibraryEntryType *e = Library.Menu[last_pick].Entry + cbs->item_position - 1; - if (LoadElementToBuffer (PASTEBUFFER, e->AllocatedMemory, true)) + if (LoadElementToBuffer (PASTEBUFFER, e->AllocatedMemory)) SetMode (PASTEBUFFER_MODE); }