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

elpa/archives/gnu/archive-contents

@@ -581,7 +581,7 @@
 	       ("Leo Liu" . "sdl.web@gmail.com"))
 	      (:keywords "killing" "convenience"))])
  (ebdb .
-       [(0 6 14)
+       [(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

elpa/ein-20200415.238/ein-autoloads.el

@@ -331,7 +331,7 @@ and the url-or-port argument of ein:notebooklist-open*.
 ;;;### (autoloads nil "ein-pytools" "ein-pytools.el" (0 0 0 0))
 ;;; Generated autoloads from ein-pytools.el
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-pytools" '("ein:pytools-")))
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-pytools" '("ein:pytools-jump-")))
 
 ;;;***
 

elpa/ein-20200415.238/ein-notebook.el

@@ -1140,7 +1140,6 @@ Tried add-function: the &rest from :around is an emacs-25 compilation issue."
   (ein:notebook--define-key map (kbd "C-c <down>") ein:worksheet-move-cell-down)
   (ein:notebook--define-key map (kbd "M-<up>") ein:worksheet-not-move-cell-up)
   (ein:notebook--define-key map (kbd "M-<down>") ein:worksheet-not-move-cell-down)
-  (ein:notebook--define-key map "\C-c\C-h" ein:pytools-request-help)
   (ein:notebook--define-key map (kbd "C-c C-$") ein:tb-show)
   (ein:notebook--define-key map "\C-c\C-x" nil)
   (ein:notebook--define-key map "\C-c\C-x\C-r" ein:notebook-restart-session-command)
@@ -1233,9 +1232,7 @@ Tried add-function: the &rest from :around is an emacs-25 compilation issue."
             ))
        "---"
        ,@(ein:generate-menu
-          '(("Show object help"
-             ein:pytools-request-help)
-            ("Jump to definition" ein:pytools-jump-to-source-command)
+          '(("Jump to definition" ein:pytools-jump-to-source-command)
             ("Go back to the previous jump point"
              ein:pytools-jump-back-command))))
       ("Kernel"

elpa/ein-20200415.238/ein-pkg.el

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

elpa/ein-20200415.238/ein-pytools.el

@@ -27,16 +27,6 @@
 
 (require 'ein-kernel)
 
-(defun ein:pytools-request-help (kernel func)
-  (interactive (list (ein:get-kernel-or-error)
-                     (ein:object-at-point-or-error)))
-  (ein:kernel-execute kernel
-                      (format "%s?" func) ; = code
-                      nil                 ; = callbacks
-                      ;; It looks like that magic command does
-                      ;; not work in silent mode.
-                      :silent nil))
-
 (defun ein:pytools-jump-to-source-command (&optional other-window)
   "Jump to the source code of the object at point.
 When the prefix argument ``C-u`` is given, open the source code

elpa/ein-20200415.238/ein.el

@@ -29,6 +29,9 @@
 ;; notebooks within Emacs.  It channels all the power of Emacs without the
 ;; idiosyncrasies of in-browser editing.
 ;;
+;; No require statements, e.g. ``require ein``, are necessary, contrary to the
+;; `prevailing documentation`_, which should be disregarded.
+;;
 ;; Org_ users please find ob-ein_, a jupyter Babel_ backend.
 ;;
 ;; EIN was originally written by `[tkf]`_.  A jupyter Babel_ backend was first

elpa/leuven-theme-20200416.728/leuven-theme-pkg.el

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

elpa/leuven-theme-20200416.728/leuven-theme.el

@@ -4,7 +4,7 @@
 
 ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
 ;; URL: https://github.com/fniessen/emacs-leuven-theme
-;; Version: 20200406.1540
+;; Version: 20200406.1542
 ;; Keywords: color theme
 
 ;; This file is part of GNU Emacs.
@@ -761,7 +761,7 @@ more...")
    `(org-document-info-keyword ((,class (:foreground "#008ED1" :background "#EAEAFF"))))
    `(org-document-title ((,class (:height 1.8 :weight bold :foreground "black"))))
    `(org-done ((,class (:weight bold :box (:line-width 1 :color "#BBBBBB") :foreground "#BBBBBB" :background "#F0F0F0"))))
-   `(org-drawer ((,class (:foreground "light sky blue"))))
+   `(org-drawer ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA" :extend nil))))
    `(org-ellipsis ((,class (:underline nil :foreground "#999999")))) ; #FFEE62
    `(org-example ((,class (:foreground "blue" :background "#EAFFEA"))))
    `(org-footnote ((,class (:underline t :foreground "#008ED1"))))

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)))))
        
        )))