fiddlerwoaroof/dotfiles - Change RBGV5L2RZ3QLWUYDVYEZ4YVTUS5BD4VYUQSYSPV2GXU6BSV3EFIQC

Juggle stuff

Created by Ed Langley on July 1, 2019

RBGV5L2RZ3QLWUYDVYEZ4YVTUS5BD4VYUQSYSPV2GXU6BSV3EFIQC

Dependencies

In channels

main

Change contents

File deletion: dependencies, dependencies
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[4.152] → [4.128:128]

Insertion in emacs.d/lisp/configurations/evil.el at line 8 [5.7069]

[5.7110]


  (define-key evil-motion-state-map (kbd "C-w C-o") 'delete-mru-window)
  (define-key evil-motion-state-map (kbd "C-w C-w") 'evil-window-mru)
  (define-key evil-normal-state-map "ZZ" 'save-buffer)

Insertion in emacs.d/lisp/configurations/evil.el at line 76 [5.7069]

[5.9734]


  (progn ;; workaround until this fixed: https://github.com/emacs-evil/evil/issues/1129
    ;;                          or this: https://github.com/emacs-evil/evil/pull/1130
    (defun config/fix-evil-window-move (orig-fun &rest args)
      "Close Treemacs while moving windows around."
      (let* ((treemacs-window (treemacs-get-local-window))
             (is-active (and treemacs-window (window-live-p treemacs-window))))
        (when is-active (treemacs))
        (apply orig-fun args)
        (when is-active
          (save-selected-window
            (treemacs)))))
    (dolist (func '(evil-window-move-far-left
                    evil-window-move-far-right
                    evil-window-move-very-top
                    evil-window-move-very-bottom))
      (advice-add func
                  :around #'config/fix-evil-window-move)))

Insertion in emacs.d/init.el at line 64 [7.136]

[5.10444]

[6.1118]


(use-package org-projectile
  :config
  (progn
    (org-projectile-per-project)
    (setq org-projectile-per-project-filepath
          "notes/README.org")
    (setq org-agenda-files (append org-agenda-files (org-projectile-todo-files)))
    (push (org-projectile-project-todo-entry) org-capture-templates)
    (define-key projectile-mode-map (kbd "C-c c") 'org-capture))
  :ensure t)

Insertion in emacs.d/init.el at line 76 [7.136]

[6.1119]

(use-package org-projectile-helm
  :after org-projectile
  :config
  (define-key projectile-mode-map (kbd "C-c n p") 'org-projectile-helm-template-or-project))
(use-package deadgrep
  :ensure t)

Deletion in emacs.d/init.el at line 137 [7.136]
B:BD[8.173] → [8.173:174]

Replacement in emacs.d/init.el at line 141 [7.136]

B:BD[9.236] → [9.236:709]

  :init
  (progn
    (add-to-list 'interpreter-mode-alist (cons "node" 'js2-mode))
    (setq-default js2-basic-offset 4)
    (setq-default js-indent-level 4)
    (add-hook 'js2-mode-hook 'flycheck-mode)
    (customize-set-variable 'js2-mode-show-parse-errors nil)
    (customize-set-variable 'js2-strict-missing-semi-warning nil)
    (customize-set-variable 'js2-strict-trailing-comma-warning nil)
    (customize-set-variable 'js2-strict-inconsistent-return-warning nil)))

[9.236]

[9.709]

  :config
  (modify-syntax-entry ?_ "w" js2-mode-syntax-table)
  (add-to-list 'interpreter-mode-alist (cons "node" 'js2-mode))
  (setq-default js2-basic-offset 4)
  (setq-default js-indent-level 4)
  (add-hook 'js2-mode-hook 'flycheck-mode)
  (customize-set-variable 'js2-mode-show-parse-errors nil)
  (customize-set-variable 'js2-strict-missing-semi-warning nil)
  (customize-set-variable 'js2-strict-trailing-comma-warning nil)
  (customize-set-variable 'js2-strict-inconsistent-return-warning nil))
(use-package js
  :ensure t
  :config
  (modify-syntax-entry ?_ "w" js-mode-syntax-table)
  ;;; indent ternaries with arrow function correctly---
  (defun js--looking-at-operator-p ()
    "Return non-nil if point is on a JavaScript operator, other than a comma."
    (save-match-data
      (and (looking-at js--indent-operator-re)
           (or (not (eq (char-after) ?:))
               (save-excursion
                 (js--backward-syntactic-ws)
                 (when (memq (char-before) '(?\) ?})) (backward-list))
                 (and (js--re-search-backward "[?:{]\\|\\_<case\\_>" nil t)
                      (eq (char-after) ??))))
           (not (and
                 (eq (char-after) ?/)
                 (save-excursion
                   (eq (nth 3 (syntax-ppss)) ?/))))
           (not (and
                 (eq (char-after) ?*)
                 ;; Generator method (possibly using computed property).
                 (looking-at (concat "\\* *\\(?:\\[\\|" js--name-re " *(\\)"))
                 (save-excursion
                   (js--backward-syntactic-ws)
                   ;; We might misindent some expressions that would
                   ;; return NaN anyway.  Shouldn't be a problem.
                   (memq (char-before) '(?, ?} ?{)))))))))

Insertion in emacs.d/init.el at line 216 [7.136]

[9.1498]


(use-package jest
  :ensure t
  :config
  (defun jest--project-root ()
    "Find the project root directory."
    (let ((closest-package-json (fwoar--find-package-json))
          (projectile-root (projectile-project-root)))
      (message "%s <-> %s" closest-package-json projectile-root)
      (if (s-prefix-p projectile-root closest-package-json)
          closest-package-json
        projectile-root))))

Replacement in emacs.d/init.el at line 412 [7.136]

∅:D[10.226] → [11.20119:20209]

B:BD[11.20119] → [11.20119:20209]

  (magit-define-popup-action 'magit-dispatch-popup ?j "Browse remote" 'browse-at-remote))

[10.226]

[5.10775]

  ;; TODO: figure this out with transients
  (magit-define-popup-action 'magit-dispatch-popup ?j "Browse remote" 'browse-at-remote)
  'magit-dispatch
  )

Replacement in emacs.d/init.el at line 443 [7.136]

∅:D[12.7013] → [7.8902:8955]

B:BD[7.8902] → [7.8902:8955]

(define-key evil-normal-state-map "ZZ" 'save-buffer)

[12.6909]

[7.8955]

(progn ;; emacs-lisp stuff
  (modify-syntax-entry ?- "w" emacs-lisp-mode-syntax-table)
  (modify-syntax-entry ?_ "w" emacs-lisp-mode-syntax-table)

Replacement in emacs.d/init.el at line 447 [7.136]

B:BD[7.8956] → [12.7014:7115]

(modify-syntax-entry ?_ "w" js-mode-syntax-table)
(modify-syntax-entry ?_ "w" js2-mode-syntax-table)

[7.8956]

[7.10103]

  (put 'narrow-to-page 'disabled nil)
  )

Deletion in emacs.d/init.el at line 450 [7.136]
B:BD[7.10104] → [7.10104:10220]
B:BD[7.10220] → [13.156:157]
∅:D[13.157] → [7.12175:12176]
B:BD[7.12175] → [7.12175:12176]
```
(modify-syntax-entry ?- "w" emacs-lisp-mode-syntax-table)
(modify-syntax-entry ?_ "w" emacs-lisp-mode-syntax-table)
```

Deletion in emacs.d/init.el at line 513 [7.136]

B:BD[14.10443] → [14.10443:10581]

(define-key evil-motion-state-map (kbd "C-w C-o") 'delete-mru-window)
(define-key evil-motion-state-map (kbd "C-w C-w") 'evil-window-mru)

Deletion in emacs.d/init.el at line 531 [7.136]

B:BD[15.4158] → [9.1503:1504]

B:BD[9.1504] → [16.423:460]

∅:D[16.460] → [9.1504:2582]

B:BD[9.1504] → [9.1504:2582]


(put 'narrow-to-page 'disabled nil)
(defun js--looking-at-operator-p ()
  "Return non-nil if point is on a JavaScript operator, other than a comma."
  (save-match-data
    (and (looking-at js--indent-operator-re)
         (or (not (eq (char-after) ?:))
             (save-excursion
               (js--backward-syntactic-ws)
               (when (memq (char-before) '(?\) ?})) (backward-list))
               (and (js--re-search-backward "[?:{]\\|\\_<case\\_>" nil t)
                    (eq (char-after) ??))))
         (not (and
               (eq (char-after) ?/)
               (save-excursion
                 (eq (nth 3 (syntax-ppss)) ?/))))
         (not (and
               (eq (char-after) ?*)
               ;; Generator method (possibly using computed property).
               (looking-at (concat "\\* *\\(?:\\[\\|" js--name-re " *(\\)"))
               (save-excursion
                 (js--backward-syntactic-ws)
                 ;; We might misindent some expressions that would
                 ;; return NaN anyway.  Shouldn't be a problem.
                 (memq (char-before) '(?, ?} ?{))))))))

Deletion in emacs.d/init.el at line 533 [7.136]
B:BD[9.2584] → [17.170:224]
```
;;; indent ternaries with arrow function correctly---
```

Deletion in emacs.d/init.el at line 542 [7.136]

B:BD[17.556] → [17.556:557]

∅:D[17.557] → [9.2584:3137]

B:BD[9.2584] → [9.2584:3137]


(progn ;; workaround until this fixed: https://github.com/emacs-evil/evil/issues/1129
  ;;                          or this: https://github.com/emacs-evil/evil/pull/1130
  (defun config/fix-evil-window-move (orig-fun &rest args)
    "Close Treemacs while moving windows around."
    (let* ((treemacs-window (treemacs-get-local-window))
           (is-active (and treemacs-window (window-live-p treemacs-window))))
      (when is-active (treemacs))
      (apply orig-fun args)
      (when is-active
        (save-selected-window
          (treemacs)))))

Replacement in emacs.d/init.el at line 543 [7.136]

B:BD[9.3138] → [9.3138:3328]

B:BD[9.3328] → [17.558:587]

  (dolist (func '(evil-window-move-far-left evil-window-move-far-right evil-window-move-very-top evil-window-move-very-bottom))
    (advice-add func :around #'config/fix-evil-window-move)))
(defun camel-kebab (string)

[9.3138]

[17.587]

(defun fwoar/camel-kebab (string)

Replacement in emacs.d/init.el at line 561 [7.136]

B:BD[17.1067] → [17.1067:1106]

∅:D[17.1106] → [9.3328:3329]

B:BD[9.3328] → [9.3328:3329]

B:BD[9.3329] → [17.1107:1689]

      (insert (camel-kebab target)))))
(use-package org-projectile
  :config
  (progn
    (org-projectile-per-project)
    (setq org-projectile-per-project-filepath
          "notes/README.org")
    (setq org-agenda-files (append org-agenda-files (org-projectile-todo-files)))
    (push (org-projectile-project-todo-entry) org-capture-templates)
    (define-key projectile-mode-map (kbd "C-c c") 'org-capture))
  :ensure t)
(use-package org-projectile-helm
  :after org-projectile
  :config
  (define-key projectile-mode-map (kbd "C-c n p") 'org-projectile-helm-template-or-project))
(use-package deadgrep
  :ensure t)

[17.1067]

[17.1689]

      (insert (fwoar/camel-kebab target)))))

Deletion in emacs.d/init.el at line 580 [7.136]

B:BD[9.3878] → [9.3878:4287]

(use-package jest
  :ensure t
  :config
  (defun jest--project-root ()
    "Find the project root directory."
    (let ((closest-package-json (fwoar--find-package-json))
          (projectile-root (projectile-project-root)))
      (message "%s <-> %s" closest-package-json projectile-root)
      (if (s-prefix-p projectile-root closest-package-json)
          closest-package-json
        projectile-root))))