← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vim/maverick

« back to all changes in this revision

Viewing changes to src/quickfix.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-01-13 18:39:18 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090113183918-kgq1jzdwsbbex4pq
Tags: 2:7.2.079-1ubuntu1
https://launchpad.net/bugs/296324
* Resynchronise with Debian (diversions fix closes LP: #296324). Remaining
  changes:
  - runtime/syntax/debcontrol.vim:
    + Add "metapackages" to the list of valid sections.
  - runtime/syntax/debchangelog.vim:
    + Add "jaunty" to the list of valid suites.
  - Drop vim-lesstif package and lesstif2-dev build-dependency.
  - Enable Python interpreter on basic builds.
  - Create a .pot file for translations.
  - Disable autoindent, line-wrapping, and backup files by default.
  - runtime/syntax/debsources.vim:
    + Add "jaunty" to debsourcesDistrKeyword
  - runtime/syntax/grub.vim:
    + Add Ubuntu-specific 'quiet' keyword.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/quickfix.c
1420
1420
    win_T               *win;
1421
1421
    win_T               *altwin;
1422
1422
#endif
 
1423
    win_T               *oldwin = curwin;
1423
1424
    int                 print_message = TRUE;
1424
1425
    int                 len;
1425
1426
#ifdef FEAT_FOLDING
1744
1745
            }
1745
1746
            else
1746
1747
                ok = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1,
1747
 
                                                   ECMD_HIDE + ECMD_SET_HELP);
 
1748
                                           ECMD_HIDE + ECMD_SET_HELP,
 
1749
                                           oldwin == curwin ? curwin : NULL);
1748
1750
        }
1749
1751
        else
1750
1752
            ok = buflist_getfile(qf_ptr->qf_fnum,
2267
2269
    win_T       *win;
2268
2270
    tabpage_T   *prevtab = curtab;
2269
2271
    buf_T       *qf_buf;
 
2272
    win_T       *oldwin = curwin;
2270
2273
 
2271
2274
    if (eap->cmdidx == CMD_lopen || eap->cmdidx == CMD_lwindow)
2272
2275
    {
2326
2329
            win->w_llist->qf_refcount++;
2327
2330
        }
2328
2331
 
 
2332
        if (oldwin != curwin)
 
2333
            oldwin = NULL;  /* don't store info when in another window */
2329
2334
        if (qf_buf != NULL)
2330
2335
            /* Use the existing quickfix buffer */
2331
2336
            (void)do_ecmd(qf_buf->b_fnum, NULL, NULL, NULL, ECMD_ONE,
2332
 
                                                     ECMD_HIDE + ECMD_OLDBUF);
 
2337
                                             ECMD_HIDE + ECMD_OLDBUF, oldwin);
2333
2338
        else
2334
2339
        {
2335
2340
            /* Create a new quickfix buffer */
2336
 
            (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE);
 
2341
            (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, oldwin);
2337
2342
            /* switch off 'swapfile' */
2338
2343
            set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
2339
2344
            set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",