updated for version 7.0018

diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 42fa8ba4e1bc06278a5d766dd1f232643b46a16b..ee2ac46cb3089e71f9d7e36876db8b57b841c148 100644 (file)
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.0aa.  Last change: 2004 Aug 29
+*editing.txt*   For Vim version 7.0aa.  Last change: 2004 Oct 09
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -84,6 +84,9 @@ g CTRL-G              Prints the current position of the cursor in four
                                                        *:file_f*
 :f[ile][!] {name}      Sets the current file name to {name}.  The optional !
                        avoids truncating the message, as with |:file|.
+                       If the buffer did have a name, that name becomes the
+                       |alternate-file| name.  An unlisted buffer is created
+                       to hold the old name.
 
 :0f[ile][!]            Remove the name of the current buffer.  The optional !
                        avoids truncating the message, as with |:file|.  {not

diff --git a/src/diff.c b/src/diff.c
index 40d2292ae41ad668ff5ddf8353182a6380fd06cd..bc755038da01b695f577ead23a9213a8e1aede5a 100644 (file)
--- a/src/diff.c
+++ b/src/diff.c
@@ -840,7 +840,7 @@ ex_diffpatch(eap)
 #ifdef FEAT_BROWSE
     if (cmdmod.browse)
     {
-       browseFile = do_browse(FALSE, (char_u *)_("Patch file"),
+       browseFile = do_browse(0, (char_u *)_("Patch file"),
                         eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL);
        if (browseFile == NULL)
            return;             /* operation cancelled */

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 418de48e25ec5ea9391ad7ba67048d3df3ef3c53..e818f827320f42b284464ce6b9a5cee82e183228 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1594,6 +1594,9 @@ do_one_cmd(cmdlinep, sourcing,
     int                        save_msg_scroll = 0;
     int                        did_silent = 0;
     int                        did_esilent = 0;
+#ifdef HAVE_SANDBOX
+    int                        did_sandbox = FALSE;
+#endif
     cmdmod_T           save_cmdmod;
     int                        ni;                     /* set when Not Implemented */
 
@@ -1732,7 +1735,16 @@ do_one_cmd(cmdlinep, sourcing,
 #endif
                        continue;
 
-           case 's':   if (!checkforcmd(&ea.cmd, "silent", 3))
+           case 's':   if (checkforcmd(&ea.cmd, "sandbox", 3))
+                       {
+#ifdef HAVE_SANDBOX
+                           if (!did_sandbox)
+                               ++sandbox;
+                           did_sandbox = TRUE;
+#endif
+                           continue;
+                       }
+                       if (!checkforcmd(&ea.cmd, "silent", 3))
                            break;
                        ++did_silent;
                        ++msg_silent;
@@ -2565,6 +2577,11 @@ doend:
        msg_scroll = save_msg_scroll;
     }
 
+#ifdef HAVE_SANDBOX
+    if (did_sandbox)
+       --sandbox;
+#endif
+
     if (ea.nextcmd && *ea.nextcmd == NUL)      /* not really a next command */
        ea.nextcmd = NULL;
 
@@ -2800,6 +2817,7 @@ cmd_exists(name)
        {"leftabove", 5},
        {"lockmarks", 3},
        {"rightbelow", 6},
+       {"sandbox", 3},
        {"silent", 3},
        {"topleft", 2},
        {"verbose", 4},
@@ -6462,7 +6480,7 @@ ex_splitview(eap)
 #endif
            && eap->cmdidx != CMD_new)
     {
-       fname = do_browse(FALSE, (char_u *)_("Edit File in new window"),
+       fname = do_browse(0, (char_u *)_("Edit File in new window"),
                                          eap->arg, NULL, NULL, NULL, curbuf);
        if (fname == NULL)
            goto theend;
@@ -6882,7 +6900,7 @@ ex_read(eap)
        {
            char_u *browseFile;
 
-           browseFile = do_browse(FALSE, (char_u *)_("Append File"), eap->arg,
+           browseFile = do_browse(0, (char_u *)_("Append File"), eap->arg,
                                                    NULL, NULL, NULL, curbuf);
            if (browseFile != NULL)
            {
@@ -7470,8 +7488,9 @@ ex_redir(eap)
            {
                char_u  *browseFile;
 
-               browseFile = do_browse(TRUE, (char_u *)_("Save Redirection"),
-                      fname, NULL, NULL, BROWSE_FILTER_ALL_FILES, curbuf);
+               browseFile = do_browse(BROWSE_SAVE,
+                       (char_u *)_("Save Redirection"),
+                       fname, NULL, NULL, BROWSE_FILTER_ALL_FILES, curbuf);
                if (browseFile == NULL)
                    return;             /* operation cancelled */
                vim_free(fname);
@@ -7658,7 +7677,7 @@ ex_mkrc(eap)
 #ifdef FEAT_BROWSE
     if (cmdmod.browse)
     {
-       browseFile = do_browse(TRUE,
+       browseFile = do_browse(BROWSE_SAVE,
 # ifdef FEAT_SESSION
                eap->cmdidx == CMD_mkview ? (char_u *)_("Save View") :
                eap->cmdidx == CMD_mksession ? (char_u *)_("Save Session") :

diff --git a/src/globals.h b/src/globals.h
index 93371347f4963322d7685f49f1230e8ec7ee5489..84adb7fb317f69cdacc33d004b05e3836845007e 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1346,6 +1346,7 @@ EXTERN char_u e_re_corr[] INIT(=N_("E44: Corrupted regexp program"));
 EXTERN char_u e_readonly[]     INIT(=N_("E45: 'readonly' option is set (add ! to override)"));
 #ifdef FEAT_EVAL
 EXTERN char_u e_readonlyvar[]  INIT(=N_("E46: Cannot set read-only variable \"%s\""));
+EXTERN char_u e_readonlysbx[]  INIT(=N_("E46: Cannot set variable in the sandbox: \"%s\""));
 #endif
 #ifdef FEAT_QUICKFIX
 EXTERN char_u e_readerrf[]     INIT(=N_("E47: Error while reading errorfile"));

diff --git a/src/gui.c b/src/gui.c
index 9b33f9d3983e83e53ed2ccaba5e6f12b82c3566e..71b738cede45cddaaaf3e77c4d9d77cfc5bc1f18 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -4411,9 +4411,8 @@ no_console_input()
 }
 #endif
 
-#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MOTIF) \
-       || defined(MSWIN_FIND_REPLACE) || defined(FEAT_SUN_WORKSHOP) \
-       || defined(PROTO) || defined(FEAT_GUI_KDE)
+#if defined(FIND_REPLACE_DIALOG) || defined(FEAT_SUN_WORKSHOP) \
+       || defined(PROTO)
 /*
  * Update the current window and the screen.
  */
@@ -4430,8 +4429,7 @@ gui_update_screen()
 }
 #endif
 
-#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MOTIF) \
-       || defined(MSWIN_FIND_REPLACE) || defined(PROTO) || defined(FEAT_GUI_KDE)
+#if defined(FIND_REPLACE_DIALOG) || defined(PROTO)
 static void concat_esc __ARGS((garray_T *gap, char_u *text, int what));
 
 /*
@@ -4539,28 +4537,10 @@ gui_do_findrepl(flags, find_text, repl_text, down)
     int                i;
     int                type = (flags & FRD_TYPE_MASK);
     char_u     *p;
+    regmatch_T regmatch;
 
     ga_init2(&ga, 1, 100);
-
-    if (type == FRD_REPLACE)
-    {
-       /* Do the replacement when the text under the cursor matches. */
-       i = STRLEN(find_text);
-       p = ml_get_cursor();
-       if (((flags & FRD_MATCH_CASE)
-                   ? STRNCMP(p, find_text, i) == 0
-                   : STRNICMP(p, find_text, i) == 0)
-               && u_save_cursor() == OK)
-       {
-           /* A button was pressed thus undo should be synced. */
-           if (no_u_sync == 0)
-               u_sync();
-
-           del_bytes((long)i, FALSE);
-           ins_str(repl_text);
-       }
-    }
-    else if (type == FRD_REPLACEALL)
+    if (type == FRD_REPLACEALL)
        ga_concat(&ga, (char_u *)"%s/");
 
     ga_concat(&ga, (char_u *)"\\V");
@@ -4579,21 +4559,56 @@ gui_do_findrepl(flags, find_text, repl_text, down)
 
     if (type == FRD_REPLACEALL)
     {
-       /* A button was pressed, thus undo should be synced. */
-       if (no_u_sync == 0)
-           u_sync();
-
        ga_concat(&ga, (char_u *)"/");
        concat_esc(&ga, repl_text, '/');        /* escape slashes */
        ga_concat(&ga, (char_u *)"/g");
-       ga_append(&ga, NUL);
+    }
+    ga_append(&ga, NUL);
+
+    if (type == FRD_REPLACE)
+    {
+       /* Do the replacement when the text at the cursor matches.  Thus no
+        * replacement is done if the cursor was moved! */
+       regmatch.regprog = vim_regcomp(ga.ga_data, RE_MAGIC + RE_STRING);
+       regmatch.rm_ic = 0;
+       if (regmatch.regprog != NULL)
+       {
+           p = ml_get_cursor();
+           if (vim_regexec_nl(&regmatch, p, (colnr_T)0)
+                                                  && regmatch.startp[0] == p)
+           {
+               /* Clear the command line to remove any old "No match"
+                * error. */
+               msg_end_prompt();
+
+               if (u_save_cursor() == OK)
+               {
+                   /* A button was pressed thus undo should be synced. */
+                   if (no_u_sync == 0)
+                       u_sync();
+
+                   del_bytes((long)(regmatch.endp[0] - regmatch.startp[0]),
+                                                                      FALSE);
+                   ins_str(repl_text);
+               }
+           }
+           else
+               MSG(_("No match at cursor, finding next"));
+           vim_free(regmatch.regprog);
+       }
+    }
+
+    if (type == FRD_REPLACEALL)
+    {
+       /* A button was pressed, thus undo should be synced. */
+       if (no_u_sync == 0)
+           u_sync();
        do_cmdline_cmd(ga.ga_data);
     }
     else
     {
        /* Search for the next match. */
        i = msg_scroll;
-       ga_append(&ga, NUL);
        do_search(NULL, down ? '/' : '?', ga.ga_data, 1L,
                                                    SEARCH_MSG + SEARCH_MARK);
        msg_scroll = i;     /* don't let an error message set msg_scroll */

diff --git a/src/gui.h b/src/gui.h
index 02028f2c745c0548e65fb0aea1fabaa06628dd5e..bcb36de7c553400f31842575492184effbb99bca 100644 (file)
--- a/src/gui.h
+++ b/src/gui.h
@@ -542,8 +542,7 @@ typedef enum
 }
 gui_win_pos_T;
 
-#if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE) \
-       || defined(MSWIN_FIND_REPLACE)
+#ifdef FIND_REPLACE_DIALOG
 /*
  * Flags used to distinguish the different contexts in which the
  * find/replace callback may be called.

diff --git a/src/gui_w48.c b/src/gui_w48.c
index eeaf651c77f5d05c50358e4effce6f99c938bacb..4f0bab70079ceb143114db91a52b0cdf37801c94 100644 (file)
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -2979,6 +2979,18 @@ convert_filter(char_u *s)
     return res;
 }
 
+/*
+ * Select a directory.
+ */
+    char_u *
+gui_mch_browsedir(char_u *title, char_u *initdir)
+{
+    /* We fake this: Use a filter that doesn't select anything and a default
+     * file name that won't be used. */
+    return gui_mch_browse(0, title, (char_u *)_("Not Used"), NULL,
+                             initdir, (char_u *)_("Directory\t*.nothing\n"));
+}
+
 /*
  * Pop open a file browser and return the file selected, in allocated memory,
  * or NULL if Cancel is hit.

diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c
index fb5999a549a3376d926a0db88caed558f546e648..fe127a46e6da38ee2fc25ae1cd472eae7a7b9576 100644 (file)
--- a/src/if_xcmdsrv.c
+++ b/src/if_xcmdsrv.c
@@ -1021,7 +1021,7 @@ DeleteAnyLingerer(dpy, win)
     char_u     *regProp, *entry = NULL;
     char_u     *p;
     long_u     numItems;
-    Window     wwin;
+    int_u      wwin;
 
     /*
      * Read the registry property.
@@ -1034,8 +1034,8 @@ DeleteAnyLingerer(dpy, win)
     {
        if (*p != 0)
        {
-           sscanf((char *)p, "%x", (int_u *)&wwin);
-           if (wwin == win)
+           sscanf((char *)p, "%x", &wwin);
+           if ((Window)wwin == win)
            {
                int lastHalf;
 

diff --git a/src/message.c b/src/message.c
index 5b8da3f4dbcd85f994935a61bca64913e704686b..d678bf3b9e16758be1590b5a58c9c1bca7c8a7b8 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -813,14 +813,12 @@ ex_messages(eap)
     msg_hist_off = FALSE;
 }
 
-#if defined(FEAT_CON_DIALOG) || defined(PROTO)
-static void msg_end_prompt __ARGS((void));
-
+#if defined(FEAT_CON_DIALOG) || defined(FIND_REPLACE_DIALOG) || defined(PROTO)
 /*
  * Call this after prompting the user.  This will avoid a hit-return message
  * and a delay.
  */
-    static void
+    void
 msg_end_prompt()
 {
     need_wait_return = FALSE;
@@ -3046,8 +3044,8 @@ vim_dialog_yesnoallcancel(type, title, message, dflt)
  * Later this may pop-up a non-GUI file selector (external command?).
  */
     char_u *
-do_browse(saving, title, dflt, ext, initdir, filter, buf)
-    int                saving;         /* write action */
+do_browse(flags, title, dflt, ext, initdir, filter, buf)
+    int                flags;          /* BROWSE_SAVE and BROWSE_DIR */
     char_u     *title;         /* title for the window */
     char_u     *dflt;          /* default file name (may include directory) */
     char_u     *ext;           /* extension added */
@@ -3065,9 +3063,11 @@ do_browse(saving, title, dflt, ext, initdir, filter, buf)
      * flag too!  */
     cmdmod.browse = FALSE;
 
-    if (title == NULL)
+    if (title == NULL || *title == NUL)
     {
-       if (saving)
+       if (flags & BROWSE_DIR)
+           title = (char_u *)_("Select Directory dialog");
+       else if (flags & BROWSE_SAVE)
            title = (char_u *)_("Save File dialog");
        else
            title = (char_u *)_("Open File dialog");
@@ -3097,10 +3097,13 @@ do_browse(saving, title, dflt, ext, initdir, filter, buf)
     if (initdir == NULL || *initdir == NUL)
     {
        /* When 'browsedir' is a directory, use it */
-       if (mch_isdir(p_bsdir))
+       if (STRCMP(p_bsdir, "last") != 0
+               && STRCMP(p_bsdir, "buffer") != 0
+               && STRCMP(p_bsdir, "current") != 0
+               && mch_isdir(p_bsdir))
            initdir = p_bsdir;
        /* When saving or 'browsedir' is "buffer", use buffer fname */
-       else if ((saving || *p_bsdir == 'b')
+       else if (((flags & BROWSE_SAVE) || *p_bsdir == 'b')
                && buf != NULL && buf->b_ffname != NULL)
        {
            if (dflt == NULL || *dflt == NUL)
@@ -3129,7 +3132,36 @@ do_browse(saving, title, dflt, ext, initdir, filter, buf)
 #  endif
        )
            filter = BROWSE_FILTER_DEFAULT;
-       fname = gui_mch_browse(saving, title, dflt, ext, initdir, filter);
+       if (flags & BROWSE_DIR)
+       {
+#  if defined(HAVE_GTK2) || defined(WIN3264)
+           /* For systems that have a directory dialog. */
+           fname = gui_mch_browsedir(title, initdir);
+#  else
+           /* Generic solution for selecting a directory: select a file and
+            * remove the file name. */
+           fname = gui_mch_browse(0, title, dflt, ext, initdir, (char_u *)"");
+#  endif
+#  if !defined(HAVE_GTK2)
+           /* Win32 adds a dummy file name, others return an arbitrary file
+            * name.  GTK+ 2 returns only the directory, */
+           if (fname != NULL && *fname != NUL && !mch_isdir(fname))
+           {
+               /* Remove the file name. */
+               char_u      *s = get_past_head(fname);
+               char_u      *tail = gettail(fname);
+
+               while (tail > s && vim_ispathsep(tail[-1]))
+                   --tail;
+               if (tail == fname)
+                   *tail++ = '.';      /* use current dir */
+               *tail = NUL;
+           }
+#  endif
+       }
+       else
+           fname = gui_mch_browse(flags & BROWSE_SAVE,
+                                          title, dflt, ext, initdir, filter);
 
        /* We hang around in the dialog for a while, the user might do some
         * things to our files.  The Win32 dialog allows deleting or renaming
@@ -3150,7 +3182,7 @@ do_browse(saving, title, dflt, ext, initdir, filter, buf)
     {
        vim_free(last_dir);
        last_dir = vim_strsave(fname);
-       if (last_dir != NULL)
+       if (last_dir != NULL && !(flags & BROWSE_DIR))
        {
            *gettail(last_dir) = NUL;
            if (*last_dir == NUL)

diff --git a/src/proto/fold.pro b/src/proto/fold.pro
index 75af30563f435ba2bc94a1f154154faaf141f292..3318bbde757d5fad5146de43018b5a798bb1d740 100644 (file)
--- a/src/proto/fold.pro
+++ b/src/proto/fold.pro
@@ -35,6 +35,7 @@ void cloneFoldGrowArray __ARGS((garray_T *from, garray_T *to));
 void deleteFoldRecurse __ARGS((garray_T *gap));
 void foldMarkAdjust __ARGS((win_T *wp, linenr_T line1, linenr_T line2, long amount, long amount_after));
 int getDeepestNesting __ARGS((void));
+char_u *get_foldtext __ARGS((win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T *foldinfo, char_u *buf));
 void foldtext_cleanup __ARGS((char_u *str));
 int put_folds __ARGS((FILE *fd, win_T *wp));
 /* vim: set ft=c : */

diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro
index 58ad4f4eef3931674b0d3771423a42da787cb4eb..a953a1d3a54b2ffe62317beb5d2e71e0b9221acc 100644 (file)
--- a/src/proto/gui_w32.pro
+++ b/src/proto/gui_w32.pro
@@ -51,6 +51,7 @@ int gui_mch_maximized __ARGS((void));
 void gui_mch_newfont __ARGS((void));
 void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
 void mch_set_mouse_shape __ARGS((int shape));
+char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir));
 char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
 int get_cmd_args __ARGS((char *prog, char *cmdline, char ***argvp, char **tofree));
 int gui_is_win32s __ARGS((void));

diff --git a/src/vim.h b/src/vim.h
index 11ff2a526e532d039f89d71e70a7cac5e62cff2a..2ca581fe2662408d5686c90dc3fb214c3226aa30 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1664,6 +1664,8 @@ typedef int VimClipboard; /* This is required for the prototypes. */
 #  define BROWSE_FILTER_DEFAULT \
        (char_u *)"All Files (*)\t*\nC source (*.c, *.h)\t*.c;*.h\nC++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\nVim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
 # endif
+# define BROWSE_SAVE 1     /* flag for do_browse() */
+# define BROWSE_DIR 2      /* flag for do_browse() */
 #endif
 
 /* stop using fastcall for Borland */