summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2015-01-10 18:06:17 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2015-01-10 18:06:43 -0800
commit5caf317c3a29ca0091f7e19b4f923978aaa4b012 (patch)
treef211d0e2db71ecf2f2c380f9320624f5caa4d992
parentaaa19267c29afdd4ef558264803a6a65120d2a12 (diff)
downloadzsh-5caf317c3a29ca0091f7e19b4f923978aaa4b012.tar.gz
zsh-5caf317c3a29ca0091f7e19b4f923978aaa4b012.zip
unposted (cf. 34218): : remove -m from zmodload calls
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Base/Widget/_complete_debug2
-rw-r--r--Completion/compinstall2
-rw-r--r--Functions/Calendar/calendar2
-rw-r--r--Functions/Zftp/zfget_match2
5 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 605f58262..c2ccb53df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
2015-01-10 Barton E. Schaefer <schaefer@zsh.org>
+ * unposted (cf. 34218): Completion/Base/Widget/_complete_debug,
+ Completion/compinstall, Functions/Calendar/calendar,
+ Functions/Zftp/zfget_match: remove -m from zmodload calls
+
* 34212, 34313: Src/builtin.c: do not change unset-ness of special
parameters when exporting them
diff --git a/Completion/Base/Widget/_complete_debug b/Completion/Base/Widget/_complete_debug
index ba3d2b417..85a0f372a 100644
--- a/Completion/Base/Widget/_complete_debug
+++ b/Completion/Base/Widget/_complete_debug
@@ -9,7 +9,7 @@ local pager w="${(qq)words}"
integer debug_fd=-1
{
if [[ -t 2 ]]; then
- zmodload -m -F zsh/files b:zf_ln 2>/dev/null &&
+ zmodload -F zsh/files b:zf_ln 2>/dev/null &&
zf_ln -fn =(<<<'') $tmp &&
exec {debug_fd}>&2 2>| $tmp
fi
diff --git a/Completion/compinstall b/Completion/compinstall
index 2f99d270d..afa517edb 100644
--- a/Completion/compinstall
+++ b/Completion/compinstall
@@ -3,7 +3,7 @@
emulate -L zsh
setopt extendedglob
-zmodload -m -F zsh/files b:zf_ln || return 1
+zmodload -F zsh/files b:zf_ln || return 1
local key
local compcontext=-default-
diff --git a/Functions/Calendar/calendar b/Functions/Calendar/calendar
index 0d651dc10..aff39b369 100644
--- a/Functions/Calendar/calendar
+++ b/Functions/Calendar/calendar
@@ -12,7 +12,7 @@ local -A reply
zmodload -i zsh/datetime || return 1
zmodload -i zsh/zutil || return 1
-zmodload -m -F zsh/files b:zf_ln || return 1
+zmodload -F zsh/files b:zf_ln || return 1
autoload -Uz calendar_{add,parse,read,scandate,show,lockfiles}
diff --git a/Functions/Zftp/zfget_match b/Functions/Zftp/zfget_match
index 3f2bbf30c..3a33c9886 100644
--- a/Functions/Zftp/zfget_match
+++ b/Functions/Zftp/zfget_match
@@ -1,7 +1,7 @@
# function zfget_match {
emulate -L zsh
-zmodload -m -F zsh/files b:zf_ln || return 1
+zmodload -F zsh/files b:zf_ln || return 1
# the zfcd hack: this may not be necessary here
if [[ $1 == $HOME || $1 == $HOME/* ]]; then