3 files changed, 10 insertions, 1 deletions
diff --git a/emacs/.emacs.d/init/ycp-editing.el b/emacs/.emacs.d/init/ycp-editing.el
index e469097..cdbe09d 100644
--- a/emacs/.emacs.d/init/ycp-editing.el
+++ b/emacs/.emacs.d/init/ycp-editing.el
@@ -42,6 +42,8 @@
 ;; don't interpret C-m as RET
 (define-key input-decode-map [?\C-m] [C-m])
 (define-key input-decode-map [?\C-i] [C-i])
+;; fixme: the line below does not work
+;; (define-key input-decode-map [?\C-M-m] [C-M-m])
 (setq save-place-file (locate-user-emacs-file "saveplace"))
 
 (my-configure
@@ -89,6 +91,8 @@
     "M-SPC" #'cycle-spacing
     "M-z" #'zap-up-to-char              ; NOT `zap-to-char'
     "<C-M-backspace>" #'backward-kill-sexp
+    "C-M-/" #'my-mark-backward-up-list
+    "C-M-k" #'my-kill-sexp-or-comment
     )
   (electric-pair-mode)
   (my-add-hooks #'my-non-special-modes-setup '(text-mode-hook prog-mode-hook))
diff --git a/emacs/.emacs.d/init/ycp-package.el b/emacs/.emacs.d/init/ycp-package.el
index 3662b53..f0af72c 100644
--- a/emacs/.emacs.d/init/ycp-package.el
+++ b/emacs/.emacs.d/init/ycp-package.el
@@ -61,7 +61,9 @@
         '((hcel . "elpa-devel")
           (luwak . "elpa-devel")))
   (add-hook 'package-menu-mode-hook #'hl-line-mode)
-)
+  (my-keybind package-menu-mode-map
+    "g" #'package-refresh-contents)
+  )
 
 (my-package cus-edit
   (my-keybind global-map
diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el
index 8a3fed5..16261b6 100644
--- a/emacs/.emacs.d/init/ycp-vc.el
+++ b/emacs/.emacs.d/init/ycp-vc.el
@@ -123,6 +123,9 @@
 
   (require 'magit-ediff)
   (add-hook 'magit-ediff-quit-hook 'delete-frame)
+
+  (require 'magit-branch)
+  (advice-add 'magit-checkout :filter-args #'my-magit-ignore-other-worktrees)
   )
 
 (my-package my-magit