Skip to content

Commit 1a535de

Browse files
committed
Merge branch 'dev'
2 parents 1ff8fca + f6fec11 commit 1a535de

39 files changed

+3121
-4142
lines changed

.gitignore

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# elpa files
2+
/elpa
3+
14
# session backups
25
/session*
36

@@ -17,8 +20,13 @@
1720

1821

1922
# save last place in files
20-
/saveplace
23+
/.saveplace
24+
25+
# recentf file
26+
/.recentf
2127

28+
# ring save file
29+
/.savehist
2230

2331
# persistent registers
2432
/saveregisters.el
@@ -67,6 +75,9 @@ ac-comphist.dat
6775
/ede-projects.el
6876

6977

78+
# desktop files
79+
/desktop
80+
7081
# misc
7182
*.undo.xz
7283
*#
@@ -75,5 +86,3 @@ ac-comphist.dat
7586
/.elisp-cache-stamp
7687
/kkrc
7788
/.python-environments
78-
/elpa/archives/*/archive-contents
79-
/elpa/*.txt

.mc-lists.el

Lines changed: 129 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -2,125 +2,134 @@
22
;; It keeps track of your preferences for running commands with multiple cursors.
33

44
(setq mc/cmds-to-run-for-all
5-
'(
6-
ace-jump-done
7-
ace-jump-mode
8-
auto-jump-char
9-
back-to-indentation-or-beginning
10-
beginning-of-visual-line
11-
c-electric-semi&comma
12-
c-indent-line-or-region
13-
cua-cancel
14-
cua-copy-region
15-
cua-delete-region
16-
cua-exchange-point-and-mark
17-
cua-paste
18-
cua-paste-pop
19-
delete-horizontal-space
20-
easy-kill
21-
end-of-visual-line
22-
ess-smart-S-assign
23-
eval-and-replace
24-
eval-last-sexp
25-
evil-backward-WORD-begin
26-
evil-backward-char
27-
evil-backward-sentence
28-
evil-backward-sexp
29-
evil-backward-word-begin
30-
evil-change
31-
evil-change-to-previous-state
32-
evil-delete
33-
evil-delete-backward-char-and-join
34-
evil-delete-backward-word
35-
evil-digit-argument-or-evil-beginning-of-line
36-
evil-emacs-state
37-
evil-end-of-line
38-
evil-end-of-visual-line
39-
evil-exit-visual-state
40-
evil-fastnav-forward-to
41-
evil-find-char-to
42-
evil-first-non-blank
43-
evil-force-normal-state
44-
evil-forward-WORD-begin
45-
evil-forward-char
46-
evil-forward-word-begin
47-
evil-forward-word-end
48-
evil-goto-line
49-
evil-insert
50-
evil-join
51-
evil-jump-forward
52-
evil-jump-item
53-
evil-mouse-drag-region
54-
evil-next-line
55-
evil-next-line-first-non-blank
56-
evil-next-visual-line
57-
evil-normal-state
58-
evil-paste-after
59-
evil-previous-line
60-
evil-previous-visual-line
61-
evil-ret
62-
evil-ret-and-indent
63-
evil-search-forward
64-
evil-search-next
65-
evil-visual-char
66-
evil-visual-line
67-
evil-yank
68-
evilnc-comment-or-uncomment-lines
69-
expand-and-replace
70-
fastnav-mark-to-char-forward
71-
fastnav-sprint-forward
72-
haskell-indentation-delete-backward-char
73-
icicle-execute-extended-command
74-
indent-for-tab-command
75-
iy-go-to-char--command
76-
jedi:dot-complete
77-
jump-char-process-char
78-
keyboard-quit
79-
kill-ring-search
80-
kill-sexp
81-
kring-down
82-
kring-left
83-
kring-right
84-
kring-up
85-
mouse-set-region
86-
my-evil-smart-undo
87-
my-helm-omni
88-
my-normal-smart-undo
89-
my-wlr-cua-cut-region
90-
previous-buffer
91-
python-backspace
92-
python-electric-colon
93-
python-indent-dedent-line-backspace
94-
smart-newline
95-
sp--cua-replace-region
96-
sp--self-insert-command
97-
sp-backward-sexp
98-
sp-forward-sexp
99-
sp-kill-sexp
100-
sp-remove-active-pair-overlay
101-
transpose-sexps
102-
whole-line-or-region-yank
103-
yas-expand
104-
))
5+
'(
6+
ace-jump-done
7+
ace-jump-mode
8+
auto-jump-char
9+
back-to-indentation-or-beginning
10+
beginning-of-visual-line
11+
c-electric-semi&comma
12+
c-indent-line-or-region
13+
cua-cancel
14+
cua-copy-region
15+
cua-delete-region
16+
cua-exchange-point-and-mark
17+
cua-paste
18+
cua-paste-pop
19+
delete-horizontal-space
20+
easy-kill
21+
end-of-visual-line
22+
ess-smart-S-assign
23+
eval-and-replace
24+
eval-last-sexp
25+
evil-append-line
26+
evil-backward-WORD-begin
27+
evil-backward-char
28+
evil-backward-sentence
29+
evil-backward-sexp
30+
evil-backward-word-begin
31+
evil-change
32+
evil-change-to-previous-state
33+
evil-delete
34+
evil-delete-backward-char-and-join
35+
evil-delete-backward-word
36+
evil-delete-char
37+
evil-delete-line
38+
evil-digit-argument-or-evil-beginning-of-line
39+
evil-emacs-state
40+
evil-end-of-line
41+
evil-end-of-visual-line
42+
evil-exit-visual-state
43+
evil-fastnav-forward-to
44+
evil-find-char-to
45+
evil-first-non-blank
46+
evil-force-normal-state
47+
evil-forward-WORD-begin
48+
evil-forward-WORD-end
49+
evil-forward-char
50+
evil-forward-word-begin
51+
evil-forward-word-end
52+
evil-goto-line
53+
evil-insert
54+
evil-join
55+
evil-jump-forward
56+
evil-jump-item
57+
evil-mouse-drag-region
58+
evil-next-line
59+
evil-next-line-first-non-blank
60+
evil-next-visual-line
61+
evil-normal-state
62+
evil-paste-after
63+
evil-previous-line
64+
evil-previous-visual-line
65+
evil-ret
66+
evil-ret-and-indent
67+
evil-search-forward
68+
evil-search-next
69+
evil-visual-char
70+
evil-visual-line
71+
evil-yank
72+
evilnc-comment-or-uncomment-lines
73+
expand-and-replace
74+
fastnav-mark-to-char-forward
75+
fastnav-sprint-forward
76+
haskell-indentation-delete-backward-char
77+
icicle-execute-extended-command
78+
indent-for-tab-command
79+
iy-go-to-char--command
80+
jedi:dot-complete
81+
jump-char-process-char
82+
keyboard-quit
83+
kill-ring-search
84+
kill-sexp
85+
kring-down
86+
kring-left
87+
kring-right
88+
kring-up
89+
mouse-set-region
90+
my-evil-smart-undo
91+
my-helm-omni
92+
my-normal-smart-undo
93+
my-wlr-cua-cut-region
94+
previous-buffer
95+
python-backspace
96+
python-electric-colon
97+
python-indent-dedent-line-backspace
98+
smart-newline
99+
sp--cua-replace-region
100+
sp--self-insert-command
101+
sp-backward-sexp
102+
sp-backward-unwrap-sexp
103+
sp-forward-sexp
104+
sp-kill-sexp
105+
sp-remove-active-pair-overlay
106+
sp-unwrap-sexp
107+
transpose-sexps
108+
whole-line-or-region-yank
109+
yas-expand
110+
))
105111

106112
(setq mc/cmds-to-run-once
107-
'(
108-
auto-semantic-jump-to-definition
109-
auto-smex
110-
describe-key
111-
helm-eval-expression
112-
icicle-goto-marker-or-set-mark-command
113-
ido-write-file
114-
iflipb-next-buffer
115-
mark-whole-buffer
116-
my-helm-buffers
117-
my-helm-find-files
118-
projectile-switch-project
119-
python-shell-send-buffer
120-
scroll-bar-mode
121-
scroll-bar-toolkit-scroll
122-
smex
123-
suspend-frame
124-
toggle-input-method
125-
undo-tree-visualize
126-
))
113+
'(
114+
auto-semantic-jump-to-definition
115+
auto-smex
116+
describe-key
117+
evil-exit-emacs-state
118+
handle-select-window
119+
handle-switch-frame
120+
helm-eval-expression
121+
icicle-goto-marker-or-set-mark-command
122+
ido-write-file
123+
iflipb-next-buffer
124+
mark-whole-buffer
125+
my-helm-buffers
126+
my-helm-find-files
127+
projectile-switch-project
128+
python-shell-send-buffer
129+
scroll-bar-mode
130+
scroll-bar-toolkit-scroll
131+
smex
132+
suspend-frame
133+
toggle-input-method
134+
undo-tree-visualize
135+
))

0 commit comments

Comments
 (0)