]> granicus.if.org Git - vim/commitdiff
updated for version 7.0030
authorBram Moolenaar <Bram@vim.org>
Tue, 4 Jan 2005 21:38:36 +0000 (21:38 +0000)
committerBram Moolenaar <Bram@vim.org>
Tue, 4 Jan 2005 21:38:36 +0000 (21:38 +0000)
Filelist
runtime/doc/eval.txt
runtime/lang/menu_de_de.latin1.vim
runtime/syntax/spec.vim
src/ex_eval.c
src/gui_gtk.c
src/po/pl.po
src/structs.h
src/version.c
src/version.h

index cf9c2d6dd1da88939bc230772811b2cb5bee785b..e82988a5fa7007b818a096674cce4913a209ccab 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -342,17 +342,12 @@ SRC_AMI = \
                README_amisrc.txt.info \
                src.info \
                src/INSTALLami.txt \
-               src/Make_agui.mak \
-               src/Make_aros.mak \
                src/Make_dice.mak \
                src/Make_manx.mak \
                src/Make_morph.mak \
                src/Make_sas.mak \
-               src/gui_amiga.c \
-               src/gui_amiga.h \
                src/os_amiga.c \
                src/os_amiga.h \
-               src/proto/gui_amiga.pro \
                src/proto/os_amiga.pro \
                src/testdir/Make_amiga.mak \
                src/testdir/amiga.vim \
@@ -422,8 +417,6 @@ SRC_EXTRA = \
                README_os390.txt \
                src/Make_mint.mak \
                src/Make_ro.mak \
-               src/gui_beos.cc \
-               src/gui_beos.h \
                src/gui_riscos.c \
                src/gui_riscos.h \
                src/if_sniff.c \
@@ -436,9 +429,7 @@ SRC_EXTRA = \
                src/os_mint.h \
                src/os_riscos.c \
                src/os_riscos.h \
-               src/proto/gui_beos.pro \
                src/proto/gui_riscos.pro \
-               src/proto/os_beos.pro \
                src/proto/os_riscos.pro \
                src/os_vms_fix.com \
                src/toolbar.phi \
index 43d5954ec2d18360136ebe6b87a9d0ae16ce0617..5402a2cd41635567e52060451e85bbb115840b8a 100644 (file)
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jan 03
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jan 04
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -3524,11 +3524,13 @@ This would call the function "my_func_whizz(parameter)".
 
 :let &{option-name} = {expr1}                  *:let-option* *:let-star*
                        Set option {option-name} to the result of the
-                       expression {expr1}.  The value is always converted to
-                       the type of the option.
+                       expression {expr1}.  A String or Number value is
+                       always converted to the type of the option.
                        For an option local to a window or buffer the effect
                        is just like using the |:set| command: both the local
                        value and the global value is changed.
+                       Example: >
+                               :let &path = &path . ',/usr/local/include'
 
 :let &l:{option-name} = {expr1}
                        Like above, but only set the local value of an option
@@ -3538,6 +3540,25 @@ This would call the function "my_func_whizz(parameter)".
                        Like above, but only set the global value of an option
                        (if there is one).  Works like |:setglobal|.
 
+:let [{name1}, {name2}, ...] = {expr1}                 *:let-unpack*
+                       {expr1} must evaluate to a List.  The first item in
+                       the list is assigned to {name1}, the second item to
+                       {name2}, etc.
+                       The number of names must match the number of items in
+                       the List.
+                       Each name can be one of the items of the ":let"
+                       command as mentioned above.
+                       Example: >
+                               :let [s, item] = GetItem(s)
+
+:let [{name}, ..., ; {lastname}] = {expr1}
+                       Like above, but the List may have more items than
+                       there are names.  A list of the remaining items is
+                       assigned to {lastname}.  If there are no remaining
+                       items {lastname} is set to an empty list.
+                       Example: >
+                               :let [a, b; rest] = ["aval", "bval", 3, 4]
+<
                                                        *E106*
 :let {var-name}        ..      List the value of variable {var-name}.  Several
                        variable names may be given.
index 15ecf53d358acf8688e85d7cd2fca869ec5781aa..f0ed55f0499634accf16799dd45afe52de97cfae 100644 (file)
@@ -1,6 +1,6 @@
 " Menu Translations:   German / Deutsch
 " Maintainer:          Johannes Zellner <johannes@zellner.org>
