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

This commit is contained in:
Marcus Kammer 2020-04-13 16:04:53 +02:00
commit 9dc66de69d
495 changed files with 910 additions and 669 deletions

View file

@ -877,7 +877,7 @@
(:keywords "gnome" "c" "coding style") (:keywords "gnome" "c" "coding style")
(:url . "http://elpa.gnu.org/packages/gnome-c-style.html"))]) (:url . "http://elpa.gnu.org/packages/gnome-c-style.html"))])
(gnorb . (gnorb .
[(1 6 5) [(1 6 6)
((cl-lib ((cl-lib
(0 5))) (0 5)))
"Glue code between Gnus, Org, and BBDB" tar "Glue code between Gnus, Org, and BBDB" tar
@ -1396,7 +1396,7 @@
("Felix Lee <felix8a@gmail.com>, Michal Nazarewicz" . "mina86@mina86.com")) ("Felix Lee <felix8a@gmail.com>, Michal Nazarewicz" . "mina86@mina86.com"))
(:maintainer "Michal Nazarewicz" . "mina86@mina86.com"))]) (:maintainer "Michal Nazarewicz" . "mina86@mina86.com"))])
(oauth2 . (oauth2 .
[(0 12) [(0 13)
nil "OAuth 2.0 Authorization Protocol" single nil "OAuth 2.0 Authorization Protocol" single
((:url . "http://elpa.gnu.org/packages/oauth2.html") ((:url . "http://elpa.gnu.org/packages/oauth2.html")
(:keywords "comm") (:keywords "comm")
@ -1465,7 +1465,7 @@
("Ian Dunn" . "dunni@gnu.org")) ("Ian Dunn" . "dunni@gnu.org"))
(:keywords "convenience" "text" "org"))]) (:keywords "convenience" "text" "org"))])
(orgalist . (orgalist .
[(1 11) [(1 12)
((emacs ((emacs
(24 4))) (24 4)))
"Manage Org-like lists in non-Org buffers" single "Manage Org-like lists in non-Org buffers" single
@ -1549,7 +1549,7 @@
("Phillip Lord" . "phillip.lord@russet.org.uk")) ("Phillip Lord" . "phillip.lord@russet.org.uk"))
(:url . "http://elpa.gnu.org/packages/persist.html"))]) (:url . "http://elpa.gnu.org/packages/persist.html"))])
(phps-mode . (phps-mode .
[(0 3 38) [(0 3 39)
((emacs ((emacs
(26))) (26)))
"Major mode for PHP with Semantic integration" tar "Major mode for PHP with Semantic integration" tar
@ -1575,7 +1575,7 @@
("Mario Lang" . "mlang@delysid.org")) ("Mario Lang" . "mlang@delysid.org"))
(:maintainer "Mario Lang" . "mlang@delysid.org"))]) (:maintainer "Mario Lang" . "mlang@delysid.org"))])
(posframe . (posframe .
[(0 6 0) [(0 7 0)
((emacs ((emacs
(26))) (26)))
"Pop a posframe (just a frame) at point" single "Pop a posframe (just a frame) at point" single
@ -1812,6 +1812,18 @@
(:authors (:authors
("Jan Moringen" . "scymtym@users.sourceforge.net")) ("Jan Moringen" . "scymtym@users.sourceforge.net"))
(:keywords "rudel" "collaboration"))]) (: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 . (scroll-restore .
[(1 0) [(1 0)
nil "restore original position after scrolling" single nil "restore original position after scrolling" single

View file

@ -1 +1 @@
Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) <elpasign@elpa.gnu.org> (trust undefined) created at 2020-03-31T11: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

View file

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

View file

@ -33,8 +33,6 @@
;;; Code: ;;; Code:
(require 'company nil t)
(require 'eldoc nil t)
(require 'ein-node) (require 'ein-node)
(require 'ein-file) (require 'ein-file)
(require 'ein-notebooklist) (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))))) '(("Open scratch sheet" ein:notebook-scratchsheet-open)))))
map) 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 (define-minor-mode ein:notebook-mode
"A mode for jupyter notebooks. "A mode for jupyter notebooks.

View file

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

View file

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

View file

@ -117,6 +117,7 @@
(base64-decode-region (point-min) (point-max))))) (base64-decode-region (point-min) (point-max)))))
(defun ob-ein--proxy-images (json explicit-file) (defun ob-ein--proxy-images (json explicit-file)
(declare (indent defun))
(let (result) (let (result)
(ein:output-area-case-type (ein:output-area-case-type
json json
@ -129,12 +130,22 @@
(setq result value)))) (setq result value))))
result)) result))
(defun ob-ein--process-outputs (outputs params) (defun ob-ein--process-outputs (result-type cell params)
(let ((file (cdr (assoc :image params)))) (let* ((render (let ((stdout-p
(ein:join-str "\n" (lambda (out)
(cl-loop for o in outputs (and (equal "stream" (plist-get out :output_type))
collecting (ob-ein--proxy-images o file))))) (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) (defun ob-ein--get-name-create (src-block-info)
"Get the name of a src block or add a uuid as the name." "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) (defun ob-ein--execute-body (body params)
(let* ((buffer (current-buffer)) (let* ((buffer (current-buffer))
(processed-params (org-babel-process-params params)) (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)) (session (or (ein:aand (cdr (assoc :session processed-params))
(unless (string= "none" it) (unless (string= "none" it)
(format "%s" it))) (format "%s" it)))
@ -195,6 +207,7 @@ e.g., ob-c++ is not ob-C.el."
body body
(ein:$notebook-kernel notebook) (ein:$notebook-kernel notebook)
processed-params processed-params
result-type
result-params result-params
name)))) name))))
(save-excursion (save-excursion
@ -218,44 +231,64 @@ e.g., ob-c++ is not ob-C.el."
(if pending (if pending
(prog1 "" (prog1 ""
(ein:log 'error "ob-ein--execute-body: %s timed out" name)) (ein:log 'error "ob-ein--execute-body: %s timed out" name))
(ob-ein--process-outputs (ob-ein--process-outputs result-type
(ein:oref-safe (ein:shared-output-get-cell) 'outputs) (ein:shared-output-get-cell)
processed-params)))) processed-params))))
(org-babel-remove-result) (org-babel-remove-result)
*ob-ein-sentinel*))) *ob-ein-sentinel*)))
(defsubst ob-ein--execute-async-callback (buffer params result-params name) (defun ob-ein--execute-async-callback (buffer params result-type result-params name)
"Callback of 1-arity (the shared output cell) to update org buffer when "Return callback of 1-arity (the shared output cell) to update org buffer when
`ein:shared-output-eval-string' completes." `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 (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 "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!" one at a time. Further, we do not order the queued up blocks!"
(deferred:$ (deferred:$
@ -263,10 +296,12 @@ one at a time. Further, we do not order the queued up blocks!"
(deferred:lambda () (deferred:lambda ()
(let ((cell (ein:shared-output-get-cell))) (let ((cell (ein:shared-output-get-cell)))
(if (eq (slot-value cell 'callback) #'ignore) (if (eq (slot-value cell 'callback) #'ignore)
(let ((callback (let ((callback (ob-ein--execute-async-callback
(ob-ein--execute-async-callback buffer params buffer params result-type
result-params name))) result-params name))
(setf (slot-value cell 'callback) callback)) (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 ;; still pending previous callback
(deferred:nextc (deferred:wait 1200) self))))) (deferred:nextc (deferred:wait 1200) self)))))
(deferred:nextc it (deferred:nextc it

View file

@ -199,7 +199,7 @@ Also highlights opening brackets without a matching bracket."
elm--font-lock-operators) elm--font-lock-operators)
nil nil)) nil nil))
(defun turn-on-elm-font-lock () (defun elm--font-lock-enable ()
"Turn on Elm font lock." "Turn on Elm font lock."
(setq font-lock-multiline t) (setq font-lock-multiline t)
(set-syntax-table elm--syntax-table) (set-syntax-table elm--syntax-table)

View file

@ -6,10 +6,6 @@
;; Author: 1997-1998 Guy Lapalme <lapalme@iro.umontreal.ca> ;; Author: 1997-1998 Guy Lapalme <lapalme@iro.umontreal.ca>
;; Keywords: indentation Elm layout-rule
;; Version: 1.2
;; URL: http://www.iro.umontreal.ca/~lapalme/layout/index.html
;; This file is not part of GNU Emacs. ;; This file is not part of GNU Emacs.
;; This file was adapted from `haskell-indent.el'. ;; This file was adapted from `haskell-indent.el'.
@ -1233,13 +1229,6 @@ Invokes `elm-indent-hook' if not nil."
(kill-local-variable 'indent-line-function) (kill-local-variable 'indent-line-function)
(kill-local-variable 'indent-region-function))) (kill-local-variable 'indent-region-function)))
;;;###autoload
(define-obsolete-function-alias 'turn-on-elm-indent 'elm-indent-mode)
(defun turn-off-elm-indent ()
"Turn off ``intelligent'' Elm indentation mode."
(elm-indent-mode nil))
(provide 'elm-indent) (provide 'elm-indent)
;;; elm-indent.el ends here ;;; elm-indent.el ends here

View file

@ -60,7 +60,7 @@ For Elm 0.18 and earlier, set this to '(\"elm-repl\")."
:group 'elm) :group 'elm)
(defvar elm-interactive-prompt-regexp "^[>|] " (defvar elm-interactive-prompt-regexp "^[>|] "
"Prompt for `run-elm-interactive'.") "Prompt for `elm-interactive'.")
(defcustom elm-reactor-command '("elm" "reactor") (defcustom elm-reactor-command '("elm" "reactor")
"The Elm Reactor command. "The Elm Reactor command.
@ -253,7 +253,7 @@ Stolen from haskell-mode."
;;;###autoload ;;;###autoload
(define-derived-mode elm-interactive-mode comint-mode "Elm Interactive" (define-derived-mode elm-interactive-mode comint-mode "Elm Interactive"
"Major mode for `run-elm-interactive'. "Major mode for `elm-interactive'.
\\{elm-interactive-mode-map}" \\{elm-interactive-mode-map}"
@ -263,10 +263,10 @@ Stolen from haskell-mode."
(add-hook 'comint-output-filter-functions #'elm-interactive--spot-prompt nil t) (add-hook 'comint-output-filter-functions #'elm-interactive--spot-prompt nil t)
(turn-on-elm-font-lock)) (elm--font-lock-enable))
;;;###autoload ;;;###autoload
(defun run-elm-interactive () (defun elm-interactive ()
"Run an inferior instance of `elm-repl' inside Emacs." "Run an inferior instance of `elm-repl' inside Emacs."
(interactive) (interactive)
(elm-interactive-kill-current-session) (elm-interactive-kill-current-session)
@ -283,6 +283,9 @@ Stolen from haskell-mode."
(setq-local elm-repl--origin origin)) (setq-local elm-repl--origin origin))
(pop-to-buffer buffer)))) (pop-to-buffer buffer))))
;;;###autoload
(define-obsolete-function-alias 'run-elm-interactive 'elm-interactive "2020-04")
(defun elm-repl-return-to-origin () (defun elm-repl-return-to-origin ()
"Jump back to the location from which we last jumped to the repl." "Jump back to the location from which we last jumped to the repl."
(interactive) (interactive)
@ -301,7 +304,7 @@ of the file specified."
(interactive) (interactive)
(save-buffer) (save-buffer)
(let ((import-statement (elm--build-import-statement))) (let ((import-statement (elm--build-import-statement)))
(run-elm-interactive) (elm-interactive)
(elm-interactive--send-command ":reset\n") (elm-interactive--send-command ":reset\n")
(elm-interactive--send-command import-statement))) (elm-interactive--send-command import-statement)))
@ -311,7 +314,7 @@ of the file specified."
(interactive "r") (interactive "r")
(let* ((to-push (buffer-substring-no-properties beg end)) (let* ((to-push (buffer-substring-no-properties beg end))
(lines (split-string (s-trim-right to-push) "\n"))) (lines (split-string (s-trim-right to-push) "\n")))
(run-elm-interactive) (elm-interactive)
(dolist (line lines) (dolist (line lines)
(elm-interactive--send-command (concat line " \\\n"))) (elm-interactive--send-command (concat line " \\\n")))
(elm-interactive--send-command "\n"))) (elm-interactive--send-command "\n")))
@ -321,7 +324,7 @@ of the file specified."
"Push the current top level declaration to the REPL." "Push the current top level declaration to the REPL."
(interactive) (interactive)
(let ((lines (elm--get-decl))) (let ((lines (elm--get-decl)))
(run-elm-interactive) (elm-interactive)
(dolist (line lines) (dolist (line lines)
(elm-interactive--send-command (concat line " \\\n"))) (elm-interactive--send-command (concat line " \\\n")))
(elm-interactive--send-command "\n"))) (elm-interactive--send-command "\n")))
@ -342,7 +345,7 @@ of the file specified."
;;; Reactor: ;;; Reactor:
;;;###autoload ;;;###autoload
(defun run-elm-reactor () (defun elm-reactor ()
"Run the Elm reactor process." "Run the Elm reactor process."
(interactive) (interactive)
(let ((default-directory (elm--find-dependency-file-path)) (let ((default-directory (elm--find-dependency-file-path))
@ -362,11 +365,14 @@ of the file specified."
(when proc (when proc
(set-process-filter proc 'comint-output-filter)))))) (set-process-filter proc 'comint-output-filter))))))
;;;###autoload
(define-obsolete-function-alias 'run-elm-reactor 'elm-reactor "2020-04")
(defun elm-reactor--browse (path &optional debug) (defun elm-reactor--browse (path &optional debug)
"Open (reactor-relative) PATH in browser with optional DEBUG. "Open (reactor-relative) PATH in browser with optional DEBUG.
Runs `elm-reactor' first." Runs `elm-reactor' first."
(run-elm-reactor) (elm-reactor)
(browse-url (format "http://localhost:%s/%s%s" elm-reactor-port path (if debug "?debug" "")))) (browse-url (format "http://localhost:%s/%s%s" elm-reactor-port path (if debug "?debug" ""))))
;;;###autoload ;;;###autoload
@ -821,6 +827,43 @@ EXPOSING"
name name
(concat (or .as module-name) suffix))))) (concat (or .as module-name) suffix)))))
;;;###autoload
(defun elm-expose-at-point ()
"Exposes identifier at point."
(interactive)
(save-excursion
;; If already at the beginning of defun then
;; elm-beginning-of-defun will go to previous defun. Thus we go
;; to the beginning of next defun and come back to make sure we
;; will arrive at correct place.
(elm-end-of-defun)
(elm-beginning-of-defun)
(let* (case-fold-search
(expose (cond
((looking-at (rx "type" (+ space) "alias" (+ space)))
(goto-char (match-end 0))
(word-at-point))
((looking-at (rx "type" (+ space)))
(goto-char (match-end 0))
(concat (word-at-point)
(if (y-or-n-p "Expose constructors? ")
"(..)"
"")))
((or (looking-at (rx (or "port" "module" "import") (+ space)))
(null (word-at-point)))
(user-error "No identifier at point"))
(t (word-at-point)))))
(goto-char (point-min))
(if (re-search-forward (rx bol "module" (+ (or space))
upper (* (or word (syntax symbol)))
(+ (any space ?\n)) "exposing" (+ (any space ?\n)) "(")
nil t)
(progn
(goto-char (match-end 0))
(insert expose)
(when (looking-at (rx (* (any space ?\n)) word))
(insert ", ")))
(error "Couldn't find module declaration")))))
(defun elm-documentation--show (documentation) (defun elm-documentation--show (documentation)
"Show DOCUMENTATION in a help buffer." "Show DOCUMENTATION in a help buffer."
@ -904,7 +947,7 @@ EXPOSING"
(defun elm-oracle--function-at-point () (defun elm-oracle--function-at-point ()
"Get the name of the function at point." "Get the name of the function at point."
(save-excursion (save-excursion
(skip-chars-forward "[A-Za-z0-9_.']") (skip-chars-forward "A-Za-z0-9_.'")
(let* ((_ (re-search-backward elm-oracle--pattern nil t)) (let* ((_ (re-search-backward elm-oracle--pattern nil t))
(beg (1+ (match-beginning 0))) (beg (1+ (match-beginning 0)))
(end (match-end 0)) (end (match-end 0))
@ -973,7 +1016,7 @@ elm-specific `completion-at-point' function."
#'elm-oracle-completion-at-point-function)) #'elm-oracle-completion-at-point-function))
(defvar ac-sources) (defvar ac-sources)
(defvar ac-source-elm (defvar elm-ac-source
`((candidates . (elm-oracle--get-completions ac-prefix t)) `((candidates . (elm-oracle--get-completions ac-prefix t))
(prefix . ,elm-oracle--pattern))) (prefix . ,elm-oracle--pattern)))
@ -981,19 +1024,19 @@ elm-specific `completion-at-point' function."
(defun elm-oracle-setup-ac () (defun elm-oracle-setup-ac ()
"Set up auto-complete support. "Set up auto-complete support.
Add this function to your `elm-mode-hook'." Add this function to your `elm-mode-hook'."
(add-to-list 'ac-sources 'ac-source-elm)) (add-to-list 'ac-sources 'elm-ac-source))
(declare-function company-begin-backend "company") (declare-function company-begin-backend "company")
(declare-function company-doc-buffer "company") (declare-function company-doc-buffer "company")
;;;###autoload ;;;###autoload
(defun company-elm (command &optional arg &rest ignored) (defun elm-company (command &optional arg &rest ignored)
"Provide completion info according to COMMAND and ARG. IGNORED is not used." "Provide completion info according to COMMAND and ARG. IGNORED is not used."
(interactive (list 'interactive)) (interactive (list 'interactive))
(when (derived-mode-p 'elm-mode) (when (derived-mode-p 'elm-mode)
(cl-case command (cl-case command
(interactive (company-begin-backend 'company-elm)) (interactive (company-begin-backend 'elm-company))
(sorted t) (sorted t)
(prefix (elm-oracle--completion-prefix-at-point)) (prefix (elm-oracle--completion-prefix-at-point))
(doc-buffer (elm-company--docbuffer arg)) (doc-buffer (elm-company--docbuffer arg))
@ -1001,6 +1044,9 @@ Add this function to your `elm-mode-hook'."
(annotation (elm-company--signature arg)) (annotation (elm-company--signature arg))
(meta (elm-company--meta arg))))) (meta (elm-company--meta arg)))))
;;;###autoload
(define-obsolete-function-alias 'company-elm 'elm-company "2020-04")
(defun elm-company--candidates (prefix &optional callback) (defun elm-company--candidates (prefix &optional callback)
"Function providing candidates for company-mode for given PREFIX. "Function providing candidates for company-mode for given PREFIX.
Passes completions to CALLBACK if present, otherwise returns them." Passes completions to CALLBACK if present, otherwise returns them."

View file

@ -9,7 +9,7 @@
;;;### (autoloads nil "elm-font-lock" "elm-font-lock.el" (0 0 0 0)) ;;;### (autoloads nil "elm-font-lock" "elm-font-lock.el" (0 0 0 0))
;;; Generated autoloads from elm-font-lock.el ;;; Generated autoloads from elm-font-lock.el
(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "elm-font-lock" '("turn-on-elm-font-lock" "elm-"))) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "elm-font-lock" '("elm-")))
;;;*** ;;;***
@ -53,9 +53,7 @@ Invokes `elm-indent-hook' if not nil.
\(fn &optional ARG)" t nil) \(fn &optional ARG)" t nil)
(define-obsolete-function-alias 'turn-on-elm-indent 'elm-indent-mode) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "elm-indent" '("elm-indent-")))
(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "elm-indent" '("turn-off-elm-indent" "elm-indent-")))
;;;*** ;;;***
@ -64,17 +62,19 @@ Invokes `elm-indent-hook' if not nil.
;;; Generated autoloads from elm-interactive.el ;;; Generated autoloads from elm-interactive.el
(autoload 'elm-interactive-mode "elm-interactive" "\ (autoload 'elm-interactive-mode "elm-interactive" "\
Major mode for `run-elm-interactive'. Major mode for `elm-interactive'.
\\{elm-interactive-mode-map} \\{elm-interactive-mode-map}
\(fn)" t nil) \(fn)" t nil)
(autoload 'run-elm-interactive "elm-interactive" "\ (autoload 'elm-interactive "elm-interactive" "\
Run an inferior instance of `elm-repl' inside Emacs. Run an inferior instance of `elm-repl' inside Emacs.
\(fn)" t nil) \(fn)" t nil)
(define-obsolete-function-alias 'run-elm-interactive 'elm-interactive "2020-04")
(autoload 'elm-repl-load "elm-interactive" "\ (autoload 'elm-repl-load "elm-interactive" "\
Load an interactive REPL if there isn't already one running. Load an interactive REPL if there isn't already one running.
Changes the current root directory to be the directory with the closest Changes the current root directory to be the directory with the closest
@ -93,11 +93,13 @@ Push the current top level declaration to the REPL.
\(fn)" t nil) \(fn)" t nil)
(autoload 'run-elm-reactor "elm-interactive" "\ (autoload 'elm-reactor "elm-interactive" "\
Run the Elm reactor process. Run the Elm reactor process.
\(fn)" t nil) \(fn)" t nil)
(define-obsolete-function-alias 'run-elm-reactor 'elm-reactor "2020-04")
(autoload 'elm-preview-buffer "elm-interactive" "\ (autoload 'elm-preview-buffer "elm-interactive" "\
Preview the current buffer using Elm reactor (in debug mode if DEBUG is truthy). Preview the current buffer using Elm reactor (in debug mode if DEBUG is truthy).
@ -153,6 +155,11 @@ Import a module, refreshing if REFRESH is truthy.
\(fn REFRESH)" t nil) \(fn REFRESH)" t nil)
(autoload 'elm-expose-at-point "elm-interactive" "\
Exposes identifier at point.
\(fn)" t nil)
(autoload 'elm-documentation-lookup "elm-interactive" "\ (autoload 'elm-documentation-lookup "elm-interactive" "\
Lookup the documentation for a function, refreshing if REFRESH is truthy. Lookup the documentation for a function, refreshing if REFRESH is truthy.
@ -198,17 +205,19 @@ Add this function to your `elm-mode-hook'.
\(fn)" nil nil) \(fn)" nil nil)
(autoload 'company-elm "elm-interactive" "\ (autoload 'elm-company "elm-interactive" "\
Provide completion info according to COMMAND and ARG. IGNORED is not used. Provide completion info according to COMMAND and ARG. IGNORED is not used.
\(fn COMMAND &optional ARG &rest IGNORED)" t nil) \(fn COMMAND &optional ARG &rest IGNORED)" t nil)
(define-obsolete-function-alias 'company-elm 'elm-company "2020-04")
(autoload 'elm-test-project "elm-interactive" "\ (autoload 'elm-test-project "elm-interactive" "\
Run the elm-test command on the current project. Run the elm-test command on the current project.
\(fn)" t nil) \(fn)" t nil)
(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "elm-interactive" '("elm-" "ac-source-elm"))) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "elm-interactive" '("elm-")))
;;;*** ;;;***

View file

@ -1,4 +1,4 @@
(define-package "elm-mode" "20200301.19" "Major mode for Elm" (define-package "elm-mode" "20200406.214" "Major mode for Elm"
'((f "0.17") '((f "0.17")
(s "1.7.0") (s "1.7.0")
(emacs "25.1") (emacs "25.1")

View file

@ -126,7 +126,7 @@ Find the roots of this function in the c-awk-mode."
(define-key map (kbd "C-c C-l") 'elm-repl-load) (define-key map (kbd "C-c C-l") 'elm-repl-load)
(define-key map (kbd "C-c C-p") 'elm-repl-push) (define-key map (kbd "C-c C-p") 'elm-repl-push)
(define-key map (kbd "C-c C-e") 'elm-repl-push-decl) (define-key map (kbd "C-c C-e") 'elm-repl-push-decl)
(define-key map (kbd "C-c C-z") 'run-elm-interactive) (define-key map (kbd "C-c C-z") 'elm-interactive)
(define-key map (kbd "C-c C-a") 'elm-compile-add-annotations) (define-key map (kbd "C-c C-a") 'elm-compile-add-annotations)
(define-key map (kbd "C-c C-r") 'elm-compile-clean-imports) (define-key map (kbd "C-c C-r") 'elm-compile-clean-imports)
(define-key map (kbd "C-c C-c") 'elm-compile-buffer) (define-key map (kbd "C-c C-c") 'elm-compile-buffer)
@ -168,7 +168,7 @@ Find the roots of this function in the c-awk-mode."
(elm-format-on-save-mode)) (elm-format-on-save-mode))
(add-hook 'after-save-hook #'elm-mode-after-save-handler nil t) (add-hook 'after-save-hook #'elm-mode-after-save-handler nil t)
(turn-on-elm-font-lock)) (elm--font-lock-enable))
;; We enable intelligent indenting, but users can remove this from the ;; We enable intelligent indenting, but users can remove this from the
;; hook if they prefer. ;; hook if they prefer.

View file

@ -1,4 +1,4 @@
(define-package "leuven-theme" "20200122.1934" "Awesome Emacs color theme on white background" 'nil :keywords (define-package "leuven-theme" "20200406.1341" "Awesome Emacs color theme on white background" 'nil :keywords
'("color" "theme") '("color" "theme")
:authors :authors
'(("Fabrice Niessen <(concat \"fniessen\" at-sign \"pirilampo.org\")>")) '(("Fabrice Niessen <(concat \"fniessen\" at-sign \"pirilampo.org\")>"))

View file

@ -4,7 +4,7 @@
;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")> ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
;; URL: https://github.com/fniessen/emacs-leuven-theme ;; URL: https://github.com/fniessen/emacs-leuven-theme
;; Version: 20200102.2050 ;; Version: 20200406.1540
;; Keywords: color theme ;; Keywords: color theme
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
@ -766,7 +766,7 @@ more...")
`(org-example ((,class (:foreground "blue" :background "#EAFFEA")))) `(org-example ((,class (:foreground "blue" :background "#EAFFEA"))))
`(org-footnote ((,class (:underline t :foreground "#008ED1")))) `(org-footnote ((,class (:underline t :foreground "#008ED1"))))
`(org-formula ((,class (:foreground "chocolate1")))) `(org-formula ((,class (:foreground "chocolate1"))))
`(org-headline-done ((,class (:height 1.0 :weight normal :strike-through t :foreground "#ADADAD")))) `(org-headline-done ((,class (:height 1.0 :weight normal :foreground "#ADADAD"))))
`(org-hide ((,class (:foreground "#E2E2E2")))) `(org-hide ((,class (:foreground "#E2E2E2"))))
`(org-inlinetask ((,class (:box (:line-width 1 :color "#EBEBEB") :foreground "#777777" :background "#FFFFD6")))) `(org-inlinetask ((,class (:box (:line-width 1 :color "#EBEBEB") :foreground "#777777" :background "#FFFFD6"))))
`(org-latex-and-related ((,class (:foreground "#336699" :background "white")))) `(org-latex-and-related ((,class (:foreground "#336699" :background "white"))))

View file

@ -1,192 +0,0 @@
This is magit.info, produced by makeinfo version 6.5 from magit.texi.
Copyright (C) 2015-2020 Jonas Bernoulli <jonas@bernoul.li>
You can redistribute this document and/or modify it under the terms
of the GNU General Public License as published by the Free Software
Foundation, either version 3 of the License, or (at your option)
any later version.
This document is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
INFO-DIR-SECTION Emacs
START-INFO-DIR-ENTRY
* Magit: (magit). Using Git from Emacs with Magit.
END-INFO-DIR-ENTRY

Indirect:
magit.info-1: 754
magit.info-2: 302693

Tag Table:
(Indirect)
Node: Top754
Node: Introduction6439
Node: Installation11162
Node: Installing from Melpa11492
Node: Installing from the Git Repository12565
Node: Post-Installation Tasks14913
Node: Getting Started16198
Node: Interface Concepts21647
Node: Modes and Buffers22008
Node: Switching Buffers23757
Node: Naming Buffers28508
Node: Quitting Windows31815
Node: Automatic Refreshing of Magit Buffers33561
Node: Automatic Saving of File-Visiting Buffers36413
Node: Automatic Reverting of File-Visiting Buffers37598
Node: Risk of Reverting Automatically42593
Node: Sections44975
Node: Section Movement45901
Node: Section Visibility50811
Node: Section Hooks56888
Node: Section Types and Values59295
Node: Section Options60598
Node: Transient Commands61070
Node: Transient Arguments and Buffer Variables62307
Node: Completion Confirmation and the Selection69325
Node: Action Confirmation69769
Node: Completion and Confirmation77119
Node: The Selection80305
Node: The hunk-internal region83204
Node: Support for Completion Frameworks84293
Node: Additional Completion Options89200
Node: Running Git89799
Node: Viewing Git Output90072
Node: Git Process Status91205
Node: Running Git Manually92170
Node: Git Executable94640
Node: Global Git Arguments96922
Node: Inspecting97728
Node: Status Buffer98885
Node: Status Sections102875
Node: Status Header Sections108427
Node: Status Module Sections111057
Node: Status Options113562
Node: Repository List115031
Node: Logging118069
Node: Refreshing Logs120632
Node: Log Buffer122078
Node: Log Margin125934
Node: Select from Log129113
Node: Reflog131338
Node: Cherries132995
Node: Diffing134843
Node: Refreshing Diffs137924
Node: Commands Available in Diffs141503
Node: Diff Options144039
Node: Revision Buffer149077
Node: Ediffing152407
Node: References Buffer156055
Node: References Sections166575
Node: Bisecting167436
Node: Visiting Files and Blobs169249
Node: General-Purpose Visit Commands169719
Node: Visiting Files and Blobs from a Diff170675
Node: Blaming174134
Node: Manipulating180697
Node: Creating Repository181039
Node: Cloning Repository181594
Node: Staging and Unstaging186837
Node: Staging from File-Visiting Buffers190920
Node: Applying192088
Node: Committing193981
Node: Initiating a Commit194564
Node: Editing Commit Messages197949
Node: Using the Revision Stack200752
Node: Commit Pseudo Headers203803
Node: Commit Mode and Hooks205139
Node: Commit Message Conventions208077
Node: Branching210205
Node: The Two Remotes210431
Node: Branch Commands213084
Node: Branch Git Variables225467
Node: Auxiliary Branch Commands230858
Node: Merging231976
Node: Resolving Conflicts235984
Node: Rebasing240985
Node: Editing Rebase Sequences245844
Node: Information About In-Progress Rebase250172
Ref: Information About In-Progress Rebase-Footnote-1259054
Node: Cherry Picking259650
Node: Reverting263981
Node: Resetting265430
Node: Stashing267084
Node: Transferring271785
Node: Remotes272007
Node: Remote Commands272159
Node: Remote Git Variables276240
Node: Fetching277519
Node: Pulling280006
Node: Pushing281052
Node: Plain Patches284522
Node: Maildir Patches286013
Node: Miscellaneous287527
Node: Tagging287843
Node: Notes289771
Node: Submodules292143
Node: Listing Submodules292361
Node: Submodule Transient294289
Node: Subtree296811
Node: Worktree298787
Node: Common Commands299892
Node: Wip Modes302693
Node: Wip Graph307626
Node: Legacy Wip Modes309940
Node: Minor Mode for Buffers Visiting Files312835
Node: Minor Mode for Buffers Visiting Blobs319936
Node: Customizing320749
Node: Per-Repository Configuration322345
Node: Essential Settings324600
Node: Safety324924
Node: Performance326685
Node: Microsoft Windows Performance334323
Node: MacOS Performance335514
Ref: MacOS Performance-Footnote-1336529
Node: Plumbing336611
Node: Calling Git337440
Node: Getting a Value from Git338965
Node: Calling Git for Effect342051
Node: Section Plumbing348571
Node: Creating Sections348799
Node: Section Selection352699
Node: Matching Sections354498
Node: Refreshing Buffers360471
Node: Conventions363619
Node: Theming Faces363811
Node: FAQ371926
Node: FAQ - How to ...?372368
Node: How to show git's output?372728
Node: How to install the gitman info manual?373482
Node: How to show diffs for gpg-encrypted files?374452
Node: How does branching and pushing work?375048
Node: Can Magit be used as ediff-version-control-package?375411
Node: FAQ - Issues and Errors377400
Node: Magit is slow378296
Node: I changed several thousand files at once and now Magit is unusable378510
Node: I am having problems committing379239
Node: I am using MS Windows and cannot push with Magit379720
Node: I am using OS X and SOMETHING works in shell but not in Magit380337
Node: Expanding a file to show the diff causes it to disappear381168
Node: Point is wrong in the COMMIT_EDITMSG buffer381749
Node: The mode-line information isn't always up-to-date382795
Node: A branch and tag sharing the same name breaks SOMETHING383877
Node: My Git hooks work on the command-line but not inside Magit384763
Node: git-commit-mode isn't used when committing from the command-line385609
Node: Point ends up inside invisible text when jumping to a file-visiting buffer387876
Node: Debugging Tools388674
Node: Keystroke Index390853
Node: Command Index424837
Node: Function Index461862
Node: Variable Index478214

End Tag Table

Local Variables:
coding: utf-8
End:

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