diff options
| author | Alexandre Julliard <julliard@winehq.org> | 2006-03-04 17:37:42 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-04 13:45:58 -0800 |
| commit | 18e3e99e3d0e838608eea7fe452366c4c57ef32e (patch) | |
| tree | de498adf2e4a9bafa72c9e273ddd474e70ec43cd /contrib | |
| parent | 486a974acce1bd560ae8edc1895ff91253271675 (diff) | |
| download | git-18e3e99e3d0e838608eea7fe452366c4c57ef32e.tar.gz git-18e3e99e3d0e838608eea7fe452366c4c57ef32e.tar.xz | |
git.el: Portability fixes for XEmacs and Emacs CVS.
Fixed octal constants for XEmacs.
Added highlighting support in log-edit buffer for Emacs CVS.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/emacs/git.el | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index 8f234772b..5828d4c69 100644 --- a/contrib/emacs/git.el +++ b/contrib/emacs/git.el @@ -388,9 +388,9 @@ If not set, fall back to `add-log-mailing-address' and then `user-mail-address'. (propertize (if (or (not old-perm) (not new-perm) - (eq 0 (logand #O111 (logxor old-perm new-perm)))) + (eq 0 (logand ?\111 (logxor old-perm new-perm)))) " " - (if (eq 0 (logand #O111 old-perm)) "+x" "-x")) + (if (eq 0 (logand ?\111 old-perm)) "+x" "-x")) 'face 'git-permission-face)) (defun git-fileinfo-prettyprint (info) @@ -806,7 +806,13 @@ If not set, fall back to `add-log-mailing-address' and then `user-mail-address'. "\n") (when (and merge-heads (file-readable-p ".git/MERGE_MSG")) (insert-file-contents ".git/MERGE_MSG")))) - (log-edit #'git-do-commit nil #'git-log-edit-files buffer))) + (let ((log-edit-font-lock-keywords + `(("^\\(Author:\\|Date:\\|Parent:\\)\\(.*\\)" + (1 font-lock-keyword-face) + (2 font-lock-function-name-face)) + (,(concat "^\\(" (regexp-quote git-log-msg-separator) "\\)$") + (1 font-lock-comment-face))))) + (log-edit #'git-do-commit nil #'git-log-edit-files buffer)))) (defun git-find-file () "Visit the current file in its own buffer." @@ -891,7 +897,7 @@ If not set, fall back to `add-log-mailing-address' and then `user-mail-address'. (define-key map "d" diff-map) (define-key map "=" 'git-diff-file) (define-key map "f" 'git-find-file) - (define-key map [RET] 'git-find-file) + (define-key map "\r" 'git-find-file) (define-key map "g" 'git-refresh-status) (define-key map "i" 'git-ignore-file) (define-key map "l" 'git-log-file) |