home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.1274 < prev    next >
Encoding:
Internet Message Format  |  2013-06-29  |  3.3 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.1274
  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.1274
  11. Problem:    When selecting an entry from a location list it may pick an
  12.         arbitrary window or open a new one.
  13. Solution:   Prefer using a window related to the location list. (Lech Lorens)
  14. Files:        src/quickfix.c
  15.  
  16.  
  17. *** ../vim-7.3.1273/src/quickfix.c    2013-06-30 13:33:53.000000000 +0200
  18. --- src/quickfix.c    2013-06-30 13:48:25.000000000 +0200
  19. ***************
  20. *** 1616,1621 ****
  21. --- 1616,1623 ----
  22.        */
  23.       if (bt_quickfix(curbuf) && !opened_window)
  24.       {
  25. +     win_T *usable_win_ptr = NULL;
  26. + 
  27.       /*
  28.        * If there is no file specified, we don't know where to go.
  29.        * But do advance, otherwise ":cn" gets stuck.
  30. ***************
  31. *** 1623,1636 ****
  32.       if (qf_ptr->qf_fnum == 0)
  33.           goto theend;
  34.   
  35. -     /* Locate a window showing a normal buffer */
  36.       usable_win = 0;
  37. !     FOR_ALL_WINDOWS(win)
  38. !         if (win->w_buffer->b_p_bt[0] == NUL)
  39. !         {
  40. !         usable_win = 1;
  41. !         break;
  42. !         }
  43.   
  44.       /*
  45.        * If no usable window is found and 'switchbuf' contains "usetab"
  46. --- 1625,1653 ----
  47.       if (qf_ptr->qf_fnum == 0)
  48.           goto theend;
  49.   
  50.       usable_win = 0;
  51. ! 
  52. !     ll_ref = curwin->w_llist_ref;
  53. !     if (ll_ref != NULL)
  54. !     {
  55. !         /* Find a window using the same location list that is not a
  56. !          * quickfix window. */
  57. !         FOR_ALL_WINDOWS(usable_win_ptr)
  58. !         if (usable_win_ptr->w_llist == ll_ref
  59. !             && usable_win_ptr->w_buffer->b_p_bt[0] != 'q')
  60. !             break;
  61. !     }
  62. ! 
  63. !     if (!usable_win)
  64. !     {
  65. !         /* Locate a window showing a normal buffer */
  66. !         FOR_ALL_WINDOWS(win)
  67. !         if (win->w_buffer->b_p_bt[0] == NUL)
  68. !         {
  69. !             usable_win = 1;
  70. !             break;
  71. !         }
  72. !     }
  73.   
  74.       /*
  75.        * If no usable window is found and 'switchbuf' contains "usetab"
  76. ***************
  77. *** 1659,1666 ****
  78.        */
  79.       if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win)
  80.       {
  81. -         ll_ref = curwin->w_llist_ref;
  82. - 
  83.           flags = WSP_ABOVE;
  84.           if (ll_ref != NULL)
  85.           flags |= WSP_NEWLOC;
  86. --- 1676,1681 ----
  87. ***************
  88. *** 1683,1694 ****
  89.           if (curwin->w_llist_ref != NULL)
  90.           {
  91.           /* In a location window */
  92. !         ll_ref = curwin->w_llist_ref;
  93. ! 
  94. !         /* Find the window with the same location list */
  95. !         FOR_ALL_WINDOWS(win)
  96. !             if (win->w_llist == ll_ref)
  97. !             break;
  98.           if (win == NULL)
  99.           {
  100.               /* Find the window showing the selected file */
  101. --- 1698,1704 ----
  102.           if (curwin->w_llist_ref != NULL)
  103.           {
  104.           /* In a location window */
  105. !         win = usable_win_ptr;
  106.           if (win == NULL)
  107.           {
  108.               /* Find the window showing the selected file */
  109. *** ../vim-7.3.1273/src/version.c    2013-06-30 13:33:53.000000000 +0200
  110. --- src/version.c    2013-06-30 13:56:35.000000000 +0200
  111. ***************
  112. *** 730,731 ****
  113. --- 730,733 ----
  114.   {   /* Add new patch number below this line */
  115. + /**/
  116. +     1274,
  117.   /**/
  118.  
  119. -- 
  120. Witches prefer brooms: vacuum-cleaners need extension cords!
  121.  
  122.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  123. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  124. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  125.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  126.