Upgrade packages

This commit is contained in:
Marcus Kammer 2020-03-24 18:20:37 +01:00
parent 02d0f01e6c
commit 0abf4ac8a8
498 changed files with 9053 additions and 10511 deletions

View file

@ -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")) '((emacs "24.3"))
:keywords :keywords
'("abbrev" "convenience" "matching") '("abbrev" "convenience" "matching")

View file

@ -110,7 +110,7 @@ It has to accept one argument: the snippet's name.")
(mode major-mode) (mode major-mode)
(file-name (buffer-file-name))) (file-name (buffer-file-name)))
(with-current-buffer (company-doc-buffer) (with-current-buffer (company-doc-buffer)
(setq-local buffer-file-name file-name) (let ((buffer-file-name file-name))
(yas-minor-mode 1) (yas-minor-mode 1)
(condition-case error (condition-case error
(yas-expand-snippet (yas--template-content template)) (yas-expand-snippet (yas--template-content template))
@ -123,7 +123,7 @@ It has to accept one argument: the snippet's name.")
(setq mode 'html-mode) (setq mode 'html-mode)
(funcall mode)) (funcall mode))
(funcall mode))) (funcall mode)))
(ignore-errors (font-lock-ensure))) (ignore-errors (font-lock-ensure))))
(current-buffer)))) (current-buffer))))
;;;###autoload ;;;###autoload

View file

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

View file

@ -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 CALLBACK takes two arguments, the buffer created by ein:notebooklist-open--success
and the url-or-port argument of ein:notebooklist-open*. 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"))) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-notebooklist" '("ein:" "render-" "generate-breadcrumbs")))

View file

@ -184,7 +184,10 @@ via a call to `ein:notebooklist-open'."
(interactive) (interactive)
(when (ein:jupyter-server-process) (when (ein:jupyter-server-process)
(multiple-value-bind (url-or-port password) (ein:jupyter-server-conn-info) (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) (defsubst ein:set-process-sentinel (proc url-or-port)
"URL-OR-PORT might get redirected from (ein:jupyter-server-conn-info). "URL-OR-PORT might get redirected from (ein:jupyter-server-conn-info).

View file

@ -656,14 +656,15 @@ or even this (if you want fast Emacs start-up)::
(read-no-blanks-input (format "%s: " pw-prompt)))) (read-no-blanks-input (format "%s: " pw-prompt))))
;;;###autoload ;;;###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*. "Deal with security before main entry of ein:notebooklist-open*.
CALLBACK takes two arguments, the buffer created by ein:notebooklist-open--success CALLBACK takes two arguments, the buffer created by ein:notebooklist-open--success
and the url-or-port argument of ein:notebooklist-open*." and the url-or-port argument of ein:notebooklist-open*."
(interactive `(,(ein:notebooklist-ask-url-or-port) (interactive `(,(ein:notebooklist-ask-url-or-port)
,(lambda (buffer _url-or-port) (pop-to-buffer buffer)) ,(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)))) (unless callback (setq callback (lambda (buffer url-or-port))))
(when cookie-plist (when cookie-plist
(let* ((parsed-url (url-generic-parse-url (file-name-as-directory url-or-port))) (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) (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") 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)))) 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 (cond ((null token) ;; don't know
(ein:notebooklist-login--iteration url-or-port callback nil nil -1 nil)) (ein:notebooklist-login--iteration url-or-port callback nil nil -1 nil))
((string= token "") ;; all authentication disabled ((string= token "") ;; all authentication disabled

View file

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

Some files were not shown because too many files have changed in this diff Show more