Upgrade packages

elpa/archives/gnu/archive-contents

@@ -581,7 +581,7 @@
 	       ("Leo Liu" . "sdl.web@gmail.com"))
 	      (:keywords "killing" "convenience"))])
  (ebdb .
-       [(0 6 13)
+       [(0 6 16)
 	((emacs
 	  (25 1))
 	 (cl-lib
@@ -610,7 +610,7 @@
 		 ((pyim
 		   (1 6 0))
 		  (ebdb
-		   (0 2)))
+		   (0 6 17)))
 		 "China-specific internationalization support for EBDB" single
 		 ((:url . "http://elpa.gnu.org/packages/ebdb-i18n-chn.html")
 		  (:authors
@@ -635,7 +635,7 @@
 	 ("Eduardo Ochs" . "eduardoochs@gmail.com"))
 	(:keywords "lisp" "e-scripts"))])
  (eglot .
-	[(1 5)
+	[(1 6)
 	 ((emacs
 	   (26 1))
 	  (jsonrpc
@@ -1549,7 +1549,7 @@
 	     ("Phillip Lord" . "phillip.lord@russet.org.uk"))
 	    (:url . "http://elpa.gnu.org/packages/persist.html"))])
  (phps-mode .
-	    [(0 3 41)
+	    [(0 3 42)
 	     ((emacs
 	       (26)))
 	     "Major mode for PHP with Semantic integration" tar
@@ -1871,6 +1871,13 @@
 	       ("Ralph Amissah & Ambrose Kofi Laing"))
 	      (:maintainer "Ralph Amissah" . "ralph.amissah@gmail.com")
 	      (:url . "http://www.sisudoc.org/"))])
+ (sm-c-mode .
+	    [(1 0)
+	     nil "C major mode based on SMIE" single
+	     ((:url . "http://elpa.gnu.org/packages/sm-c-mode.html")
+	      (:authors
+	       ("Stefan Monnier" . "monnier@iro.umontreal.ca"))
+	      (:maintainer "Stefan Monnier" . "monnier@iro.umontreal.ca"))])
  (smalltalk-mode .
 		 [(3 2 92)
 		  nil "Major mode for the GNU Smalltalk programming language" tar

elpa/log4e-20170401.1304/log4e-pkg.el

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "log4e" "20170401.1304" "provide logging framework for elisp" 'nil :commit "c69424e407be0d9d0e54b427d8b18b1ac5a607e2" :keywords '("log") :authors '(("Hiroaki Otsu" . "ootsuhiroaki@gmail.com")) :maintainer '("Hiroaki Otsu" . "ootsuhiroaki@gmail.com") :url "https://github.com/aki2o/log4e")

elpa/log4e-20200419.933/log4e-pkg.el

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "log4e" "20200419.933" "provide logging framework for elisp" 'nil :commit "2540cb8d8fbb4b039a9fe41dfd956817d7ac0337" :keywords '("log") :authors '(("Hiroaki Otsu" . "ootsuhiroaki@gmail.com")) :maintainer '("Hiroaki Otsu" . "ootsuhiroaki@gmail.com") :url "https://github.com/aki2o/log4e")

elpa/log4e-20200419.933/log4e.el

@@ -4,9 +4,9 @@
 
 ;; Author: Hiroaki Otsu <ootsuhiroaki@gmail.com>
 ;; Keywords: log
-;; Package-Version: 20170401.1304
+;; Package-Version: 20200419.933
 ;; URL: https://github.com/aki2o/log4e
-;; Version: 0.3.1
+;; Version: 0.3.2
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -109,6 +109,7 @@
                      '(msg &rest msgargs)
                    '(level msg &rest msgargs)))
         (buff (log4e--make-symbol-log-buffer prefix))
+        (msgbuff (log4e--make-symbol-msg-buffer prefix))
         (codsys (log4e--make-symbol-buffer-coding-system prefix))
         (logtmpl (log4e--make-symbol-log-template prefix))
         (timetmpl (log4e--make-symbol-time-template prefix))
@@ -121,9 +122,9 @@
        (defun ,(intern (concat prefix "--" (or suffix "log"))) ,argform
          ,(format "Do logging for %s level log.
 %sMSG/MSGARGS are passed to `format'."
-                  (or (eval level) "any")
+                  (if suffix level "any")
                   (if suffix "" "LEVEL is symbol as a log level in '(trace debug info warn error fatal).\n"))
-         (let ((log4e--current-msg-buffer ,(log4e--make-symbol-msg-buffer prefix)))
+         (let ((log4e--current-msg-buffer ,msgbuff))
            (apply 'log4e--logging ,buff ,codsys ,logtmpl ,timetmpl ,minlvl ,maxlvl ,logging-p ,(if suffix level 'level) msg msgargs)))
        
        ;; Define logging macro
@@ -131,25 +132,22 @@
          ,(format "Do logging for %s level log.
 %sMSG/MSGARGS are passed to `format'.
 Evaluation of MSGARGS is invoked only if %s level log should be printed."
-                  (or (eval level) "any")
+                  (if suffix level "any")
                   (if suffix "" "LEVEL is symbol as a log level in '(trace debug info warn error fatal).\n")
-                  (or (eval level) "the"))
-         (let ((prefix ,prefix)
-               (suffix ,suffix)
-               (level ',level)
-               (msg msg)
-               (msgargs msgargs)
+                  (if suffix level "the"))
+         (let (,@(if suffix (list `(level ',level)) '())
                (buff (log4e--make-symbol-log-buffer ,prefix))
+               (msgbuff (log4e--make-symbol-msg-buffer ,prefix))
                (codsys (log4e--make-symbol-buffer-coding-system ,prefix))
                (logtmpl (log4e--make-symbol-log-template ,prefix))
                (timetmpl (log4e--make-symbol-time-template ,prefix))
                (minlvl (log4e--make-symbol-min-level ,prefix))
                (maxlvl (log4e--make-symbol-max-level ,prefix))
                (logging-p (log4e--make-symbol-toggle-logging ,prefix)))
-           `(let ((log4e--current-msg-buffer ,(log4e--make-symbol-msg-buffer prefix)))
+           `(let ((log4e--current-msg-buffer ,msgbuff))
               (when (and ,logging-p
                          (log4e--logging-level-p ,minlvl ,maxlvl ,level))
-                (log4e--logging ,buff ,codsys ,logtmpl ,timetmpl ,minlvl ,maxlvl ,logging-p ,(if suffix level 'level) ,msg ,@msgargs)))))
+                (log4e--logging ,buff ,codsys ,logtmpl ,timetmpl ,minlvl ,maxlvl ,logging-p ,level ,msg ,@msgargs)))))
        
        )))
 

elpa/magit-20200418.939/magit-merge.el

@@ -180,7 +180,7 @@ then also remove the respective remote branch."
   (if-let ((pr (magit-get "branch" branch "pullRequest")))
       (magit-run-git-async
        "merge" args "-m"
-       (format "Merge branch '%s'%s [%s]"
+       (format "Merge branch '%s'%s [#%s]"
                branch
                (let ((current (magit-get-current-branch)))
                  (if (equal current "master") "" (format " into %s" current)))

elpa/magit-20200418.939/magit-pkg.el

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

elpa/magit-20200418.939/magit-tag.el

@@ -110,12 +110,27 @@ defaulting to the tag at point.
   (when remote-tags
     (magit-run-git-async "push" remote (--map (concat ":" it) remote-tags))))
 
+(defvar magit-tag-version-regexp-alist
+  '(("^[-._+ ]?alpha\\.?$" . -3)
+    ("^[-._+ ]?beta\\.?$" . -2)
+    ("^[-._+ ]?\\(pre\\|rc\\)\\.?$" . -1))
+  "Value to use for `version-regexp-alist' when parsing and sorting versions.
+The default value matches some common SemVer pre-release formats.
+See also `magit-release-tag-regexp'.")
+
 (defvar magit-release-tag-regexp "\\`\
 \\(?1:\\(?:v\\(?:ersion\\)?\\|r\\(?:elease\\)?\\)?[-_]?\\)?\
-\\(?2:[0-9]+\\(?:\\.[0-9]+\\)*\\)\\'"
+\\(?2:[0-9]+\\(?:\\.[0-9]+\\)*\
+\\(?:-[a-zA-Z0-9-]+\\(?:\\.[a-zA-Z0-9-]+\\)*\\)?\\)\\'"
   "Regexp used to parse release tag names.
 The first submatch must match the prefix, if any.
-The second submatch must match the version string.")
+The second submatch must match the version string.
+The default value matches SemVer version numbers, including
+pre-release versions.
+
+If this will match versions that are not dot separated numbers, you
+also need to set `magit-tag-version-regexp-alist' to recognize them
+and give them a sorting order.")
 
 ;;;###autoload
 (defun magit-tag-release (tag msg)
@@ -179,7 +194,9 @@ a tag qualifies as a release tag."
                        (let ((tag (substring line 0 (match-beginning 0)))
                              (msg (substring line (match-end 0))))
                          (and (string-match magit-release-tag-regexp tag)
-                              (let ((ver (match-string 2 tag)))
+                              (let ((ver (match-string 2 tag))
+                                    (version-regexp-alist
+                                     magit-tag-version-regexp-alist))
                                 (list (list (version-to-list ver)
                                             ver tag msg)))))))
                 ;; Cannot rely on "--sort=-version:refname" because