Merge commit 'cymacs/master'

This commit is contained in:
Marius Vollmer 2009-01-19 01:18:35 +02:00
commit 3e2905924a

View file

@ -1010,6 +1010,7 @@ Please see the manual for a complete description of Magit.
\\{magit-mode-map}"
(kill-all-local-variables)
(buffer-disable-undo)
(setq buffer-read-only t)
(setq major-mode 'magit-mode
mode-name "Magit"
@ -1228,7 +1229,7 @@ Please see the manual for a complete description of Magit.
(defun magit-wash-hunk ()
(cond ((looking-at "\\(^@+\\)[^@]*@+")
(let ((n-files (length (match-string 1)))
(let ((n-columns (1- (length (match-string 1))))
(head (match-string 0)))
(magit-with-section head 'hunk
(magit-put-line-property 'face 'magit-diff-hunk-header)
@ -1236,7 +1237,7 @@ Please see the manual for a complete description of Magit.
(while (not (or (eobp)
(looking-at "^diff\\|^@@")))
(let ((prefix (buffer-substring-no-properties
(point) (min (+ (point) n-files) (point-max)))))
(point) (min (+ (point) n-columns) (point-max)))))
(cond ((string-match "\\+" prefix)
(magit-put-line-property 'face 'magit-diff-add))
((string-match "-" prefix)