[Pkg-zsh-commits] [zsh] 01/05: Merge branch 'upstream' into debian

Axel Beckert abe at deuxchevaux.org
Tue May 5 23:32:26 UTC 2015


This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch debian
in repository zsh.

commit db38e167634b6c2217eec3a5aafc37c46d9e5a8d
Merge: 01eea47 3c3c8d3
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue May 5 23:32:59 2015 +0200

    Merge branch 'upstream' into debian

 .editorconfig                                     |    4 +
 .gitignore                                        |    2 +
 ChangeLog                                         | 1811 ++++++++++++++++++++-
 Completion/BSD/Command/_kld                       |    2 +-
 Completion/BSD/Command/_mixerctl                  |   11 +
 Completion/BSD/Command/_portsnap                  |    2 +-
 Completion/BSD/Type/_jails                        |    5 +
 Completion/Base/Completer/_expand                 |    2 +-
 Completion/Base/Completer/_external_pwds          |   39 +
 Completion/Base/Completer/_history                |    7 +-
 Completion/Base/Core/_main_complete               |   38 +-
 Completion/Base/Utility/_arguments                |    2 +-
 Completion/Base/Utility/_call_program             |    4 +-
 Completion/Base/Utility/_describe                 |   35 +-
 Completion/Base/Utility/_sequence                 |   22 +-
 Completion/Base/Utility/_store_cache              |   11 +-
 Completion/Base/Widget/_complete_debug            |    2 +
 Completion/Darwin/Command/_defaults               |    3 +-
 Completion/Darwin/Command/_fink                   |    7 +-
 Completion/Debian/Command/_apt                    |    1 +
 Completion/Debian/Command/_apt-file               |  100 +-
 Completion/Debian/Command/_apt-move               |    7 +-
 Completion/Debian/Command/_bts                    |    8 +-
 Completion/Debian/Command/_dak                    |   31 +-
 Completion/Debian/Command/_dchroot                |    8 +-
 Completion/Debian/Command/_dchroot-dsa            |    8 +-
 Completion/Debian/Command/_dpkg-buildpackage      |    2 +-
 Completion/Debian/Command/_dpkg-repack            |    2 +-
 Completion/Debian/Command/_lintian                |    2 +-
 Completion/Debian/Command/_madison                |    2 +-
 Completion/Debian/Command/_make-kpkg              |    6 +-
 Completion/Debian/Command/_pbuilder               |    4 +-
 Completion/Debian/Command/_reprepro               |   25 +-
 Completion/Debian/Command/_svn-buildpackage       |    4 +-
 Completion/Debian/Command/_update-alternatives    |    2 +-
 Completion/Debian/Command/_vim-addons             |   65 +-
 Completion/Debian/Type/_deb_architectures         |    9 +
 Completion/Linux/Command/_docker                  |  410 -----
 Completion/Linux/Command/_modutils                |    2 +-
 Completion/Linux/Command/_qdbus                   |  114 ++
 Completion/Linux/Command/_strace                  |    1 +
 Completion/Linux/Command/_sysstat                 |   77 +-
 Completion/Mandriva/Command/_rebootin             |   36 +-
 Completion/Mandriva/Command/_urpmi                |   47 +-
 Completion/Redhat/Command/_rpm                    |   29 +-
 Completion/Redhat/Command/_yum                    |   10 +-
 Completion/Solaris/Command/_beadm                 |  135 +-
 Completion/Solaris/Command/_gcore                 |   31 -
 Completion/Solaris/Command/_ps                    |   77 -
 Completion/Solaris/Command/_ptree                 |   26 +-
 Completion/Solaris/Type/_be_name                  |   17 +-
 Completion/Solaris/Type/_zones                    |    8 +-
 Completion/Unix/Command/_adb                      |    1 +
 Completion/Unix/Command/_arp                      |    8 +-
 Completion/Unix/Command/_at                       |   12 +-
 Completion/Unix/Command/_bittorrent               |   24 +-
 Completion/Unix/Command/_bogofilter               |   20 +-
 Completion/Unix/Command/_bpython                  |   12 +-
 Completion/Unix/Command/_bzr                      |   64 +-
 Completion/Unix/Command/_cabal                    |    9 +
 Completion/Unix/Command/_cdrdao                   |  246 ++-
 Completion/Unix/Command/_chmod                    |   48 +-
 Completion/Unix/Command/_chown                    |   25 +-
 Completion/Unix/Command/_cmp                      |   33 +
 Completion/Unix/Command/_comm                     |   17 +-
 Completion/Unix/Command/_cp                       |   75 +-
 Completion/Unix/Command/_cpio                     |   27 +-
 Completion/Unix/Command/_cut                      |   78 +-
 Completion/Unix/Command/_cvs                      |   13 +-
 Completion/Unix/Command/_date                     |   23 +-
 Completion/Unix/Command/_df                       |   23 +-
 Completion/Unix/Command/_django                   |   25 +-
 Completion/Unix/Command/_du                       |   83 +-
 Completion/Unix/Command/_ecasound                 |   28 +-
 Completion/Unix/Command/_elfdump                  |   47 +
 Completion/Unix/Command/_ffmpeg                   |   36 +-
 Completion/Unix/Command/_find                     |  201 ++-
 Completion/Unix/Command/_fuser                    |   94 +-
 Completion/Unix/Command/_gcc                      |    4 +-
 Completion/Unix/Command/_gcore                    |   50 +
 Completion/Unix/Command/_getent                   |    2 +-
 Completion/Unix/Command/_git                      |  273 ++--
 Completion/Unix/Command/_global                   |   16 +
 Completion/Unix/Command/_gpg                      |  126 +-
 Completion/Unix/Command/_grep                     |    2 +-
 Completion/Unix/Command/_hg                       |   25 +-
 Completion/Unix/Command/_iconv                    |   29 +-
 Completion/Unix/Command/_id                       |   60 +-
 Completion/Unix/Command/_ip                       |   10 +-
 Completion/Unix/Command/_join                     |   46 +-
 Completion/Unix/Command/_last                     |   66 +-
 Completion/Unix/Command/_ldd                      |   41 +-
 Completion/Unix/Command/_less                     |    8 +-
 Completion/Unix/Command/_lha                      |   51 +-
 Completion/Unix/Command/_ln                       |   27 +-
 Completion/Unix/Command/_ls                       |   44 +-
 Completion/Unix/Command/_lsof                     |   48 +-
 Completion/Unix/Command/_mail                     |    6 +-
 Completion/Unix/Command/_make                     |   12 +-
 Completion/Unix/Command/_md5sum                   |    5 +-
 Completion/Unix/Command/_metaflac                 |   25 +-
 Completion/Unix/Command/_mkdir                    |   66 +-
 Completion/Unix/Command/_module                   |    8 +-
 Completion/Unix/Command/_monotone                 |   36 +-
 Completion/Unix/Command/_mosh                     |    3 +-
 Completion/Unix/Command/_mount                    |   24 +-
 Completion/Unix/Command/_mpc                      |   18 +-
 Completion/Unix/Command/_mtr                      |   10 +-
 Completion/Unix/Command/_mysqldiff                |    3 -
 Completion/Unix/Command/_netcat                   |   19 +-
 Completion/Unix/Command/_nl                       |   40 +
 Completion/Unix/Command/_nm                       |   53 +-
 Completion/Unix/Command/_notmuch                  |    5 +-
 Completion/Unix/Command/_od                       |   28 +-
 Completion/Unix/Command/_patch                    |    4 +-
 Completion/Unix/Command/_pgrep                    |    4 +-
 Completion/Unix/Command/_ping                     |   34 +-
 Completion/Unix/Command/_pkg-config               |   24 +-
 Completion/Unix/Command/_prove                    |    6 +-
 Completion/Unix/Command/_ps                       |  188 +++
 Completion/Unix/Command/_pydoc                    |   42 +-
 Completion/Unix/Command/_python                   |   15 +-
 Completion/Unix/Command/_rar                      |   10 +-
 Completion/Unix/Command/_readelf                  |   62 +
 Completion/Unix/Command/_ri                       |    4 +-
 Completion/Unix/Command/_rm                       |   15 +-
 Completion/Unix/Command/_rsync                    |    4 +-
 Completion/Unix/Command/_rubber                   |   45 +-
 Completion/Unix/Command/_ruby                     |    2 +-
 Completion/Unix/Command/_runit                    |   73 +
 Completion/Unix/Command/_sablotron                |   16 +-
 Completion/Unix/Command/_screen                   |   31 +-
 Completion/Unix/Command/_sed                      |   42 +-
 Completion/Unix/Command/_sh                       |    3 +-
 Completion/Unix/Command/_sort                     |  107 +-
 Completion/Unix/Command/_stgit                    |    4 +-
 Completion/Unix/Command/_strip                    |   10 +-
 Completion/Unix/Command/_su                       |   21 +-
 Completion/Unix/Command/_sudo                     |   65 +-
 Completion/Unix/Command/_systemd                  |    4 +-
 Completion/Unix/Command/_telnet                   |   24 +-
 Completion/Unix/Command/_tidy                     |    4 +-
 Completion/Unix/Command/_tmux                     |   13 +-
 Completion/Unix/Command/_uname                    |  116 +-
 Completion/Unix/Command/_uniq                     |    4 +-
 Completion/Unix/Command/_user_admin               |    1 +
 Completion/Unix/Command/_vcsh                     |   88 +-
 Completion/Unix/Command/_vim                      |    2 +-
 Completion/Unix/Command/_wc                       |   26 +
 Completion/Unix/Command/_xargs                    |   74 +-
 Completion/Unix/Command/_xxd                      |   45 +
 Completion/Unix/Command/_zpool                    |   13 +-
 Completion/Unix/Type/_cmdstring                   |    6 +
 Completion/Unix/Type/_diff_options                |   13 +-
 Completion/Unix/Type/_directories                 |    2 +-
 Completion/Unix/Type/_file_systems                |   17 +-
 Completion/Unix/Type/_files                       |    6 +-
 Completion/Unix/Type/_find_net_interfaces         |   42 +
 Completion/Unix/Type/_net_interfaces              |   41 +-
 Completion/Unix/Type/_path_files                  |    9 +-
 Completion/Unix/Type/_pdf                         |    2 +-
 Completion/Unix/Type/_perl_modules                |    2 +-
 Completion/Unix/Type/_pids                        |    2 +-
 Completion/Unix/Type/_python_modules              |   44 +
 Completion/Unix/Type/_users                       |    4 +-
 Completion/X/Command/_rdesktop                    |   71 +
 Completion/X/Command/_urxvt                       |    4 +-
 Completion/X/Command/_x_utils                     |   31 +-
 Completion/X/Command/_xautolock                   |   25 +
 Completion/Zsh/Command/_bindkey                   |    1 +
 Completion/Zsh/Command/_command                   |   15 +-
 Completion/Zsh/Command/_emulate                   |    6 +-
 Completion/Zsh/Command/_fc                        |   86 +-
 Completion/Zsh/Command/_tcpsys                    |   18 +-
 Completion/Zsh/Command/_typeset                   |    2 +-
 Completion/Zsh/Command/_unhash                    |   11 +-
 Completion/Zsh/Command/_which                     |    3 +-
 Completion/Zsh/Command/_zattr                     |    9 +-
 Completion/Zsh/Command/_zle                       |    8 +-
 Completion/Zsh/Command/_zmodload                  |   42 +-
 Completion/Zsh/Command/_zstyle                    |   47 +-
 Completion/Zsh/Context/_brace_parameter           |  110 +-
 Completion/Zsh/Context/_subscript                 |    2 +-
 Completion/Zsh/Function/_add-zsh-hook             |   24 +
 Completion/Zsh/Function/_zcalc                    |    7 +
 Completion/Zsh/Type/_globflags                    |   11 +-
 Completion/Zsh/Type/_globquals                    |    2 +-
 Completion/Zsh/Type/_history_modifiers            |    1 +
 Completion/compaudit                              |    1 +
 Completion/compinit                               |   11 +-
 Completion/compinstall                            |   15 +-
 Completion/openSUSE/Command/_SUSEconfig           |   24 +-
 Completion/{Linux => openSUSE}/Command/_yast      |    7 +-
 Completion/openSUSE/Command/_yast2                |   30 -
 Config/version.mk                                 |    4 +-
 Doc/META-FAQ.yo                                   |    1 +
 Doc/Makefile.in                                   |    2 +-
 Doc/Zsh/arith.yo                                  |   12 +-
 Doc/Zsh/builtins.yo                               |  230 ++-
 Doc/Zsh/calsys.yo                                 |   35 +-
 Doc/Zsh/compsys.yo                                |  100 +-
 Doc/Zsh/contrib.yo                                |  143 +-
 Doc/Zsh/expn.yo                                   |   22 +-
 Doc/Zsh/ftp_sites.yo                              |   14 +-
 Doc/Zsh/func.yo                                   |    8 +-
 Doc/Zsh/grammar.yo                                |   49 +-
 Doc/Zsh/manual.yo                                 |    9 +-
 Doc/Zsh/metafaq.yo                                |   18 +-
 Doc/Zsh/mod_datetime.yo                           |   55 +-
 Doc/Zsh/mod_db_gdbm.yo                            |   51 +
 Doc/Zsh/mod_files.yo                              |    5 +-
 Doc/Zsh/mod_system.yo                             |    3 +
 Doc/Zsh/options.yo                                |   51 +-
 Doc/Zsh/params.yo                                 |  210 ++-
 Doc/Zsh/prompt.yo                                 |   11 +-
 Doc/Zsh/roadmap.yo                                |    6 +-
 Doc/Zsh/zle.yo                                    |  221 ++-
 Doc/zman.yo                                       |    1 +
 Doc/ztexi.yo                                      |    1 +
 Etc/FAQ.yo                                        |   59 +-
 Etc/zsh-development-guide                         |   11 +-
 Functions/Calendar/after                          |   67 +
 Functions/Calendar/before                         |   67 +
 Functions/Calendar/calendar                       |    4 +-
 Functions/Misc/run-help-ip                        |   42 +
 Functions/Misc/tetriscurses                       |  386 +++++
 Functions/VCS_Info/Backends/VCS_INFO_get_data_git |   18 +-
 Functions/VCS_Info/Backends/VCS_INFO_get_data_hg  |   17 +
 Functions/VCS_Info/VCS_INFO_quilt                 |   30 +-
 Functions/VCS_Info/vcs_info                       |    1 +
 Functions/Zftp/zfcd_match                         |    8 +-
 Functions/Zftp/zfcget                             |   11 +-
 Functions/Zftp/zfcput                             |   10 +-
 Functions/Zftp/zffcache                           |    5 +-
 Functions/Zftp/zfget_match                        |    9 +-
 Functions/Zftp/zfrglob                            |   15 +-
 Functions/Zftp/zftransfer                         |    9 +-
 Functions/Zftp/zftype                             |    6 +-
 Functions/Zftp/zfuget                             |   15 +-
 Functions/Zftp/zfuput                             |   15 +-
 Functions/Zle/edit-command-line                   |   12 +-
 NEWS                                              |   72 +-
 README                                            |  102 +-
 Src/Builtins/rlimits.c                            |    2 +-
 Src/Builtins/sched.c                              |    2 +-
 Src/Modules/attr.c                                |   67 +-
 Src/Modules/datetime.c                            |   21 +-
 Src/Modules/db_gdbm.c                             |  184 ++-
 Src/Modules/langinfo.c                            |    3 +-
 Src/Modules/tcp.c                                 |    4 +
 Src/Modules/zftp.c                                |    1 -
 Src/Modules/zpty.c                                |    6 +-
 Src/Modules/zselect.c                             |    2 +-
 Src/Modules/zutil.c                               |    8 +-
 Src/Zle/compcore.c                                |    8 +-
 Src/Zle/compctl.c                                 |   26 +-
 Src/Zle/complist.c                                |   28 +-
 Src/Zle/compmatch.c                               |    3 +
 Src/Zle/compresult.c                              |    7 +-
 Src/Zle/computil.c                                |    3 +-
 Src/Zle/iwidgets.list                             |   55 +-
 Src/Zle/textobjects.c                             |  322 ++++
 Src/Zle/zle.h                                     |   21 +-
 Src/Zle/zle.mdd                                   |    3 +-
 Src/Zle/zle_bindings.c                            |   10 +-
 Src/Zle/zle_hist.c                                |   28 +-
 Src/Zle/zle_keymap.c                              |   59 +-
 Src/Zle/zle_main.c                                |   72 +-
 Src/Zle/zle_misc.c                                |  238 ++-
 Src/Zle/zle_move.c                                |   61 +-
 Src/Zle/zle_params.c                              |    2 +-
 Src/Zle/zle_refresh.c                             |   26 +-
 Src/Zle/zle_tricky.c                              |   62 +-
 Src/Zle/zle_utils.c                               |  105 +-
 Src/Zle/zle_vi.c                                  |  411 +++--
 Src/Zle/zle_word.c                                |  113 +-
 Src/builtin.c                                     |  297 ++--
 Src/compat.c                                      |   17 +-
 Src/context.c                                     |  116 ++
 Src/exec.c                                        |  239 ++-
 Src/glob.c                                        |   27 +-
 Src/hashtable.c                                   |   14 +-
 Src/hist.c                                        |  357 ++--
 Src/init.c                                        |   70 +-
 Src/input.c                                       |   99 +-
 Src/jobs.c                                        |  180 +-
 Src/lex.c                                         |  770 +++++----
 Src/linklist.c                                    |    4 +
 Src/loop.c                                        |   51 +-
 Src/math.c                                        |   60 +-
 Src/mem.c                                         |    4 +
 Src/module.c                                      |    9 +-
 Src/options.c                                     |   12 +-
 Src/params.c                                      |   74 +-
 Src/parse.c                                       |  152 +-
 Src/pattern.c                                     |    2 +-
 Src/prompt.c                                      |    9 +-
 Src/signals.c                                     |   46 +-
 Src/sort.c                                        |    2 +-
 Src/subst.c                                       |  120 +-
 Src/text.c                                        |   19 +
 Src/utils.c                                       |  240 ++-
 Src/watch.c                                       |   27 +-
 Src/zsh.h                                         |  158 +-
 Src/zsh.mdd                                       |   14 +-
 Src/ztype.h                                       |    6 +
 Test/A02alias.ztst                                |   39 +
 Test/A04redirect.ztst                             |   34 +-
 Test/A05execution.ztst                            |   46 +-
 Test/A06assign.ztst                               |   38 +
 Test/A07control.ztst                              |   53 +
 Test/B02typeset.ztst                              |   17 +
 Test/B06fc.ztst                                   |   14 +
 Test/B07emulate.ztst                              |    4 +
 Test/C01arith.ztst                                |  103 +-
 Test/C02cond.ztst                                 |   38 +-
 Test/C04funcdef.ztst                              |   12 +
 Test/D02glob.ztst                                 |    2 +
 Test/D04parameter.ztst                            |   65 +-
 Test/D07multibyte.ztst                            |   20 +-
 Test/D08cmdsubst.ztst                             |   42 +
 Test/E01options.ztst                              |   39 +-
 Test/V07pcre.ztst                                 |    4 +-
 Test/V08zpty.ztst                                 |    3 +-
 Test/W01history.ztst                              |   60 +
 Test/X02zlevi.ztst                                |  491 +++++-
 Test/Y01completion.ztst                           |    4 +-
 Test/Y02compmatch.ztst                            |    4 +-
 Test/Y03arguments.ztst                            |    4 +-
 Test/comptest                                     |   16 +-
 configure.ac                                      |   58 +-
 331 files changed, 12133 insertions(+), 4423 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git



More information about the Pkg-zsh-commits mailing list