diff --git a/core/libs/ido-vertical-mode.el b/core/libs/ido-vertical-mode.el
index 447a98f8d..58bc111a3 100644
--- a/core/libs/ido-vertical-mode.el
+++ b/core/libs/ido-vertical-mode.el
@@ -158,8 +158,8 @@ so we can restore it when turning `ido-vertical-mode' off")
    " [Too big]"
    " [Confirm]"
    (concat "\n" indicator padding)                                           ; left bracket around the sole remaining completion
-   ""))                                                                        ; right bracket around the sole remaining completion
-
+   ""                                                                        ; right bracket around the sole remaining completion
+   ))
 
 (defun ido-vertical-or-horizontal-completions (name)
   (if (and ido-vertical-disable-if-short
@@ -318,7 +318,7 @@ so we can restore it when turning `ido-vertical-mode' off")
 
 (defun ido-vertical-disable-line-truncation ()
   "Prevent the newlines in the minibuffer from being truncated"
-  (setq-local truncate-lines nil))
+  (set (make-local-variable 'truncate-lines) nil))
 
 (defun ido-vertical-turn-on ()
   (if (and (eq nil ido-vertical-old-decorations)
diff --git a/core/libs/quelpa.el b/core/libs/quelpa.el
index f348af333..637aa9257 100644
--- a/core/libs/quelpa.el
+++ b/core/libs/quelpa.el
@@ -900,15 +900,25 @@ Return a cons cell whose `car' is the root and whose `cdr' is the repository."
   (quelpa-build--run-process-match
    "Fetch URL: \\(.*\\)" dir "git" "remote" "show" "-n" remote))
 
+(defvar quelpa--git-version :uninitialized)
+
 (defun quelpa-build--checkout-git (name config dir)
   "Check package NAME with config CONFIG out of git into DIR."
-  (let* ((repo (plist-get config :url))
+  (let* ((version-regexp-alist `(,@version-regexp-alist ("^[-._+ ]?.*$" . 0)))
+         (git-version (or (when (not (eq quelpa--git-version :uninitialized))
+                            quelpa--git-version)
+                          (setq quelpa--git-version (version-to-list
+                                                     (quelpa-build--run-process-match
+                                                      "git version \\(.*\\)"
+                                                      nil "git" "version")))))
+         (repo (plist-get config :url))
          (remote (or (plist-get config :remote) "origin"))
          (commit (or (plist-get config :commit)
                      (when-let ((branch (plist-get config :branch)))
                        (concat remote "/" branch))))
          (depth (or (plist-get config :depth) quelpa-git-clone-depth))
-         (partial (or (plist-get config :partial) quelpa-git-clone-partial))
+         (partial (and (or (plist-get config :partial) quelpa-git-clone-partial)
+                       (version-list-<= '(2 20) git-version)))
          (force (plist-get config :force))
          (use-current-ref (plist-get config :use-current-ref)))
     (when (string-match (rx bos "file://" (group (1+ anything))) repo)
diff --git a/layers/+web-services/pocket/README.org b/layers/+web-services/pocket/README.org
index 2775a450d..4f6acb687 100644
--- a/layers/+web-services/pocket/README.org
+++ b/layers/+web-services/pocket/README.org
@@ -4,7 +4,7 @@
 
 [[file:img/pocket.png]]
 
-* Table of Contents                                       :TOC_5_gh:noexport:
+* Table of Contents                     :TOC_5_gh:noexport:
 - [[#description][Description]]
   - [[#features][Features:]]
 - [[#install][Install]]
@@ -24,13 +24,13 @@ This layer adds [[https://getpocket.com/][Pocket]] support to Spacemacs via the
   status, etc.
 
 * Install
-To use this configuration layer, add it to your =~/.spacemacs=.  You
+To use this configuration layer, add it to your =~/.spacemacs=. You
 will need to add =pocket= to the existing
 =dotspacemacs-configuration-layers= list in this file.
 
 * Authentication
-Just run the =pocket-reader= command.  A URL will be copied to the
-clipboard/kill ring.  Open the URL in a web browser and follow the
+Just run the =pocket-reader= command. A URL will be copied to the
+clipboard/kill ring. Open the URL in a web browser and follow the
 instructions to log into your Pocket account.
 
 Note: Please ignore any =Page Not Found= error you might see on the
@@ -41,9 +41,9 @@ authorization completed by checking the file
 
 * Key bindings
 
-| Key binding | Description                                                       |
-|-------------+-------------------------------------------------------------------|
-| ~SPC a w p~ | Open pocket-reader buffer                                         |
+| Key binding | Description               |
+|-------------+---------------------------|
+| ~SPC a w p~ | Open pocket-reader buffer |
 
 ** Bindings in pocket-reader buffer
 
diff --git a/layers/LAYERS.org b/layers/LAYERS.org
index 3e86b07a0..81cd53cbd 100644
--- a/layers/LAYERS.org
+++ b/layers/LAYERS.org
@@ -183,7 +183,6 @@
   - [[#elfeed][Elfeed]]
   - [[#epub][Epub]]
   - [[#pdf][PDF]]
-  - [[#pocket][Pocket]]
   - [[#speed-reading][Speed Reading]]
 - [[#readmeorg-files-that-need-proper-tags][README.org files that need proper tags]]
   - [[#languagetool][LanguageTool]]
@@ -254,6 +253,7 @@
   - [[#confluence][Confluence]]
   - [[#eaf][Eaf]]
   - [[#evernote][Evernote]]
+  - [[#pocket][Pocket]]
   - [[#search-engine][Search Engine]]
   - [[#twitter][Twitter]]
   - [[#wakatime][Wakatime]]
@@ -2452,26 +2452,6 @@ Features:
 - Manipulate annotations.
 - Fit PDF to screen.
 
-** Pocket
-[[file:+readers/pocket/README.org]]
-
-This layer adds [[https://getpocket.com/][Pocket]] support to Spacemacs via the package
-[[https://github.com/alphapapa/pocket-reader.el][pocket-reader]].
-
-#+begin_quote
-This is a client for Pocket (getpocket.com). It allows you to manage
-your reading list: add, remove, delete, tag, view, favorite,
-etc. Doing so in Emacs with the keyboard is fast and efficient. Links
-can be opened in Emacs with any function, or in external browsers, and
-specific sites/URLs can be opened with specific browser
-functions. Views can be sorted by date, title, domain, tags, favorite,
-etc, and “limited” mutt-style. Items can be searched for using
-keywords, tags, favorite status, unread/archived status, etc. Items
-can optionally be colorized by site, making it easy to tell which
-items come from different sites. Items are grouped depending on the
-sort column.
-#+end_quote
-
 ** Speed Reading
 [[file:+readers/speed-reading/README.org][+readers/speed-reading/README.org]]
 
@@ -3235,6 +3215,19 @@ Features:
 - Search for notes using keywords
 - Move notes between notebooks
 
+** Pocket
+[[file:+web-services/pocket/README.org][+web-services/pocket/README.org]]
+
+This layer adds [[https://getpocket.com/][Pocket]] support to Spacemacs via the package
+[[https://github.com/alphapapa/pocket-reader.el][pocket-reader]].
+
+Features:
+- Manage reading list: add, remove, delete, tag, view, favorite, etc.
+- Open links in Emacs or external browser
+- Sort views by date, title, domain, tags, favorite, etc.
+- Search items by keywords, tags, favorite status, unread/archived
+  status, etc.
+
 ** Search Engine
 [[file:+web-services/search-engine/README.org][+web-services/search-engine/README.org]]