Upgrade packages

elpa/company-20200317.2312/company-pkg.el

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

elpa/company-20200317.2312/company-yasnippet.el

@@ -110,20 +110,20 @@ It has to accept one argument: the snippet's name.")
         (mode major-mode)
         (file-name (buffer-file-name)))
     (with-current-buffer (company-doc-buffer)
-      (setq-local buffer-file-name file-name)
-      (yas-minor-mode 1)
-      (condition-case error
-        (yas-expand-snippet (yas--template-content template))
-       (error
-          (message "%s"  (error-message-string error))))
-      (delay-mode-hooks
-        (let ((inhibit-message t))
-          (if (eq mode 'web-mode)
+      (let ((buffer-file-name file-name))
+        (yas-minor-mode 1)
+        (condition-case error
+            (yas-expand-snippet (yas--template-content template))
+          (error
+           (message "%s"  (error-message-string error))))
+        (delay-mode-hooks
+          (let ((inhibit-message t))
+            (if (eq mode 'web-mode)
                 (progn
                   (setq mode 'html-mode)
                   (funcall mode))
-            (funcall mode)))
-         (ignore-errors (font-lock-ensure)))
+              (funcall mode)))
+          (ignore-errors (font-lock-ensure))))
       (current-buffer))))
 
 ;;;###autoload

elpa/company-20200317.2312/company.el

@@ -1146,7 +1146,8 @@ can retrieve meta-data for them."
   ;; It's mory efficient to fix it only when they are displayed.
   ;; FIXME: Adopt the current text's capitalization instead?
   (if (eq (company-call-backend 'ignore-case) 'keep-prefix)
-      (concat company-prefix (substring candidate (length company-prefix)))
+      (let ((prefix (company--clean-string company-prefix)))
+        (concat prefix (substring candidate (length prefix))))
     candidate))
 
 (defun company--should-complete ()
@@ -2282,6 +2283,7 @@ character, stripping the modifiers.  That character must be a digit."
 (defun company-doc-buffer (&optional string)
   (with-current-buffer (get-buffer-create "*company-documentation*")
     (erase-buffer)
+    (fundamental-mode)
     (when string
       (save-excursion
         (insert string)
@@ -2527,7 +2529,7 @@ If SHOW-VERSION is non-nil, show the version in the echo area."
                      (if company-common
                          (string-width company-common)
                        0)))
-         (_ (setq value (company--pre-render value)
+         (_ (setq value (company-reformat (company--pre-render value))
                   annotation (and annotation (company--pre-render annotation t))))
          (ann-ralign company-tooltip-align-annotations)
          (ann-truncate (< width
@@ -2788,7 +2790,7 @@ If SHOW-VERSION is non-nil, show the version in the echo area."
     (dotimes (_ len)
       (let* ((value (pop lines-copy))
              (annotation (company-call-backend 'annotation value)))
-        (setq value (company--clean-string (company-reformat value)))
+        (setq value (company--clean-string value))
         (when annotation
           (setq annotation (company--clean-string annotation))
           (when company-tooltip-align-annotations
@@ -3165,7 +3167,7 @@ Delay is determined by `company-tooltip-idle-delay'."
         comp msg)
 
     (while candidates
-      (setq comp (company-reformat (pop candidates))
+      (setq comp (company-reformat (company--clean-string (pop candidates)))
             len (+ len 1 (length comp)))
       (if (< i 10)
           ;; Add number.
@@ -3174,10 +3176,10 @@ Delay is determined by `company-tooltip-idle-delay'."
                                    'face 'company-echo))
             (cl-incf len 3)
             (cl-incf i)
-            (add-text-properties 3 (+ 3 (length company-common))
+            (add-text-properties 3 (+ 3 (string-width company-common))
                                  '(face company-echo-common) comp))
         (setq comp (propertize comp 'face 'company-echo))
-        (add-text-properties 0 (length company-common)
+        (add-text-properties 0 (string-width company-common)
                              '(face company-echo-common) comp))
       (if (>= len limit)
           (setq candidates nil)

elpa/ein-20200319.1342/ein-autoloads.el

@@ -322,7 +322,7 @@ Deal with security before main entry of ein:notebooklist-open*.
 CALLBACK takes two arguments, the buffer created by ein:notebooklist-open--success
 and the url-or-port argument of ein:notebooklist-open*.
 
-\(fn URL-OR-PORT CALLBACK &optional COOKIE-PLIST)" t nil)
+\(fn URL-OR-PORT CALLBACK &optional COOKIE-PLIST TOKEN)" t nil)
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-notebooklist" '("ein:" "render-" "generate-breadcrumbs")))
 

elpa/ein-20200319.1342/ein-jupyter.el

@@ -184,7 +184,10 @@ via a call to `ein:notebooklist-open'."
   (interactive)
   (when (ein:jupyter-server-process)
     (multiple-value-bind (url-or-port password) (ein:jupyter-server-conn-info)
-      (ein:notebooklist-login url-or-port callback))))
+      (if-let ((token (ein:notebooklist-token-or-password url-or-port)))
+	  (ein:notebooklist-login url-or-port callback nil token)
+	(ein:log 'error "`(ein:notebooklist-token-or-password %s)` must return non-nil"
+		 url-or-port)))))
 
 (defsubst ein:set-process-sentinel (proc url-or-port)
   "URL-OR-PORT might get redirected from (ein:jupyter-server-conn-info).

elpa/ein-20200319.1342/ein-notebooklist.el

@@ -656,14 +656,15 @@ or even this (if you want fast Emacs start-up)::
              (read-no-blanks-input (format "%s: " pw-prompt))))
 
 ;;;###autoload
-(defun ein:notebooklist-login (url-or-port callback &optional cookie-plist)
+(defun ein:notebooklist-login (url-or-port callback &optional cookie-plist token)
   "Deal with security before main entry of ein:notebooklist-open*.
 
 CALLBACK takes two arguments, the buffer created by ein:notebooklist-open--success
 and the url-or-port argument of ein:notebooklist-open*."
   (interactive `(,(ein:notebooklist-ask-url-or-port)
                  ,(lambda (buffer _url-or-port) (pop-to-buffer buffer))
-                 ,(if current-prefix-arg (ein:notebooklist-ask-user-pw-pair "Cookie name" "Cookie content"))))
+                 ,(if current-prefix-arg (ein:notebooklist-ask-user-pw-pair "Cookie name" "Cookie content"))
+		 nil))
   (unless callback (setq callback (lambda (buffer url-or-port))))
   (when cookie-plist
     (let* ((parsed-url (url-generic-parse-url (file-name-as-directory url-or-port)))
@@ -672,7 +673,7 @@ and the url-or-port argument of ein:notebooklist-open*."
       (cl-loop for (name content) on cookie-plist by (function cddr)
                for line = (mapconcat #'identity (list domain "FALSE" (car (url-path-and-query parsed-url)) (if securep "TRUE" "FALSE") "0" (symbol-name name) (concat content "\n")) "\t")
                do (write-region line nil (request--curl-cookie-jar) 'append))))
-  (let ((token (ein:notebooklist-token-or-password url-or-port)))
+  (let ((token (or token (ein:notebooklist-token-or-password url-or-port))))
     (cond ((null token) ;; don't know
            (ein:notebooklist-login--iteration url-or-port callback nil nil -1 nil))
           ((string= token "") ;; all authentication disabled

elpa/ein-20200319.1342/ein-pkg.el

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