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

bundle/display.el

@@ -40,6 +40,9 @@
 (when (eq system-type 'windows-nt)
   (when (string= (system-name) "EVG02667NB")
     (add-to-list 'default-frame-alist '(font . "Iosevka Term-12"))))
+(when (eq system-type 'gnu/linux)
+  (when (string= (system-name) "XPS-8930.local")
+    (add-to-list 'default-frame-alist '(font . "Iosevka Term-12"))))
 
 (provide 'display)
 

bundle/os.el

@@ -25,6 +25,7 @@
         elpy-rpc-python-command "python3")
   (when (string= (system-name) "XPS-13-9380")))
 
+
 (provide 'os)
 
 ;; Local Variables:

elpa/archives/gnu/archive-contents

@@ -1743,9 +1743,9 @@
 		   ("Bastien Guerry" . "bzg@gnu.org"))
 		  (:maintainer "Bastien Guerry" . "bzg@gnu.org"))])
  (relint .
-	 [(1 14)
+	 [(1 15)
 	  ((xr
-	    (1 16))
+	    (1 17))
 	   (emacs
 	    (26 1)))
 	  "Elisp regexp mistake finder" tar
@@ -1921,7 +1921,7 @@
 		("Alex Harsanyi" . "AlexHarsanyi@gmail.com"))
 	       (:keywords "languages" "sql"))])
  (ssh-deploy .
-	     [(3 1 10)
+	     [(3 1 11)
 	      ((emacs
 		(25)))
 	      "Deployment via Tramp, global or per directory." tar
@@ -2309,7 +2309,7 @@
 	 ("Thien-Thi Nguyen" . "ttn@gnu.org"))
 	(:keywords "multimedia" "xpm"))])
  (xr .
-     [(1 16)
+     [(1 17)
       ((emacs
 	(26 1)))
       "Convert string regexp to rx notation" tar

elpa/archives/gnu/archive-contents.signed

@@ -1 +1 @@
-Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) <elpasign@elpa.gnu.org> (trust undefined) created at 2020-03-04T11:05:02+0100 using RSA
+Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) <elpasign@elpa.gnu.org> (trust undefined) created at 2020-03-08T22:05:02+0100 using RSA

elpa/dashboard-20200306.1344/dashboard-pkg.el

@@ -1,4 +1,4 @@
-(define-package "dashboard" "20200225.745" "A startup screen extracted from Spacemacs"
+(define-package "dashboard" "20200306.1344" "A startup screen extracted from Spacemacs"
   '((emacs "25.3")
     (page-break-lines "0.11"))
   :keywords

elpa/dashboard-20200306.1344/dashboard-widgets.el

@@ -20,6 +20,8 @@
 
 ;;; Code:
 
+(require 'cl-lib)
+
 ;; Compiler pacifier
 (declare-function all-the-icons-icon-for-dir "ext:all-the-icons.el")
 (declare-function all-the-icons-icon-for-file "ext:all-the-icons.el")
@@ -101,7 +103,7 @@ to the specified width, with aspect ratio preserved."
     "Welcome to the church of Emacs"
     "While any text editor can save your files,\
  only Emacs can save your soul"
-    "I showed you my source code,pls respond")
+    "I showed you my source code, pls respond")
   "A list of messages, one of which dashboard chooses to display."
   :type 'list
   :group 'dashboard)
@@ -548,7 +550,8 @@ WIDGET-PARAMS are passed to the \"widget-create\" function."
                              (all-the-icons-octicon "primitive-dot" :height 1.0 :v-adjust 0.01))
                             ((file-remote-p path)
                              (all-the-icons-octicon "radio-tower" :height 1.0 :v-adjust 0.01))
