Upgrade packages

elpa/archives/gnu/archive-contents

@@ -1465,7 +1465,7 @@
 	      ("Ian Dunn" . "dunni@gnu.org"))
 	     (:keywords "convenience" "text" "org"))])
  (orgalist .
-	   [(1 11)
+	   [(1 12)
 	    ((emacs
 	      (24 4)))
 	    "Manage Org-like lists in non-Org buffers" single
@@ -1549,7 +1549,7 @@
 	     ("Phillip Lord" . "phillip.lord@russet.org.uk"))
 	    (:url . "http://elpa.gnu.org/packages/persist.html"))])
  (phps-mode .
-	    [(0 3 38)
+	    [(0 3 39)
 	     ((emacs
 	       (26)))
 	     "Major mode for PHP with Semantic integration" tar
@@ -1812,6 +1812,18 @@
 	  (:authors
 	   ("Jan Moringen" . "scymtym@users.sourceforge.net"))
 	  (:keywords "rudel" "collaboration"))])
+ (scanner .
+	  [(0 1)
+	   ((emacs
+	     (25 1))
+	    (dash
+	     (2 12 0)))
+	   "Scan documents and images" tar
+	   ((:url . "https://gitlab.com/rstocker/scanner.git")
+	    (:maintainer "Raffael Stocker" . "r.stocker@mnet-mail.de")
+	    (:authors
+	     ("Raffael Stocker" . "r.stocker@mnet-mail.de"))
+	    (:keywords "hardware" "multimedia"))])
  (scroll-restore .
 		 [(1 0)
 		  nil "restore original position after scrolling" single

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-04-08T23:05:02+0200 using RSA
+Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) <elpasign@elpa.gnu.org> (trust undefined) created at 2020-04-12T11:05:02+0200 using RSA

elpa/ein-20200410.1735/ein-jupyter.el

@@ -349,6 +349,8 @@ server command."
     ;; `ein:notebooklist-sentinel' frequently does not trigger
     (ein:notebooklist-list-remove url-or-port)
     (kill-buffer (ein:notebooklist-get-buffer url-or-port))
+    (when (ein:shared-output-healthy-p)
+      (kill-buffer (ein:shared-output-buffer)))
     (when log
       (with-current-buffer *ein:jupyter-server-buffer-name*
         (write-region (point-min) (point-max) log)))))

elpa/ein-20200410.1735/ein-notebook.el

@@ -33,8 +33,6 @@
 ;;; Code:
 
 
-(require 'company nil t)
-(require 'eldoc nil t)
 (require 'ein-node)
 (require 'ein-file)
 (require 'ein-notebooklist)
@@ -1284,14 +1282,6 @@ Tried add-function: the &rest from :around is an emacs-25 compilation issue."
          '(("Open scratch sheet" ein:notebook-scratchsheet-open)))))
   map)
 
-(defcustom ein:enable-eldoc-support nil
-  "Enable experimental support for eldoc in notebook buffers.
-
-Disabled by default, but if you want to help debug this feature set it to T and
-watch the fireworks!"
-  :type 'boolean
-  :group 'ein)
-
 (define-minor-mode ein:notebook-mode
   "A mode for jupyter notebooks.
 

elpa/ein-20200410.1735/ein-pkg.el

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

elpa/ein-20200410.1735/ein-shared-output.el

@@ -26,8 +26,6 @@
 ;; is needed.  This module buffer containing one special cell for that
 ;; purpose.
 
-;; TODO - Undo accounting is almost certainly broken by this module
-
 ;;; Code:
 
 (require 'eieio)
@@ -38,7 +36,8 @@
   ((cell-type :initarg :cell-type :initform "shared-output")
    ;; (element-names :initform (:prompt :output :footer))
    (callback :initarg :callback :initform #'ignore :type function)
-   (callback-called :initarg :callback-called :initform nil :type boolean))
+   (clear :initarg :clear :initform #'ignore :type function)
+   (results-inserted :initarg :results-inserted :initform nil :type boolean))
   "A singleton cell to show output from non-notebook buffers.")
 
 (defclass ein:shared-output ()
@@ -66,15 +65,17 @@ Called from ewoc pretty printer via `ein:cell-pp'."
   (setf (slot-value cell 'kernel) kernel)
   (apply #'ein:cell-execute-internal cell kernel code args))
 
+(cl-defmethod ein:cell-append-display-data ((_cell ein:shared-output-cell) _json)
+  "Do not display the plot in the shared output context.")
+
 (cl-defmethod ein:cell--handle-output ((cell ein:shared-output-cell)
                                        msg-type _content _metadata)
   (ein:log 'debug
     "ein:cell--handle-output (cell ein:shared-output-cell): %s" msg-type)
   (cl-call-next-method)
-  (aif (ein:oref-safe cell 'callback)
-      (progn
-        (funcall it cell)
-        (setf (slot-value cell 'callback-called) t))))
+  (awhen (ein:oref-safe cell 'callback)
+    (when (funcall it cell)
+      (setf (slot-value cell 'results-inserted) t))))
 
 (cl-defmethod ein:cell--handle-execute-reply ((cell ein:shared-output-cell)
                                               content _metadata)
@@ -82,21 +83,20 @@ Called from ewoc pretty printer via `ein:cell-pp'."
     "ein:cell--handle-execute-reply (cell ein:shared-output-cell): %s"
     content)
   (cl-call-next-method)
-  (aif (ein:oref-safe cell 'callback)
-    ;; clear the way for waiting block in `ob-ein--execute-async'
-    ;; but only after 2 seconds to allow for handle-output stragglers
-    ;; TODO avoid this hack
-      (progn
-        (unless (ein:oref-safe cell 'callback-called)
-          (funcall it cell)
-          (setf (slot-value cell 'callback-called) t))
-        (run-at-time 2 nil (lambda ()
-                             (ein:log 'debug "Clearing callback shared output cell")
-                             (setf (slot-value cell 'callback) #'ignore)
-                             (setf (slot-value cell 'callback-called) nil))))))
-
-
-;;; Main
+  (awhen (ein:oref-safe cell 'callback)
+    (when (funcall it cell)
+      (setf (slot-value cell 'results-inserted) t)))
+  (unless (slot-value cell 'results-inserted)
+    (awhen (ein:oref-safe cell 'clear)
+      (funcall it)))
+  ;; clear the way for waiting block in `ob-ein--execute-async'
+  ;; but only after 2 seconds to allow for handle-output stragglers
+  ;; TODO avoid this hack
+  (run-at-time 2 nil (lambda ()
+		       (ein:log 'debug "Clearing callback shared output cell")
+		       (setf (slot-value cell 'callback) #'ignore)
+		       (setf (slot-value cell 'clear) #'ignore)
+		       (setf (slot-value cell 'results-inserted) nil))))
 
 (defun ein:shared-output-create-buffer ()
   "Get or create the shared output buffer."
@@ -212,9 +212,6 @@ See also `ein:cell-max-num-outputs'."
 (defun ein:get-traceback-data--shared-output ()
   (ein:aand (ein:get-cell-at-point--shared-output) (ein:cell-get-tb-data it)))
 
-
-;;; ein:shared-output-mode
-
 (defvar ein:shared-output-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "\C-c\C-x" 'ein:tb-show)

elpa/ein-20200410.1735/ob-ein.el

@@ -117,6 +117,7 @@
       (base64-decode-region (point-min) (point-max)))))
 
 (defun ob-ein--proxy-images (json explicit-file)
+  (declare (indent defun))
   (let (result)
     (ein:output-area-case-type
      json
@@ -129,12 +130,22 @@
         (setq result value))))
     result))
 
-(defun ob-ein--process-outputs (outputs params)
-  (let ((file (cdr (assoc :image params))))
-    (ein:join-str "\n"
-                  (cl-loop for o in outputs
-                        collecting (ob-ein--proxy-images o file)))))
-
+(defun ob-ein--process-outputs (result-type cell params)
+  (let* ((render (let ((stdout-p
+			(lambda (out)
+			  (and (equal "stream" (plist-get out :output_type))
+			       (equal "stdout" (plist-get out :name))))))
+		   (if (eq result-type 'output)
+		       (lambda (out)
+			 (and (funcall stdout-p out) (plist-get out :text)))
+		     (lambda (out)
+		       (and (not (funcall stdout-p out))
+			    (ob-ein--proxy-images
+			      out (cdr (assoc :image params))))))))
+	 (outputs (cl-loop for out in (ein:oref-safe cell 'outputs)
+			   collect (funcall render out))))
+    (when outputs
+      (ein:join-str "\n" outputs))))
 
 (defun ob-ein--get-name-create (src-block-info)
   "Get the name of a src block or add a uuid as the name."
@@ -177,7 +188,8 @@ e.g., ob-c++ is not ob-C.el."
 (defun ob-ein--execute-body (body params)
   (let* ((buffer (current-buffer))
          (processed-params (org-babel-process-params params))
-         (result-params (cdr (assq :result-params params)))
+	 (result-type (cdr (assq :result-type params)))
+	 (result-params (cdr (assq :result-params params)))
          (session (or (ein:aand (cdr (assoc :session processed-params))
                                 (unless (string= "none" it)
                                   (format "%s" it)))
@@ -195,6 +207,7 @@ e.g., ob-c++ is not ob-C.el."
                      body
                      (ein:$notebook-kernel notebook)
                      processed-params
+		     result-type
                      result-params
                      name))))
     (save-excursion
@@ -218,44 +231,64 @@ e.g., ob-c++ is not ob-C.el."
                 (if pending
                     (prog1 ""
                       (ein:log 'error "ob-ein--execute-body: %s timed out" name))
-                  (ob-ein--process-outputs
-                   (ein:oref-safe (ein:shared-output-get-cell) 'outputs)
-                   processed-params))))
+                  (ob-ein--process-outputs result-type
+					   (ein:shared-output-get-cell)
+					   processed-params))))
       (org-babel-remove-result)
       *ob-ein-sentinel*)))
 
-(defsubst ob-ein--execute-async-callback (buffer params result-params name)
-  "Callback of 1-arity (the shared output cell) to update org buffer when
-`ein:shared-output-eval-string' completes."
-  (apply-partially
-   (lambda (buffer* params* result-params* name* cell)
-     (let* ((raw (aif (ein:oref-safe cell 'traceback)
-                     (ansi-color-apply (ein:join-str "\n" it))
-                   (ob-ein--process-outputs
-                    (ein:oref-safe cell 'outputs) params*)))
-            (result
-             (let ((tmp-file (org-babel-temp-file "ein-")))
-               (with-temp-file tmp-file raw)
-               (org-babel-result-cond result-params*
-                 raw (org-babel-import-elisp-from-file tmp-file '(16)))))
-            (info (org-babel-get-src-block-info 'light)))
-       (ein:log 'debug "ob-ein--execute-async-callback %s \"%s\" %s" name* result buffer*)
-       (save-excursion
-         (save-restriction
-           (with-current-buffer buffer*
-             (unless (stringp (org-babel-goto-named-src-block name*)) ;; stringp=error
-               (when info ;; kill #+RESULTS: (no-name)
-                 (setf (nth 4 info) nil)
-                 (org-babel-remove-result info))
-               (org-babel-remove-result) ;; kill #+RESULTS: name
-               (org-babel-insert-result
-                result
-                (cdr (assoc :result-params
-                            (third (org-babel-get-src-block-info)))))
-               (org-redisplay-inline-images)))))))
-   buffer params result-params name))
+(defun ob-ein--execute-async-callback (buffer params result-type result-params name)
+  "Return callback of 1-arity (the shared output cell) to update org buffer when
+`ein:shared-output-eval-string' completes.
 
-(defun ob-ein--execute-async (buffer body kernel params result-params name)
+The callback returns t if results containt RESULT-TYPE outputs, nil otherwise."
+  (apply-partially
+   (lambda (buffer* params* result-type* result-params* name* cell)
+     (when-let ((raw (aif (ein:oref-safe cell 'traceback)
+			 (ansi-color-apply (ein:join-str "\n" it))
+		       (ob-ein--process-outputs result-type* cell params*))))
+       (prog1 t
+	 (let ((result
+		(let ((tmp-file (org-babel-temp-file "ein-")))
+		  (with-temp-file tmp-file raw)
+		  (org-babel-result-cond result-params*
+		    raw (org-babel-import-elisp-from-file tmp-file '(16)))))
+	       (info (org-babel-get-src-block-info 'light)))
+	   (ein:log 'debug "ob-ein--execute-async-callback %s \"%s\" %s"
+		    name* result buffer*)
+	   (save-excursion
+	     (save-restriction
+	       (with-current-buffer buffer*
+		 (unless (stringp (org-babel-goto-named-src-block name*)) ;; stringp=error
+		   (when info ;; kill #+RESULTS: (no-name)
+		     (setf (nth 4 info) nil)
+		     (org-babel-remove-result info))
+		   (org-babel-remove-result) ;; kill #+RESULTS: name
+		   (org-babel-insert-result
+		    result
+		    (cdr (assoc :result-params
+				(third (org-babel-get-src-block-info)))))
+		   (org-redisplay-inline-images)))))))))
+   buffer params result-type result-params name))
+
+(defun ob-ein--execute-async-clear (buffer result-params name)
+  "Return function of 0-arity to clear *ob-ein-sentinel*."
+  (apply-partially
+   (lambda (buffer* result-params* name*)
+     (let ((info (org-babel-get-src-block-info 'light)))
+       (save-excursion
+	 (save-restriction
+	   (with-current-buffer buffer*
+	     (unless (stringp (org-babel-goto-named-src-block name*)) ;; stringp=error
+	       (when info ;; kill #+RESULTS: (no-name)
+		 (setf (nth 4 info) nil)
+		 (org-babel-remove-result info))
+	       (org-babel-remove-result) ;; kill #+RESULTS: name
+	       (org-babel-insert-result "" result-params*)
+	       (org-redisplay-inline-images)))))))
+   buffer result-params name))
+
+(defun ob-ein--execute-async (buffer body kernel params result-type result-params name)
   "As `ein:shared-output-get-cell' is a singleton, ob-ein can only execute blocks
 one at a time.  Further, we do not order the queued up blocks!"
   (deferred:$
@@ -263,10 +296,12 @@ one at a time.  Further, we do not order the queued up blocks!"
       (deferred:lambda ()
         (let ((cell (ein:shared-output-get-cell)))
           (if (eq (slot-value cell 'callback) #'ignore)
-              (let ((callback
-                     (ob-ein--execute-async-callback buffer params
-                                                     result-params name)))
-                (setf (slot-value cell 'callback) callback))
+              (let ((callback (ob-ein--execute-async-callback
+			       buffer params result-type
+			       result-params name))
+		    (clear (ob-ein--execute-async-clear buffer result-params name)))
+                (setf (slot-value cell 'callback) callback)
+		(setf (slot-value cell 'clear) clear))
             ;; still pending previous callback
             (deferred:nextc (deferred:wait 1200) self)))))
     (deferred:nextc it

elpa/polymode-20200411.915/polymode-core.el

@@ -1729,7 +1729,9 @@ Return FALLBACK if non-nil, otherwise the value of
                   (or (cdr (assq (intern (pm--symbol-name name))
                                  polymode-mode-name-aliases))
                       name)))
-            (mname (concat str "-mode")))
+            (mname (if (string-match-p "-mode$" str)
+                       str
+                     (concat str "-mode"))))
        (or
         ;; direct search
         (let ((mode (intern mname)))

elpa/polymode-20200411.915/polymode-pkg.el

@@ -1,4 +1,4 @@
-(define-package "polymode" "20200316.1314" "Extensible framework for multiple major modes"
+(define-package "polymode" "20200411.915" "Extensible framework for multiple major modes"
   '((emacs "25"))
   :keywords
   '("languages" "multi-modes" "processes")