-" Originally By:       Marcin Dalecki <dalecki@cs.net.pl>
+" Originally By:       Marcin Dalecki <martin@dalecki.de>
 " Last Change: Sat, 20 Apr 2002 19:02:42 CEST
 " vim:set foldmethod=marker tabstop=8:
 
index dcc9a54e6eafb691eeaee4fb6f658e79170494c4..cb2f30475f59246cec636c2e47a42205ecd4f0af 100644 (file)
@@ -3,7 +3,7 @@
 " Language:    SPEC: Build/install scripts for Linux RPM packages
 " Maintainer:  Donovan Rebbechi elflord@pegasus.rutgers.edu
 " URL:        http://pegasus.rutgers.edu/~elflord/vim/syntax/spec.vim
-" Last Change: Fri Dec 3 11:54 EST 2004 Martin Dalecki
+" Last Change: Fri Dec 3 11:54 EST 2004 Marcin Dalecki
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
index e2699bc74cbfa0bc06d5310958ad4aecd2955100..67f8b893e65681e860615d337490bbde6b932813 100644 (file)
@@ -1601,8 +1601,8 @@ ex_finally(eap)
                if (cstack->cs_pending[cstack->cs_idx] == CSTP_RETURN)
                {
                    report_discard_pending(CSTP_RETURN,
-                           cstack->cs_retvar[cstack->cs_idx]);
-                   discard_pending_return(cstack->cs_retvar[cstack->cs_idx]);
+                                          cstack->cs_rettv[cstack->cs_idx]);
+                   discard_pending_return(cstack->cs_rettv[cstack->cs_idx]);
                }
                if (pending == CSTP_ERROR && !did_emsg)
                    pending |= (THROW_ON_ERROR) ? CSTP_THROW : 0;
@@ -1647,7 +1647,7 @@ ex_endtry(eap)
     int                skip;
     int                rethrow = FALSE;
     int                pending = CSTP_NONE;
-    void       *retvar = NULL;
+    void       *rettv = NULL;
     struct condstack   *cstack = eap->cstack;
 
     if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0)
@@ -1746,7 +1746,7 @@ ex_endtry(eap)
            pending = cstack->cs_pending[idx];
            cstack->cs_pending[idx] = CSTP_NONE;
            if (pending == CSTP_RETURN)
-               retvar = cstack->cs_retvar[idx];
+               rettv = cstack->cs_rettv[idx];
            else if (pending & CSTP_THROW)
                current_exception = cstack->cs_exception[idx];
        }
@@ -1769,7 +1769,7 @@ ex_endtry(eap)
        if (!skip)
        {
            report_resume_pending(pending,
-                   (pending == CSTP_RETURN) ? retvar :
+                   (pending == CSTP_RETURN) ? rettv :
                    (pending & CSTP_THROW) ? (void *)current_exception : NULL);
            switch (pending)
            {
@@ -1790,7 +1790,7 @@ ex_endtry(eap)
                    ex_break(eap);
                    break;
                case CSTP_RETURN:
-                   do_return(eap, FALSE, FALSE, retvar);
+                   do_return(eap, FALSE, FALSE, rettv);
                    break;
                case CSTP_FINISH:
                    do_finish(eap, FALSE);
@@ -2023,8 +2023,8 @@ cleanup_conditionals(cstack, searched_cond, inclusive)
 
                    case CSTP_RETURN:
                        report_discard_pending(CSTP_RETURN,
-                               cstack->cs_retvar[idx]);
-                       discard_pending_return(cstack->cs_retvar[idx]);
+                                                     cstack->cs_rettv[idx]);
+                       discard_pending_return(cstack->cs_rettv[idx]);
                        cstack->cs_pending[idx] = CSTP_NONE;
                        break;
 
index e97dc4f4db5e4fd7b307bc218b3ad0168a96eb62..e9e6d5b52a52f7e6684b2bcc9d5fb59333c39a5e 100644 (file)
@@ -10,7 +10,7 @@
 /*
  * Porting to GTK+ was done by:
  *
- * (C) 1998,1999,2000 by Marcin Dalecki <dalecki@evision.ag>
+ * (C) 1998,1999,2000 by Marcin Dalecki <martin@dalecki.de>
  *
  * With GREAT support and continuous encouragements by Andy Kahn and of
  * course Bram Moolenaar!
index 303d3344ab71af11bdb8f3017677192f408d1b37..7f4030d942f99091111b30f7cf71aa8dc4ff7f36 100644 (file)
@@ -2,7 +2,7 @@
 # Polish Translation for Vim
 #
 # updated 2001 for vim-6.0
-# FIRST AUTHOR Marcin Dalecki <dalecki@cyber.cs.net.pl>, 2000.
+# FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000.
 # Mikolaj Machowski <mikmach@wp.pl>, 2004.
 #
 msgid ""
index 5a76036e806d9b42da95d7f181bfaa1c7a075b7d..0eba71f1afa391c8bd0a3e21338e4f2042088fc9 100644 (file)
@@ -598,7 +598,7 @@ struct condstack
     char       cs_flags[CSTACK_LEN];   /* CSF_ flags */
     char       cs_pending[CSTACK_LEN]; /* CSTP_: what's pending in ":finally"*/
     union {
-       void   *cs_pend_rv[CSTACK_LEN]; /* returnval for pending return */
+       void   *cs_pend_rv[CSTACK_LEN]; /* return typeval for pending return */
        void   *cs_pend_ex[CSTACK_LEN]; /* exception for pending throw */
     }          cs_pend;
     int                cs_line[CSTACK_LEN];    /* line number of ":while" line */
@@ -611,7 +611,7 @@ struct condstack
     char       cs_had_endwhile;        /* just found ":endwhile" */
     char       cs_had_finally;         /* just found ":finally" */
 };
