emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix args-out-of-range in enable-minor-mode-maybe

Browse source 
Caused by trying to use out-of-scope match data.
This commit is contained in:
Henrik Lissner 2018-06-06 02:38:39 +02:00
parent af06b00316
commit b26bbd4762
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/core.el
View file

@ -138,7 +138,7 @@ enable multiple minor modes for the same regexp.")
(setq name (file-name-sans-versions name))
;; Remove remote file name identification.
(when (and (stringp remote-id)
(string-match-p (regexp-quote remote-id) name))
(string-match (regexp-quote remote-id) name))
(setq name (substring name (match-end 0))))
(while (and alist (caar alist) (cdar alist))
(if (string-match-p (caar alist) name)

13
modules/tools/magit/config.el
View file

@ -24,7 +24,18 @@ load everything.")
magit-revision-show-gravatars '("^Author: " . "^Commit: ")
magit-diff-refine-hunk t ;; Show word-granularity on the currently selected hunk
magit-display-buffer-function
#'magit-display-buffer-fullframe-status-v1)
#'+magit-display-buffer-fullscreen)
(defun +magit-display-buffer-fullscreen (buffer)
(cond ((eq (with-current-buffer buffer major-mode)
'magit-status-mode)
(display-buffer buffer '(magit--display-buffer-fullframe)))
((if-let* ((status (magit-mode-get-buffer 'magit-status-mode t nil nil)))
(when-let* ((window (get-buffer-window status)))
(unless (window-parameter window 'side)
(delete-other-windows window)
(display-buffer-in-side-window status '((side . left)))))
(magit-display-buffer-traditional buffer)))))
(set! :popup "^\\(?:\\*magit\\|magit:\\)" :ignore)
;; Consider magit buffers real (so they can switched to)