← Back to branch summary

~ubuntu-branches/ubuntu/precise/zsh/precise

« back to all changes in this revision

Viewing changes to Src/options.c

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad
  • Date: 2011-01-09 23:10:24 UTC
  • mfrom: (2.1.25 sid)
  • Revision ID: james.westby@ubuntu.com-20110109231024-7egfs040r26fq7fa
Tags: 4.3.11-1ubuntu1
https://launchpad.net/bugs/700695
* Merge from debian unstable. (LP: #700695) 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:
Src/options.c
149
149
{{NULL, "histignorealldups",  0},                        HISTIGNOREALLDUPS},
150
150
{{NULL, "histignoredups",     0},                        HISTIGNOREDUPS},
151
151
{{NULL, "histignorespace",    0},                        HISTIGNORESPACE},
 
152
{{NULL, "histlexwords",       0},                        HISTLEXWORDS},
152
153
{{NULL, "histnofunctions",    0},                        HISTNOFUNCTIONS},
153
154
{{NULL, "histnostore",        0},                        HISTNOSTORE},
154
155
{{NULL, "histsubstpattern",   OPT_EMULATE},              HISTSUBSTPATTERN},
198
199
{{NULL, "octalzeroes",        OPT_EMULATE|OPT_SH},       OCTALZEROES},
199
200
{{NULL, "overstrike",         0},                        OVERSTRIKE},
200
201
{{NULL, "pathdirs",           OPT_EMULATE},              PATHDIRS},
 
202
{{NULL, "pathscript",         OPT_EMULATE|OPT_BOURNE},   PATHSCRIPT},
201
203
{{NULL, "posixaliases",       OPT_EMULATE|OPT_BOURNE},   POSIXALIASES},
202
204
{{NULL, "posixbuiltins",      OPT_EMULATE|OPT_BOURNE},   POSIXBUILTINS},
 
205
{{NULL, "posixcd",            OPT_EMULATE|OPT_BOURNE},   POSIXCD},
203
206
{{NULL, "posixidentifiers",   OPT_EMULATE|OPT_BOURNE},   POSIXIDENTIFIERS},
 
207
{{NULL, "posixjobs",          OPT_EMULATE|OPT_BOURNE},   POSIXJOBS},
 
208
{{NULL, "posixstrings",       OPT_EMULATE|OPT_BOURNE},   POSIXSTRINGS},
 
209
{{NULL, "posixtraps",         OPT_EMULATE|OPT_BOURNE},   POSIXTRAPS},
204
210
{{NULL, "printeightbit",      0},                        PRINTEIGHTBIT},
205
211
{{NULL, "printexitvalue",     0},                        PRINTEXITVALUE},
206
212
{{NULL, "privileged",         OPT_SPECIAL},              PRIVILEGED},
231
237
{{NULL, "shwordsplit",        OPT_EMULATE|OPT_BOURNE},   SHWORDSPLIT},
232
238
{{NULL, "singlecommand",      OPT_SPECIAL},              SINGLECOMMAND},
233
239
{{NULL, "singlelinezle",      OPT_KSH},                  SINGLELINEZLE},
 
240
{{NULL, "sourcetrace",        0},                        SOURCETRACE},
234
241
{{NULL, "sunkeyboardhack",    0},                        SUNKEYBOARDHACK},
235
242
{{NULL, "transientrprompt",   0},                        TRANSIENTRPROMPT},
236
243
{{NULL, "trapsasync",         0},                        TRAPSASYNC},
730
737
    } else if (!force && optno == MONITOR && value) {
731
738
        if (opts[optno] == value)
732
739
            return 0;
733
 
        if (interact && (SHTTY != -1)) {
 
740
        if (SHTTY != -1) {
734
741
            origpgrp = GETPGRP();
735
742
            acquire_pgrp();
736
743
        } else
746
753
    } else if ((optno == EMACSMODE || optno == VIMODE) && value) {
747
754
        zleentry(ZLE_CMD_SET_KEYMAP, optno);
748
755
        opts[(optno == EMACSMODE) ? VIMODE : EMACSMODE] = 0;
 
756
    } else if (optno == SUNKEYBOARDHACK) {
 
757
        /* for backward compatibility */
 
758
        keyboardhackchar = (value ? '`' : '\0');
749
759
    }
750
760
    opts[optno] = value;
751
761
    if (optno == BANGHIST || optno == SHINSTDIN)