-# define cs_retvar     cs_pend.cs_pend_rv
+# define cs_rettv      cs_pend.cs_pend_rv
 # define cs_exception  cs_pend.cs_pend_ex
 
 # define CSF_TRUE      1       /* condition was TRUE */
@@ -1827,10 +1827,6 @@ struct VimMenu
     HMENU      submenu_id;         /* If this is submenu, add children here */
     HWND       tearoff_handle;     /* hWnd of tearoff if created */
 #endif
-#if FEAT_GUI_BEOS
-    BMenuItem  *id;                /* Id of menu item */
-    BMenu      *submenu_id;        /* If this is submenu, add children here */
-#endif
 #ifdef FEAT_GUI_MAC
 /*  MenuHandle id; */
 /*  short      index;  */          /* the item index within the father menu */
@@ -1840,17 +1836,6 @@ struct VimMenu
     MenuHandle menu_handle;
     MenuHandle submenu_handle;
 #endif
-#if defined(FEAT_GUI_AMIGA)
-                                   /* only one of these will ever be set, but
-                                    * they are used to allow the menu routine
-                                    * to easily get a hold of the parent menu
-                                    * pointer which is needed by all items to
-                                    * form the chain correctly */
-    int                    id;             /* unused by the amiga, but used in the
-                                    * code kept for compatibility */
-    struct Menu            *menuPtr;
-    struct MenuItem *menuItemPtr;
-#endif
 #ifdef RISCOS
     int                *id;                /* Not used, but gui.c needs it */
     int                greyed_out;         /* Flag */
index f27f0eaea6191ae4d2bdd3a2802942077344cb39..106ca7478177afe1bd51196a1381e8d228f536bf 100644 (file)
@@ -848,9 +848,6 @@ list_version()
     MSG_PUTS(_("with X11-Athena GUI."));
 #    endif
 #   else
-#    ifdef FEAT_GUI_BEOS
-    MSG_PUTS(_("with BeOS GUI."));
-#    else
 #     ifdef FEAT_GUI_PHOTON
     MSG_PUTS(_("with Photon GUI."));
 #     else
@@ -873,7 +870,6 @@ list_version()
 #       endif
 #      endif
 #      endif
-#     endif
 #    endif
 #   endif
 #  endif
index c56ae4986ae3da5637cdf35bc28bb20b6756502d..d543509bae8f5ecd2d2718775871c5fcc60715b8 100644 (file)
@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT      "vim70aa"
 #define VIM_VERSION_SHORT      "7.0aa"
 #define VIM_VERSION_MEDIUM     "7.0aa ALPHA"
-#define VIM_VERSION_LONG       "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 3)"
-#define VIM_VERSION_LONG_DATE  "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 3, compiled "
+#define VIM_VERSION_LONG       "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 4)"
+#define VIM_VERSION_LONG_DATE  "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 4, compiled "