gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'rebase-mode'

Browse source
This commit is contained in:
Phil Jackson 2010-05-31 21:05:41 +01:00
commit 56fb23cf0b
1 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
rebase-mode.el
View file

@ -47,20 +47,29 @@
'(2 font-lock-builtin-face))) '(2 font-lock-builtin-face)))
"Font lock keywords for rebase-mode.") "Font lock keywords for rebase-mode.")
(defvar key-to-action-map '(("p" . "pick") (defvar key-to-action-map
("r" . "reword") '(("c" . "pick")
("e" . "edit") ("r" . "reword")
("s" . "squash") ("e" . "edit")
("f" . "fixup")) ("s" . "squash")
("f" . "fixup"))
"Mapping from key to action.") "Mapping from key to action.")
(defvar rebase-mode-map (defvar rebase-mode-map
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))
(define-key map (kbd "q") 'server-edit) (define-key map (kbd "q") 'server-edit)
(define-key map (kbd "C-c C-c") 'server-edit)
(define-key map (kbd "a") 'rebase-mode-abort)
(define-key map (kbd "C-c C-k") 'rebase-mode-abort)
(define-key map (kbd "M-p") 'rebase-mode-move-line-up) (define-key map (kbd "M-p") 'rebase-mode-move-line-up)
(define-key map (kbd "M-n") 'rebase-mode-move-line-down) (define-key map (kbd "M-n") 'rebase-mode-move-line-down)
(define-key map (kbd "k") 'rebase-mode-kill-line) (define-key map (kbd "k") 'rebase-mode-kill-line)
(define-key map (kbd "a") 'rebase-mode-abort)
(define-key map (kbd "n") 'next-line)
(define-key map (kbd "p") 'previous-line)
map) map)
"Keymap for rebase-mode. Note this will be added to by the "Keymap for rebase-mode. Note this will be added to by the
top-level code which defines the edit functions.") top-level code which defines the edit functions.")
@ -81,12 +90,13 @@
(defun rebase-mode-edit-line (change-to) (defun rebase-mode-edit-line (change-to)
"Change the keyword at the start of the current action line to "Change the keyword at the start of the current action line to
that of CHANGE-TO." that of CHANGE-TO."
(let ((buffer-read-only nil) (when (rebase-mode-looking-at-action)
(start (point))) (let ((buffer-read-only nil)
(goto-char (point-at-bol)) (start (point)))
(kill-region (point) (progn (forward-word 1) (point))) (goto-char (point-at-bol))
(insert change-to) (kill-region (point) (progn (forward-word 1) (point)))
(goto-char start))) (insert change-to)
(goto-char start))))
(defun rebase-mode-looking-at-action () (defun rebase-mode-looking-at-action ()
"Returns non-nil if looking at an action line." "Returns non-nil if looking at an action line."
@ -129,7 +139,8 @@ current line down."
"Abort this rebase (by emptying the buffer, saving and closing "Abort this rebase (by emptying the buffer, saving and closing
server connection)." server connection)."
(interactive) (interactive)
(when (y-or-n-p "Abort this rebase? ") (when (or (not (buffer-modified-p))
(y-or-n-p "Abort this rebase? "))
(let ((buffer-read-only nil)) (let ((buffer-read-only nil))
(delete-region (point-min) (point-max)) (delete-region (point-min) (point-max))
(save-buffer) (save-buffer)