summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_ncftp8
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index abba0622c..a13e05d08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-15 Mikael Magnusson <mikachu@gmail.com>
+
+ * Eric Cook: 36091: Completion/Unix/Command/_ncftp: search
+ XDG_DATA_HOME for bookmarks saved by lftp
+
2015-08-14 Oliver Kiddle <opk@zsh.org>
* 36146: Completion/Zsh/Type/_command_names,
diff --git a/Completion/Unix/Command/_ncftp b/Completion/Unix/Command/_ncftp
index 93de404aa..763a61344 100644
--- a/Completion/Unix/Command/_ncftp
+++ b/Completion/Unix/Command/_ncftp
@@ -1,6 +1,12 @@
#compdef ncftp lftp
-local expl bookmarks=$HOME/.$service/bookmarks
+local expl bookmarks XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share}
+
+if [[ $service = lftp ]]; then
+ bookmarks=$XDG_DATA_HOME/$service/bookmarks
+else
+ bookmarks=$HOME/.$service/bookmarks
+fi
if [[ -f $bookmarks ]]; then
bookmarks=(${"${(f)$(<$bookmarks)}"%%[[:space:],]*})