-                            (t (all-the-icons-icon-for-file (file-name-nondirectory path)))))))
+                            (t (all-the-icons-icon-for-file (file-name-nondirectory path)
+                                                            :v-adjust -0.05))))))
               (setq tag (concat icon " " ,@rest))))
 
           (widget-create 'item

elpa/ein-20200307.2048/ein-kernel.el

@@ -62,6 +62,12 @@
   :type 'list
   :group 'ein)
 
+(defcustom ein:on-kernel-connect-functions nil
+  "Abnormal hook that is run after a websocket connection is made
+to a jupyter kernel. Functions defined here must accept a single
+argument, which is the kernel that was just connected."
+  :type 'list
+  :group 'ein)
 
 
 ;;; Initialization and connection.
@@ -293,7 +299,8 @@ See https://github.com/ipython/ipython/pull/3307"
                             (let* ((websocket (websocket-client-data ws))
                                    (kernel (ein:$websocket-kernel websocket)))
                               (when (ein:kernel-live-p kernel)
-                                (ein:kernel-run-after-start-hook kernel)
+                                (ein:log 'verbose "ein:start-single-websocket: Running on-connect abnormal hooks.")
+                                (run-hook-with-args 'ein:on-kernel-connect-functions kernel)
                                 (when cb
                                   (funcall cb kernel)))
                               (ein:log 'verbose "WS opened: %s" (websocket-url ws))))
@@ -307,10 +314,6 @@ See https://github.com/ipython/ipython/pull/3307"
 (defun ein:kernel-on-connect (kernel content -metadata-not-used-)
   (ein:log 'info "Kernel connect_request_reply received."))
 
-(defun ein:kernel-run-after-start-hook (kernel)
-  (mapc #'ein:funcall-packed
-        (ein:$kernel-after-start-hook kernel)))
-
 (defun ein:kernel-disconnect (kernel)
   "Close websocket connection to running kernel, but do not
 delete the kernel on the server side"

elpa/ein-20200307.2048/ein-notebook.el

@@ -105,7 +105,7 @@ Current buffer for these functions is set to the notebook buffer.")
 (ein:deflocal ein:%notebook% nil
   "Buffer local variable to store an instance of `ein:$notebook'.")
 
-(defsubst ein:get-notebook () ein:%notebook%)
+(defun ein:get-notebook () ein:%notebook%)
 
 (defun ein:get-notebook-or-error ()
   (or (ein:get-notebook)

elpa/ein-20200307.2048/ein-notebooklist.el

@@ -40,6 +40,7 @@
 (declare-function ein:jupyter-get-default-kernel "ein-jupyter")
 (declare-function ein:jupyter-crib-running-servers "ein-jupyter")
 (declare-function ein:file-open "ein-file")
+(autoload 'ein:get-notebook "ein-notebook")
 
 (defcustom ein:notebooklist-login-timeout (truncate (* 6.3 1000))
   "Timeout in milliseconds for logging into server"

elpa/ein-20200307.2048/ein-pkg.el

@@ -1,4 +1,4 @@
-(define-package "ein" "20200301.802" "Emacs IPython Notebook"
+(define-package "ein" "20200307.2048" "Emacs IPython Notebook"
   '((emacs "25")
     (websocket "20190620.338")
     (anaphora "20180618")

elpa/ein-20200307.2048/poly-ein.el

@@ -40,23 +40,6 @@
                        (remove-hook (quote ,functions) x t)))
          ,functions))
 
-(defsubst poly-ein--retweak-input-mode ()
-  "Whenever we enter input cell, ensure behavioral uniformity."
-  (unless (eq 'ein:notebook-mode (caar minor-mode-map-alist))
-    ;; move `ein:notebook-mode' to the head of `minor-mode-map-alist'
-    (when-let ((entry (assq 'ein:notebook-mode minor-mode-map-alist)))
-      (setf minor-mode-map-alist
-            (cons entry
-                  (assq-delete-all 'ein:notebook-mode minor-mode-map-alist)))))
-  (when (ein:eval-if-bound 'display-line-numbers-mode)
-    (when (fboundp 'display-line-numbers-mode)
-      (display-line-numbers-mode -1)))
-  (when (ein:eval-if-bound 'undo-tree-mode)
-    (when (fboundp 'undo-tree-mode)
-      (undo-tree-mode -1)))
-  (when visual-line-mode
-    (visual-line-mode -1)))
-
 (defun poly-ein--narrow-to-inner (modifier f &rest args)
   (if (or pm-initialization-in-progress (not poly-ein-mode))
       (apply f args)
@@ -84,8 +67,6 @@
               'font-lock-fontify-buffer
               'font-lock-ensure))
 
-  (add-hook 'after-change-major-mode-hook #'poly-ein--retweak-input-mode t)
-
   ;; https://github.com/millejoh/emacs-ipython-notebook/issues/537
   ;; alternatively, filter-args on ad-should-compile but then we'd have to
   ;; match on function name
@@ -275,13 +256,20 @@ TYPE can be 'body, nil."
       (setq jit-lock-start (max jit-lock-start (car range)))
       (setq jit-lock-end (min jit-lock-end (cdr range))))))
 
-(defun poly-ein-undo-damage (type)
+(defun poly-ein-initialize (type)
   (poly-ein--remove-hook "polymode" after-change-functions)
   (poly-ein--remove-hook "polymode" syntax-propertize-extend-region-functions)
-
   (add-hook 'jit-lock-after-change-extend-region-functions #'poly-ein--hem-jit-lock t t)
   (setq jit-lock-contextually nil) ; else recenter font-lock-fontify-keywords-region
   (setq jit-lock-context-unfontify-pos nil)
+  (when (ein:eval-if-bound 'display-line-numbers-mode)
+    (when (fboundp 'display-line-numbers-mode)
+      (display-line-numbers-mode -1)))
+  (when (ein:eval-if-bound 'undo-tree-mode)
+    (when (fboundp 'undo-tree-mode)
+      (undo-tree-mode -1)))
+  (when visual-line-mode
+    (visual-line-mode -1))
   (if (eq type 'host)
       (setq syntax-propertize-function nil)
     (aif pm--syntax-propertize-function-original
@@ -324,18 +312,24 @@ But `C-x b` seems to consult `buffer-list' and not the C (window)->prev_buffers.
   (setq-local font-lock-dont-widen t)
   (setq-local syntax-propertize-chunks 0) ;; internal--syntax-propertize too far
   (add-hook 'buffer-list-update-hook #'poly-ein--record-window-buffer nil t)
-  (ein:notebook-mode))
+  (ein:notebook-mode)
+  (unless (eq 'ein:notebook-mode (caar minor-mode-map-alist))
+    ;; move `ein:notebook-mode' to the head of `minor-mode-map-alist'
+    (when-let ((entry (assq 'ein:notebook-mode minor-mode-map-alist)))
+      (setf minor-mode-map-alist
+	    (cons entry
+		  (assq-delete-all 'ein:notebook-mode minor-mode-map-alist))))))
 
 (defcustom pm-host/ein
   (pm-host-chunkmode :name "ein"
-                     :init-functions '(poly-ein-undo-damage))
+                     :init-functions '(poly-ein-initialize))
   "EIN host chunkmode"
   :group 'poly-hostmodes
   :type 'object)
 
 (defcustom pm-inner/ein-input-cell
   (pm-inner-overlay-chunkmode :name "ein-input-cell"
-                              :init-functions '(poly-ein-undo-damage poly-ein-init-input-cell))
+                              :init-functions '(poly-ein-initialize poly-ein-init-input-cell))
   "EIN input cell."
   :group 'poly-innermodes
   :type 'object)