Merge branch 'master' of https://gitlab.com/marcuskammer/emacs.d

.gitignore

@@ -7,3 +7,4 @@ transient
 bookmarks
 /history
 org-clock-save.el
+elpa/archives/melpa/archive-contents

bundle/custom.el

@@ -15,7 +15,6 @@
      ((fullscreen . maximized)
       (width . 90)
       (height . 52)
-      (font . "Iosevka Term-13.0")
       (vertical-scroll-bars)
       (horizontal-scroll-bars)
       (menu-bar-lines . 0)

bundle/display.el

@@ -28,6 +28,6 @@
 
 (when (eq system-type 'gnu/linux)
   (when (display-graphic-p)
-    (add-to-list 'default-frame-alist '(font . "Iosevka Term-14"))))
+    (add-to-list 'default-frame-alist '(font . "Iosevka Term Slab-14"))))
 
 (provide 'display)

elpa/company-20191127.16/company-capf.el

@@ -196,7 +196,7 @@ so we can't just use the preceding variable instead.")
                  ;; FIXME: Should probably use an additional heuristic:
                  ;; completion-at-point doesn't know when the user picked a
                  ;; particular candidate explicitly (it only checks whether
-                 ;; futher completions exist). Whereas company user can press
+                 ;; further completions exist). Whereas company user can press
                  ;; RET (or use implicit completion with company-tng).
                  (if (eq (try-completion arg table pred) t)
                      'finished 'sole)))))

elpa/company-20191127.16/company-pkg.el

@@ -1,4 +1,4 @@
-(define-package "company" "20191114.1356" "Modular text completion framework"
+(define-package "company" "20191127.16" "Modular text completion framework"
   '((emacs "24.3"))
   :keywords
   '("abbrev" "convenience" "matching")

elpa/company-20191127.16/company.el

@@ -554,7 +554,7 @@ This can also be a function."
 (defcustom company-auto-complete-chars '(?\  ?\) ?.)
   "Determines which characters trigger auto-completion.
 See `company-auto-complete'.  If this is a string, each string character
-tiggers auto-completion.  If it is a list of syntax description characters (see
+triggers auto-completion.  If it is a list of syntax description characters (see
 `modify-syntax-entry'), all characters with that syntax auto-complete.
 
 This can also be a function, which is called with the new input and should
@@ -3039,7 +3039,7 @@ Delay is determined by `company-tooltip-idle-delay'."
                             pto
                             (char-before pos)
                             (eq pos (overlay-start pto)))))
-      ;; Try to accomodate for the pseudo-tooltip overlay,
+      ;; Try to accommodate for the pseudo-tooltip overlay,
       ;; which may start at the same position if it's at eol.
       (when ptf-workaround
         (cl-decf beg)

elpa/elpy-20191127.2230/elpy-pkg.el

@@ -1,4 +1,4 @@
-(define-package "elpy" "20191124.2140" "Emacs Python Development Environment"
+(define-package "elpy" "20191127.2230" "Emacs Python Development Environment"
   '((company "0.9.2")
     (emacs "24.4")
     (highlight-indentation "0.5.0")

elpa/elpy-20191127.2230/elpy.el

@@ -860,7 +860,8 @@ item in another window.\n\n")
       (insert "\n\n"))
 
     ;; Pip not available in the rpc virtualenv
-    (when (elpy-rpc--pip-missing)
+    (when (and (elpy-rpc--pip-missing)
+               (not (gethash "jedi_version" config)))
       (elpy-insert--para
        "Pip doesn't seem to be installed in the dedicated virtualenv "
        "created by Elpy (" (elpy-rpc-get-virtualenv-path) "). "
@@ -976,8 +977,9 @@ item in another window.\n\n")
 
 (defun elpy-config--package-available-p (package)
   "Check if PACKAGE is installed in the rpc."
+  (with-elpy-rpc-virtualenv-activated
    (equal 0 (call-process elpy-rpc-python-command nil nil nil "-c"
-                         (format "import %s" package))))
+                          (format "import %s" package)))))
 
 (defun elpy-config--get-config ()
   "Return the configuration from `elpy-rpc-python-command'.