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

bundle/bundles.el

@@ -0,0 +1,18 @@
+;; Load my custom bundles
+
+(require 'os)
+(require 'display)
+(require 'fill-column-indicator)
+(require 'calendar-settings)
+(require 'org-mode-settings)
+(require 'sbcl-settings)
+(require 'hooks)
+
+(provide 'bundles)
+
+;; Local Variables:
+;; mode: emacs-lisp
+;; coding: utf-8
+;; fill-column: 79
+;; lisp-indent-offset: 2
+;; End:

elpa/archives/gnu/archive-contents

@@ -677,7 +677,7 @@
 		      ("William Xu" . "william.xwl@gmail.com"))
 		     (:maintainer "William Xu" . "william.xwl@gmail.com"))])
  (elisp-benchmarks .
-		   [(1 1)
+		   [(1 2)
 		    nil "elisp benchamrks collection" tar
 		    ((:maintainer "Andrea Corallo" . "akrl@sdf.org")
 		     (:authors

elpa/dashboard-20200221.759/dashboard-pkg.el

@@ -1,4 +1,4 @@
-(define-package "dashboard" "20200217.1153" "A startup screen extracted from Spacemacs"
+(define-package "dashboard" "20200221.759" "A startup screen extracted from Spacemacs"
   '((emacs "25.3")
     (page-break-lines "0.11"))
   :keywords

elpa/dashboard-20200221.759/dashboard-widgets.el

@@ -1,6 +1,6 @@
 ;;; dashboard-widgets.el --- A startup screen extracted from Spacemacs  -*- lexical-binding: t -*-
 
-;; Copyright (c) 2016-2019 Rakan Al-Hneiti & Contributors
+;; Copyright (c) 2016-2020 Rakan Al-Hneiti & Contributors
 ;;
 ;; Author: Rakan Al-Hneiti
 ;; URL: https://github.com/emacs-dashboard/emacs-dashboard
@@ -10,7 +10,7 @@
 ;;; License: GPLv3
 ;;
 ;; Created: October 05, 2016
-;; Package-Version: 1.7.0-SNAPSHOT
+;; Package-Version: 1.8.0-SNAPSHOT
 ;; Keywords: startup, screen, tools, dashboard
 ;; Package-Requires: ((emacs "25.3") (page-break-lines "0.11"))
 ;;; Commentary:
@@ -324,7 +324,7 @@ If MESSAGEBUF is not nil then MSG is also written in message buffer."
       (insert msg))))
 
 (defun dashboard-modify-heading-icons (alist)
-  "Append ALIST items to dashboard-heading-icons to modify icons."
+  "Append ALIST items to `dashboard-heading-icons' to modify icons."
   (dolist (icon alist)
     (add-to-list 'dashboard-heading-icons icon)))
 
@@ -421,7 +421,7 @@ If MESSAGEBUF is not nil then MSG is also written in message buffer."
 ;; INIT INFO
 ;;
 (defun dashboard-insert-init-info ()
-  "Insert init info when dashboard-set-init-info is t."
+  "Insert init info when `dashboard-set-init-info' is t."
   (when dashboard-set-init-info
     (dashboard-center-line dashboard-init-info)
     (insert

elpa/dashboard-20200221.759/dashboard.el

@@ -1,6 +1,6 @@
 ;;; dashboard.el --- A startup screen extracted from Spacemacs  -*- lexical-binding: t -*-
 
-;; Copyright (c) 2016-2019 Rakan Al-Hneiti & Contributors
+;; Copyright (c) 2016-2020 Rakan Al-Hneiti & Contributors
 ;;
 ;; Author: Rakan Al-Hneiti
 ;; URL: https://github.com/emacs-dashboard/emacs-dashboard
@@ -10,7 +10,7 @@
 ;;; License: GPLv3
 ;;
 ;; Created: October 05, 2016
-;; Package-Version: 1.7.0-SNAPSHOT
+;; Package-Version: 1.8.0-SNAPSHOT
 ;; Keywords: startup, screen, tools, dashboard
 ;; Package-Requires: ((emacs "25.3") (page-break-lines "0.11"))
 ;;; Commentary:

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

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

elpa/elm-mode-20200221.1951/elm-mode.el

@@ -157,7 +157,8 @@ Find the roots of this function in the c-awk-mode."
   (setq-local comment-start "--")
   (setq-local comment-end "")
   (setq-local imenu-create-index-function #'elm-imenu-create-index)
-  (setq-local paragraph-separate "\\(\r\t\n\\|-}\\)$")
+  (setq-local paragraph-start (concat " *{-\\| *-- |\\|" page-delimiter))
+  (setq-local paragraph-separate (concat " *$\\| *\\({-\\|-}\\) *$\\|" page-delimiter))
   (setq-local beginning-of-defun-function #'elm-beginning-of-defun)
   (setq-local end-of-defun-function #'elm-end-of-defun)
 

elpa/magit-20200222.41/magit-log.el

@@ -719,7 +719,8 @@ restrict the log to the lines that the region touches."
   "Show log for the definition at point."
   (interactive (list (or (magit-file-relative-name)
                          (user-error "Buffer isn't visiting a file"))
-                     (funcall magit-log-trace-definition-function)
+                     (or (funcall magit-log-trace-definition-function)
+                         (user-error "No function at point found"))
                      (or magit-buffer-refname
                          (magit-get-current-branch)
                          "HEAD")))
@@ -727,7 +728,7 @@ restrict the log to the lines that the region touches."
   (magit-log-setup-buffer
    (list rev)
    (cons (format "-L:%s%s:%s"
-                 (regexp-quote fn)
+                 (replace-regexp-in-string ":" "\\:" (regexp-quote fn) nil t)
                  (if (derived-mode-p 'lisp-mode 'emacs-lisp-mode)
                      ;; Git doesn't treat "-" the same way as
                      ;; "_", leading to false-positives such as

elpa/magit-20200222.41/magit-pkg.el

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