{"thread":{"id":"3551","subject":"[PATCH 1/5] git.el: Portability fixes for XEmacs and Emacs CVS.","startedAt":"2006-03-04T16:37:42Z","lastAt":"2006-03-04T16:37:42Z","messageCount":1,"participants":["Alexandre Julliard"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"17146","messageId":"87k6bakvxl.fsf@wine.dyndns.org","threadId":"3551","inReplyTo":null,"subject":"[PATCH 1/5] git.el: Portability fixes for XEmacs and Emacs CVS.","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2006-03-04T16:37:42Z","receivedAt":"2006-03-04T16:37:42Z","isPatch":true,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"Fixed octal constants for XEmacs.\nAdded highlighting support in log-edit buffer for Emacs CVS.\n\nSigned-off-by: Alexandre Julliard <julliard@winehq.org>\n\n---\n\n contrib/emacs/git.el |   14 ++++++++++----\n 1 files changed, 10 insertions(+), 4 deletions(-)\n\n7c95060616dd2f596d2f0bc0d707c584002913db\ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex 8f23477..5828d4c 100644\n--- a/contrib/emacs/git.el\n+++ b/contrib/emacs/git.el\n@@ -388,9 +388,9 @@ If not set, fall back to `add-log-mailin\n   (propertize\n    (if (or (not old-perm)\n            (not new-perm)\n-           (eq 0 (logand #O111 (logxor old-perm new-perm))))\n+           (eq 0 (logand ?\\111 (logxor old-perm new-perm))))\n        \"  \"\n-     (if (eq 0 (logand #O111 old-perm)) \"+x\" \"-x\"))\n+     (if (eq 0 (logand ?\\111 old-perm)) \"+x\" \"-x\"))\n   'face 'git-permission-face))\n \n (defun git-fileinfo-prettyprint (info)\n@@ -806,7 +806,13 @@ If not set, fall back to `add-log-mailin\n          \"\\n\")\n         (when (and merge-heads (file-readable-p \".git/MERGE_MSG\"))\n           (insert-file-contents \".git/MERGE_MSG\"))))\n-      (log-edit #'git-do-commit nil #'git-log-edit-files buffer)))\n+    (let ((log-edit-font-lock-keywords\n+           `((\"^\\\\(Author:\\\\|Date:\\\\|Parent:\\\\)\\\\(.*\\\\)\"\n+              (1 font-lock-keyword-face)\n+              (2 font-lock-function-name-face))\n+             (,(concat \"^\\\\(\" (regexp-quote git-log-msg-separator) \"\\\\)$\")\n+              (1 font-lock-comment-face)))))\n+      (log-edit #'git-do-commit nil #'git-log-edit-files buffer))))\n \n (defun git-find-file ()\n   \"Visit the current file in its own buffer.\"\n@@ -891,7 +897,7 @@ If not set, fall back to `add-log-mailin\n     (define-key map \"d\"    diff-map)\n     (define-key map \"=\"   'git-diff-file)\n     (define-key map \"f\"   'git-find-file)\n-    (define-key map [RET] 'git-find-file)\n+    (define-key map \"\\r\"  'git-find-file)\n     (define-key map \"g\"   'git-refresh-status)\n     (define-key map \"i\"   'git-ignore-file)\n     (define-key map \"l\"   'git-log-file)\n-- \n1.2.4.g0040-dirty\n\n-- \nAlexandre Julliard\njulliard@winehq.org\n"}]}