Update packages

elpa/archives/gnu/archive-contents

@@ -1411,7 +1411,7 @@
 	      (:maintainer "Michael Heerdegen" . "michael_heerdegen@web.de")
 	      (:url . "https://github.com/michael-heerdegen/on-screen.el"))])
  (org .
-      [(9 3)
+      [(9 3 1)
        nil "Outline-based notes management and organizer" tar
        ((:url . "https://orgmode.org")
 	(:maintainer "Carsten Dominik <carsten at orgmode dot org>")

elpa/elm-mode-20191228.2356/elm-indent.el

@@ -30,9 +30,7 @@
 ;;; Commentary:
 ;;; Code:
 (require 's)
-
-(with-no-warnings
-  (require 'cl))
+(require 'cl-lib)
 
 
 ;;; Customizations
@@ -420,7 +418,7 @@ Returns the location of the start of the comment, nil otherwise."
             (if (string-match "\\<type\\>" valname-string)
                 (elm-indent-push-pos-offset valname)
               (elm-indent-push-pos-offset valname 0)))
-        (case                           ; general case
+        (cl-case                           ; general case
             (elm-indent-find-case test)
           ;; "1.1.11"   1= vn gd rh arh
           (1 (elm-indent-push-pos valname)
@@ -469,9 +467,9 @@ Returns the location of the start of the comment, nil otherwise."
               (if last-line (elm-indent-push-pos-offset guard)))
           ;; "001100"  11= gd agd
           (11 (if (elm-indent-no-otherwise guard)
-		  (if (elm-indent-union-operator-p guard)
-		      (elm-indent-push-pos guard "| ")
-		      (elm-indent-push-pos guard "|> ")))
+                  (if (elm-indent-union-operator-p guard)
+                      (elm-indent-push-pos guard "| ")
+                    (elm-indent-push-pos guard "|> ")))
               (elm-indent-push-pos aft-guard))
           ;; "001000"  12= gd
           (12 (if (elm-indent-no-otherwise guard) (elm-indent-push-pos guard "|> "))
@@ -498,8 +496,6 @@ Returns the location of the start of the comment, nil otherwise."
          (rhs-sign (pop sep))
          (aft-rhs-sign (pop sep))
          (last-line (= end end-visible))
-         (is-where
-          (string-match "where[ \t]*" elm-indent-current-line-first-ident))
          (diff-first                 ; not a function def with the same name
           (or (null valname-string)
               (not (string= (s-trim valname-string)
@@ -527,37 +523,27 @@ Returns the location of the start of the comment, nil otherwise."
                   (elm-indent-push-pos-offset valname))))
         (if (string= elm-indent-current-line-first-ident ":")
             (if valname (elm-indent-push-pos valname))
-          (case                         ; general case
+          (cl-case                         ; general case
               (elm-indent-find-case test)
             ;; "1.1.11"   1= vn gd rh arh
-            (1 (if is-where
-                   (elm-indent-push-pos guard)
-                 (elm-indent-push-pos valname)
-                 (if diff-first (elm-indent-push-pos aft-rhs-sign))))
+            (1 (elm-indent-push-pos valname)
+               (if diff-first (elm-indent-push-pos aft-rhs-sign)))
             ;; "1.1.10"   2= vn gd rh
-            (2 (if is-where
-                   (elm-indent-push-pos guard)
-                 (elm-indent-push-pos valname)
-                 (if last-line
-                     (elm-indent-push-pos-offset guard))))
+            (2 (elm-indent-push-pos valname)
+               (if last-line
+                   (elm-indent-push-pos-offset guard)))
             ;; "1.1100"   3= vn gd agd
-            (3 (if is-where
-                   (elm-indent-push-pos-offset guard)
-                 (elm-indent-push-pos valname)
-                 (if diff-first
-                     (elm-indent-push-pos aft-guard))))
+            (3 (elm-indent-push-pos valname)
+               (if diff-first
+                   (elm-indent-push-pos aft-guard)))
             ;; "1.1000"   4= vn gd
-            (4 (if is-where
-                   (elm-indent-push-pos guard)
-                 (elm-indent-push-pos valname)
-                 (if last-line
-                     (elm-indent-push-pos-offset guard 2))))
+            (4 (elm-indent-push-pos valname)
+               (if last-line
+                   (elm-indent-push-pos-offset guard 2)))
             ;; "1.0011"   5= vn rh arh
-            (5 (if is-where
-                   (elm-indent-push-pos-offset valname)
-                 (elm-indent-push-pos valname)
-                 (if diff-first
-                     (elm-indent-push-pos aft-rhs-sign))))
+            (5 (elm-indent-push-pos valname)
+               (if diff-first
+                   (elm-indent-push-pos aft-rhs-sign)))
             ;; "1.0010"   6= vn rh
             (6 (elm-indent-push-pos valname)
                (elm-indent-push-pos valname valname-string)
@@ -569,19 +555,13 @@ Returns the location of the start of the comment, nil otherwise."
             (8 (elm-indent-push-pos valname)
                (elm-indent-push-pos-offset valname))
             ;; "001.11"   9= gd rh arh
-            (9 (if is-where
-                   (elm-indent-push-pos guard)
-                 (elm-indent-push-pos aft-rhs-sign)))
+            (9 (elm-indent-push-pos aft-rhs-sign))
             ;; "001.10"  10= gd rh
-            (10 (if is-where
-                    (elm-indent-push-pos guard)
-                  (if last-line
-                      (elm-indent-push-pos-offset guard))))
+            (10 (if last-line
+                    (elm-indent-push-pos-offset guard)))
             ;; "001100"  11= gd agd
-            (11 (if is-where
-                    (elm-indent-push-pos guard)
-                  (if (elm-indent-no-otherwise guard)
-                      (elm-indent-push-pos aft-guard))))
+            (11 (if (elm-indent-no-otherwise guard)
+                    (elm-indent-push-pos aft-guard)))
             ;; "001000"  12= gd
             (12 (if last-line (elm-indent-push-pos-offset guard 2)))
             ;; "000011"  13= rh arh
@@ -616,7 +596,7 @@ than an identifier, a guard or rhs."
       (if (and valname-string           ; special case for start keywords
                (string-match elm-indent-start-keywords-re valname-string))
           (elm-indent-push-pos-offset valname)
-        (case                           ; general case
+        (cl-case                           ; general case
             (elm-indent-find-case test)
           ;; "1.1.11"   1= vn gd rh arh
           (1 (elm-indent-push-pos aft-rhs-sign))
@@ -664,13 +644,13 @@ than an identifier, a guard or rhs."
   "Find indentation information for a value definition."
   (let ((elm-indent-info indent-info))
     (if (< start end-visible)
-        (case curr-line-type
-          (empty (elm-indent-empty start end end-visible indent-info))
-          (ident (elm-indent-ident start end end-visible indent-info))
-          (guard (elm-indent-guard start end end-visible indent-info))
-          (rhs   (elm-indent-rhs start end end-visible indent-info))
-          (comment (error "Comment indent should never happen"))
-          (other (elm-indent-other start end end-visible indent-info)))
+        (cl-case curr-line-type
+          ('empty (elm-indent-empty start end end-visible indent-info))
+          ('ident (elm-indent-ident start end end-visible indent-info))
+          ('guard (elm-indent-guard start end end-visible indent-info))
+          ('rhs   (elm-indent-rhs start end end-visible indent-info))
+          ('comment (error "Comment indent should never happen"))
+          ('other (elm-indent-other start end end-visible indent-info)))
       elm-indent-info)))
 
 (defun elm-indent-line-indentation (line-start line-end end-visible
@@ -680,7 +660,7 @@ Separate a line of program into valdefs between offside keywords
 and find indentation info for each part."
   (save-excursion
     ;; point is (already) at line-start
-    (assert (eq (point) line-start))
+    (cl-assert (eq (point) line-start))
     (let ((elm-indent-info indent-info)
           (start (or (elm-indent-in-comment line-start line-end)
                      (elm-indent-in-string line-start line-end))))
@@ -723,15 +703,13 @@ and find indentation info for each part."
               ((sep
                 (elm-indent-separate-valdef
                  (point) (line-end-position))))
-            ;; if the first ident is where or the start of a def
+            ;; if the first ident is the start of a def
             ;; keep it in a global variable
             (setq elm-indent-current-line-first-ident
-                  (if (string-match "where[ \t]*" (nth 1 sep))
-                      (nth 1 sep)
-                    (if (nth 5 sep)              ; is there a rhs-sign
-                        (if (= (char-after (nth 5 sep)) ?\:) ;is it a typdef
-                            ":" (nth 1 sep))
-                      "")))))
+                  (if (nth 5 sep)              ; is there a rhs-sign
+                      (if (= (char-after (nth 5 sep)) ?\:) ;is it a typdef
+                          ":" (nth 1 sep))
+                    ""))))
       (while contour-line               ; explore the contour points
         (setq line-start (pop contour-line))
         (goto-char line-start)
@@ -836,7 +814,7 @@ OPEN is the start position of the comment in which point is."
 (defun elm-indent-closing-keyword (start)
   (let ((open (save-excursion
                 (elm-indent-find-matching-start
-                 (case (char-after)
+                 (cl-case (char-after)
                    (?i "\\<\\(?:\\(in\\)\\|let\\)\\>")
                    (?o "\\<\\(?:\\(of\\)\\|case\\)\\>")
                    (?t "\\<\\(?:\\(then\\)\\|if\\)\\>")
@@ -1175,7 +1153,7 @@ TYPE is either 'guard or 'rhs."
               (let ((eqn (caar eqns-start)))
                 (setq lastpos (if (cdr eqns-start)
                                   (save-excursion
-                                    (goto-char (caadr eqns-start))
+                                    (goto-char (cl-caadr eqns-start))
                                     (forward-line -1)
                                     (line-end-position))
                                 end-block))

elpa/elm-mode-20191228.2356/elm-mode-autoloads.el

@@ -229,11 +229,6 @@ Major mode for editing Elm source code.
 ;;;### (autoloads nil "elm-tags" "elm-tags.el" (0 0 0 0))
 ;;; Generated autoloads from elm-tags.el
 
-(autoload 'elm-mode-goto-tag-at-point "elm-tags" "\
-Go to tag at point.
-
-\(fn)" t nil)
-
 (autoload 'elm-mode-generate-tags "elm-tags" "\
 Generate a TAGS file for the current project.
 

elpa/elm-mode-20191228.2356/elm-mode-pkg.el

@@ -1,9 +1,7 @@
-(define-package "elm-mode" "20191125.1919" "Major mode for Elm"
+(define-package "elm-mode" "20191228.2356" "Major mode for Elm"
   '((f "0.17")
-    (let-alist "1.0.4")
-    (seq "2.2")
     (s "1.7.0")
-    (emacs "24.4")
+    (emacs "25.1")
     (dash "2.13.0")
     (reformatter "0.3"))
   :authors

elpa/elm-mode-20191228.2356/elm-mode.el

@@ -4,8 +4,9 @@
 ;; Copyright (C) 2015, 2016  Bogdan Popa
 
 ;; Author: Joseph Collard
-;; Package-Requires: ((f "0.17") (let-alist "1.0.4") (seq "2.2") (s "1.7.0") (emacs "24.4") (dash "2.13.0") (reformatter "0.3"))
+;; Package-Requires: ((f "0.17") (s "1.7.0") (emacs "25.1") (dash "2.13.0") (reformatter "0.3"))
 ;; URL: https://github.com/jcollard/elm-mode
+;; Package-Version: 0-snapshot
 
 ;; This file is not part of GNU Emacs.
 
@@ -122,8 +123,6 @@ Find the roots of this function in the c-awk-mode."
   (let ((map (make-keymap)))
     (define-key map (kbd "C-c C-f") 'elm-mode-format-buffer)
     (define-key map (kbd "C-c M-t") 'elm-mode-generate-tags)
-    (define-key map (kbd "M-.") 'elm-mode-goto-tag-at-point)
-    (define-key map (kbd "M-,") 'pop-tag-mark)
     (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-e") 'elm-repl-push-decl)

elpa/elm-mode-20191228.2356/elm-tags.el

@@ -40,15 +40,6 @@
    (f-dirname load-file-name)
    "elm.tags"))
 
-;;;###autoload
-(defun elm-mode-goto-tag-at-point ()
-  "Go to tag at point."
-  (interactive)
-  (let ((tag (find-tag-default)))
-    (unless tag
-      (user-error "No tag candidate found around point"))
-    (find-tag tag)))
-
 ;;;###autoload
 (defun elm-mode-generate-tags ()
   "Generate a TAGS file for the current project."

elpa/elm-mode-20191228.2356/elm-util.el

@@ -27,6 +27,7 @@
 (require 'json)
 (require 'let-alist)
 (require 's)
+(require 'pulse)
 
 (require 'haskell-decl-scan nil 'noerror)
 (require 'inf-haskell nil 'noerror)

elpa/git-commit-20191116.2035/git-commit-pkg.el

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "git-commit" "20191116.2035" "Edit Git commit messages" '((emacs "25.1") (dash "20180910") (with-editor "20181103")) :commit "e311e444bddbd92ec945872e99c9cbf85d679d07" :keywords '("git" "tools" "vc") :maintainer '("Jonas Bernoulli" . "jonas@bernoul.li") :url "https://github.com/magit/magit")

elpa/git-commit-20191227.1317/git-commit-pkg.el

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "git-commit" "20191227.1317" "Edit Git commit messages" '((emacs "25.1") (dash "20180910") (transient "20190812") (with-editor "20181103")) :commit "49dfbdbe46acbf29c28e87f12dd6f722071ef0f9" :keywords '("git" "tools" "vc") :maintainer '("Jonas Bernoulli" . "jonas@bernoul.li") :url "https://github.com/magit/magit")

elpa/git-commit-20191227.1317/git-commit.el

@@ -11,8 +11,8 @@
 ;;	Marius Vollmer <marius.vollmer@gmail.com>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "25.1") (dash "20180910") (with-editor "20181103"))
-;; Package-Version: 20191116.2035
+;; Package-Requires: ((emacs "25.1") (dash "20180910") (transient "20190812") (with-editor "20181103"))
+;; Package-Version: 20191227.1317
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 
@@ -119,6 +119,7 @@
 (require 'magit-utils nil t)
 (require 'ring)
 (require 'server)
+(require 'transient)
 (require 'with-editor)
 
 (eval-when-compile
@@ -132,7 +133,11 @@
 (defvar font-lock-beg)
 (defvar font-lock-end)
 
+(declare-function magit-completing-read "magit-utils"
+                  (prompt collection &optional predicate require-match
+                          initial-input hist def fallback))
 (declare-function magit-expand-git-file-name "magit-git" (filename))
+(declare-function magit-git-lines "magit-git" (&rest args))
 (declare-function magit-list-local-branch-names "magit-git" ())
 (declare-function magit-list-remote-branch-names "magit-git"
                   (&optional remote relative))
@@ -368,18 +373,10 @@ This is only used if Magit is available."
            (define-key map (kbd "C-M-k") 'git-commit-next-message))
           (t
            (define-key map (kbd "M-p") 'git-commit-prev-message)
-           (define-key map (kbd "M-n") 'git-commit-next-message)
-           ;; Old bindings to avoid confusion
-           (define-key map (kbd "C-c C-x a") 'git-commit-ack)
-           (define-key map (kbd "C-c C-x i") 'git-commit-suggested)
-           (define-key map (kbd "C-c C-x m") 'git-commit-modified)
-           (define-key map (kbd "C-c C-x o") 'git-commit-cc)
-           (define-key map (kbd "C-c C-x p") 'git-commit-reported)
-           (define-key map (kbd "C-c C-x r") 'git-commit-review)
-           (define-key map (kbd "C-c C-x s") 'git-commit-signoff)
-           (define-key map (kbd "C-c C-x t") 'git-commit-test)))
+           (define-key map (kbd "M-n") 'git-commit-next-message)))
+    (define-key map (kbd "C-c C-i") 'git-commit-insert-pseudo-header)
     (define-key map (kbd "C-c C-a") 'git-commit-ack)
-    (define-key map (kbd "C-c C-i") 'git-commit-suggested)
+    (define-key map (kbd "C-c M-i") 'git-commit-suggested)
     (define-key map (kbd "C-c C-m") 'git-commit-modified)
     (define-key map (kbd "C-c C-o") 'git-commit-cc)
     (define-key map (kbd "C-c C-p") 'git-commit-reported)
@@ -704,6 +701,20 @@ With a numeric prefix ARG, go forward ARG comments."
 
 ;;; Headers
 
+(define-transient-command git-commit-insert-pseudo-header ()
+  "Insert a commit message pseudo header."
+  [["Insert ... by yourself"
+    ("a"   "Ack"         git-commit-ack)
+    ("m"   "Modified"    git-commit-modified)
+    ("r"   "Reviewed"    git-commit-review)
+    ("s"   "Signed-off"  git-commit-signoff)
+    ("t"   "Tested"      git-commit-test)]
+   ["Insert ... by someone"
+    ("C-c" "Cc"          git-commit-cc)
+    ("C-r" "Reported"    git-commit-reported)
+    ("C-i" "Suggested"   git-commit-suggested)
+    ("C-a" "Co-authored" git-commit-co-authored)]])
+
 (defun git-commit-ack (name mail)
   "Insert a header acknowledging that you have looked at the commit."
   (interactive (git-commit-self-ident))
@@ -731,22 +742,22 @@ With a numeric prefix ARG, go forward ARG comments."
 
 (defun git-commit-cc (name mail)
   "Insert a header mentioning someone who might be interested."
-  (interactive (git-commit-read-ident))
+  (interactive (git-commit-read-ident "Cc"))
   (git-commit-insert-header "Cc" name mail))
 
 (defun git-commit-reported (name mail)
   "Insert a header mentioning the person who reported the issue."
-  (interactive (git-commit-read-ident))
+  (interactive (git-commit-read-ident "Reported-by"))
   (git-commit-insert-header "Reported-by" name mail))
 
 (defun git-commit-suggested (name mail)
   "Insert a header mentioning the person who suggested the change."
-  (interactive (git-commit-read-ident))
+  (interactive (git-commit-read-ident "Suggested-by"))
   (git-commit-insert-header "Suggested-by" name mail))
 
 (defun git-commit-co-authored (name mail)
   "Insert a header mentioning the person who co-authored the commit."
-  (interactive (git-commit-read-ident))
+  (interactive (git-commit-read-ident "Co-authored-by"))
   (git-commit-insert-header "Co-authored-by" name mail))
 
 (defun git-commit-self-ident ()
@@ -761,9 +772,21 @@ With a numeric prefix ARG, go forward ARG comments."
             (ignore-errors (car (process-lines "git" "config" "user.email")))
             (read-string "Email: "))))
 
-(defun git-commit-read-ident ()
-  (list (read-string "Name: ")
-        (read-string "Email: ")))
+(defun git-commit-read-ident (prompt)
+  (if (require 'magit-git nil t)
+      (let ((str (magit-completing-read
+                  prompt
+                  (sort (delete-dups
+                         (magit-git-lines "log" "-n9999" "--format=%aN <%ae>"))
+                        'string<)
+                  nil nil nil 'git-commit-read-ident-history)))
+        (save-match-data
+          (if (string-match "\\`\\([^<]+\\) *<\\([^>]+\\)>\\'" str)
+              (list (string-trim (match-string 1 str))
+                    (string-trim (match-string 2 str)))
+            (user-error "Invalid input"))))
+    (list (read-string "Name: ")
+          (read-string "Email: "))))
 
 (defun git-commit-insert-header (header name email)
   (setq header (format "%s: %s <%s>" header name email))

elpa/magit-20191227.1438/magit-pkg.el

@@ -1,4 +1,4 @@
-(define-package "magit" "20191223.23" "A Git porcelain inside Emacs."
+(define-package "magit" "20191227.1438" "A Git porcelain inside Emacs."
   '((emacs "25.1")
     (async "20180527")
     (dash "20180910")