From f77f38e238fe6ca7a9eb1cea04105b149251d496 Mon Sep 17 00:00:00 2001
From: Yves Rizoud <yrizoud@gmail.com>
Date: Fri, 3 Feb 2012 23:32:32 +0000
Subject: [PATCH] When running new version of Grafx2 for first time, new
 shortcuts take priority over user's. Useful for the space=pan (issue 233)
 that replaces default space=left-click. Also improved pan to display updated
 xy coords.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1902 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 src/help.c     | 8 ++++----
 src/operatio.c | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/help.c b/src/help.c
index 3e78ddd7..9904e1fc 100644
--- a/src/help.c
+++ b/src/help.c
@@ -270,17 +270,17 @@ void Window_set_shortcut(int action_id)
 void Remove_duplicate_shortcuts(void)
 {
   int action_1;
-  // This algorithm favors shortcuts that are first in the list.
+  // This algorithm favors shortcuts that are last in the list.
   // The idea is that we, coders, append new shortcuts at the end with default
-  // values; they should be discarded if user has chosen the key first.
-  for (action_1=0; action_1<NB_SHORTCUTS-1; action_1++)
+  // values; they take priority as they are new functions.
+  for (action_1=NB_SHORTCUTS-1; action_1>0; action_1--)
   { 
     int n;
     word *shortcut_1 = Shortcut(Ordering[action_1]);
     for (n=0; n<2; n++)
     {
       int action_2;
-      for (action_2=action_1+1; action_2<NB_SHORTCUTS; action_2++)
+      for (action_2=0; action_2<action_1; action_2++)
       {
         if (shortcut_1[n]!=0)
         {
diff --git a/src/operatio.c b/src/operatio.c
index 3566a261..f53dc207 100644
--- a/src/operatio.c
+++ b/src/operatio.c
@@ -4093,7 +4093,10 @@ void Pan_view_12_2(void)
       Scroll_screen(start_x-Paintbrush_X,start_y-Paintbrush_Y);
   }
   // The "scroll" functions have actualized the Paintbrush_X and Y
-  
+  if (Paintbrush_X!=start_x || Paintbrush_Y!=start_y)
+  {
+    Print_coordinates();
+  }
   Operation_push(Paintbrush_X);
   Operation_push(Paintbrush_Y);
 }