vim/patches/vim-7.3.010.patch0

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.3.010
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.010
  11 Problem:    Mac GUI: Missing break statements.
  12 Solution:   Add the break statements. (Dominique Pelle)
  13 Files:      src/gui_mac.c
  14
  15
  16 *** ../vim-7.3.009/src/gui_mac.c        2010-08-15 21:57:28.000000000 +0200
  17 --- src/gui_mac.c       2010-09-21 17:33:13.000000000 +0200
  18 ***************
  19 *** 1480,1486 ****
  20    *
  21    *  Returns the index inside the menu wher
  22    */
  23 !     short /* Shoulde we return MenuItemIndex? */
  24   gui_mac_get_menu_item_index(vimmenu_T *pMenu)
  25   {
  26       short     index;
  27 --- 1480,1486 ----
  28    *
  29    *  Returns the index inside the menu wher
  30    */
  31 !     short /* Should we return MenuItemIndex? */
  32   gui_mac_get_menu_item_index(vimmenu_T *pMenu)
  33   {
  34       short     index;
  35 ***************
  36 *** 1823,1829 ****
  37         p.h += gui.scrollbar_width;
  38       if (gui.which_scrollbars[SBAR_RIGHT])
  39         p.h += gui.scrollbar_width;
  40 !     /* ideal height is as heigh as we can get */
  41       p.v = 15 * 1024;
  42
  43       thePart = IsWindowInStandardState(whichWindow, &p, &r)
  44 --- 1823,1829 ----
  45         p.h += gui.scrollbar_width;
  46       if (gui.which_scrollbars[SBAR_RIGHT])
  47         p.h += gui.scrollbar_width;
  48 !     /* ideal height is as high as we can get */
  49       p.v = 15 * 1024;
  50
  51       thePart = IsWindowInStandardState(whichWindow, &p, &r)
  52 ***************
  53 *** 4481,4487 ****
  54          * event arrives.  No need to check for input_buf_full because we are
  55          * returning as soon as it contains a single char.
  56          */
  57 !       /* TODO: reduce wtime accordinly???  */
  58         if (wtime > -1)
  59             sleeppyTick = 60 * wtime / 1000;
  60         else
  61 --- 4481,4487 ----
  62          * event arrives.  No need to check for input_buf_full because we are
  63          * returning as soon as it contains a single char.
  64          */
  65 !       /* TODO: reduce wtime accordingly???  */
  66         if (wtime > -1)
  67             sleeppyTick = 60 * wtime / 1000;
  68         else
  69 ***************
  70 *** 5723,5735 ****
  71       iconDITL = GetResource('DITL', 131);
  72       switch (type)
  73       {
  74 !       case VIM_GENERIC:  useIcon = kNoteIcon;
  75 !       case VIM_ERROR:    useIcon = kStopIcon;
  76 !       case VIM_WARNING:  useIcon = kCautionIcon;
  77 !       case VIM_INFO:     useIcon = kNoteIcon;
  78 !       case VIM_QUESTION: useIcon = kNoteIcon;
  79 !       default:      useIcon = kStopIcon;
  80 !     };
  81       AppendDITL(theDialog, iconDITL, overlayDITL);
  82       ReleaseResource(iconDITL);
  83       GetDialogItem(theDialog, iconItm.idx, &itemType, &itemHandle, &box);
  84 --- 5723,5735 ----
  85       iconDITL = GetResource('DITL', 131);
  86       switch (type)
  87       {
  88 !       case VIM_GENERIC:
  89 !       case VIM_INFO:
  90 !       case VIM_QUESTION: useIcon = kNoteIcon; break;
  91 !       case VIM_WARNING:  useIcon = kCautionIcon; break;
  92 !       case VIM_ERROR:    useIcon = kStopIcon; break;
  93 !       default:           useIcon = kStopIcon;
  94 !     }
  95       AppendDITL(theDialog, iconDITL, overlayDITL);
  96       ReleaseResource(iconDITL);
  97       GetDialogItem(theDialog, iconItm.idx, &itemType, &itemHandle, &box);
  98 ***************
  99 *** 5892,5898 ****
 100
 101       return itemHit;
 102   /*
 103 !  * Usefull thing which could be used
 104    * SetDialogTimeout(): Auto click a button after timeout
 105    * SetDialogTracksCursor() : Get the I-beam cursor over input box
 106    * MoveDialogItem():      Probably better than SetDialogItem
 107 --- 5892,5898 ----
 108
 109       return itemHit;
 110   /*
 111 !  * Useful thing which could be used
 112    * SetDialogTimeout(): Auto click a button after timeout
 113    * SetDialogTracksCursor() : Get the I-beam cursor over input box
 114    * MoveDialogItem():      Probably better than SetDialogItem
 115 ***************
 116 *** 6100,6106 ****
 117   #endif
 118
 119   /*
 120 !  * Transfered from os_mac.c for MacOS X using os_unix.c prep work
 121    */
 122
 123       int
 124 --- 6100,6106 ----
 125   #endif
 126
 127   /*
 128 !  * Transferred from os_mac.c for MacOS X using os_unix.c prep work
 129    */
 130
 131       int
 132 ***************
 133 *** 6543,6549 ****
 134   static ControlRef dataBrowser = NULL;
 135
 136   // when the tabline is hidden, vim doesn't call update_tabline(). When
 137 ! // the tabline is shown again, show_tabline() is called before upate_tabline(),
 138   // and because of this, the tab labels and vims internal tabs are out of sync
 139   // for a very short time. to prevent inconsistent state, we store the labels
 140   // of the tabs, not pointers to the tabs (which are invalid for a short time).
 141 --- 6543,6549 ----
 142   static ControlRef dataBrowser = NULL;
 143
 144   // when the tabline is hidden, vim doesn't call update_tabline(). When
 145 ! // the tabline is shown again, show_tabline() is called before update_tabline(),
 146   // and because of this, the tab labels and vims internal tabs are out of sync
 147   // for a very short time. to prevent inconsistent state, we store the labels
 148   // of the tabs, not pointers to the tabs (which are invalid for a short time).
 149 *** ../vim-7.3.009/src/version.c        2010-09-21 17:29:19.000000000 +0200
 150 --- src/version.c       2010-09-21 17:33:22.000000000 +0200
 151 ***************
 152 *** 716,717 ****
 153 --- 716,719 ----
 154   {   /* Add new patch number below this line */
 155 + /**/
 156 +     10,
 157   /**/
 158
 159 --
 160 hundred-and-one symptoms of being an internet addict:
 161 182. You may not know what is happening in the world, but you know
 162      every bit of net-gossip there is.
 163
 164  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 165 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 166 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 167  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///