~ubuntu-branches/ubuntu/karmic/zsh/karmic

« back to all changes in this revision

Viewing changes to Src/Zle/computil.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-06-02 10:40:25 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20090602104025-lg6wynxpzqi08k2i
Tags: 4.3.10-1ubuntu1
* Resynchronise with Debian. Remaining changes:
  + debian/zshrc: Enable completions by default, unless
    skip_global_compinit is set

Show diffs side-by-side

added added

removed removed

Lines of Context:
4062
4062
                    len += addlen + 1;
4063
4063
            } else {
4064
4064
                /* The usual set of matcher possibilities. */
4065
 
                int ind;
 
4065
                convchar_t ind;
4066
4066
                if (m->line->tp == CPAT_EQUIV &&
4067
4067
                    m->word->tp == CPAT_EQUIV) {
4068
4068
                    /*
4086
4086
                         * word pattern.
4087
4087
                         */
4088
4088
                        if ((ind = pattern_match_equivalence
4089
 
                             (m->word, ind, mt, addc)) != -1) {
 
4089
                             (m->word, ind, mt, addc)) != CHR_INVALID) {
4090
4090
                            if (ret) {
4091
4091
                                if (imeta(ind)) {
4092
4092
                                    *p++ = Meta;