mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-24

Browse source
This commit is contained in:
Stefan Monnier 2014-12-05 15:20:02 -05:00
commit fca389d1d3
4 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
admin/gitmerge.el
View file

@ -90,6 +90,14 @@ Auto-commit"
map)
"Keymap for gitmerge major mode.")
(defvar gitmerge-mode-font-lock-keywords
`((,gitmerge-log-regexp
(1 font-lock-warning-face)
(2 font-lock-constant-face)
(3 font-lock-builtin-face)
(4 font-lock-comment-face))))
(defvar gitmerge--commits nil)
(defvar gitmerge--from nil)
@ -459,23 +467,12 @@ Branch FROM will be prepended to the list."
(prog1 (read (buffer-string))
(kill-buffer)))))
(defun gitmerge-mode ()
(define-derived-mode gitmerge-mode special-mode "gitmerge"
"Major mode for Emacs branch merging."
(interactive)
(kill-all-local-variables)
(setq major-mode 'gitmerge-mode)
(setq mode-name "gitmerge")
(set-syntax-table text-mode-syntax-table)
(use-local-map gitmerge-mode-map)
(make-local-variable 'font-lock-defaults)
(setq gitmerge-mode-font-lock-keywords
(list (list gitmerge-log-regexp
'(1 font-lock-warning-face)
'(2 font-lock-constant-face)
'(3 font-lock-builtin-face)
'(4 font-lock-comment-face))))
(setq buffer-read-only t)
(setq font-lock-defaults '(gitmerge-mode-font-lock-keywords)))
(setq-local truncate-lines t)
(setq-local font-lock-defaults '(gitmerge-mode-font-lock-keywords)))
(defun gitmerge (from)
"Merge from branch FROM into `default-directory'."