From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Brand <michael.ch.brand@gmail.com>
Subject: git diff: hunk header config
Date: Sun, 31 Jul 2011 13:49:09 +0200
Message-ID: <CALn3zog7-H3O_1At_Dux2NCFOXq7iAupSbLE4KWge+jQNjT8dA@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:57822)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1QnUW8-0006Jw-I3
	for emacs-orgmode@gnu.org; Sun, 31 Jul 2011 07:49:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1QnUW7-0000HT-L2
	for emacs-orgmode@gnu.org; Sun, 31 Jul 2011 07:49:12 -0400
Received: from mail-wy0-f169.google.com ([74.125.82.169]:44936)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1QnUW7-0000HK-Bj
	for emacs-orgmode@gnu.org; Sun, 31 Jul 2011 07:49:11 -0400
Received: by wyg36 with SMTP id 36so1207172wyg.0
	for <emacs-orgmode@gnu.org>; Sun, 31 Jul 2011 04:49:09 -0700 (PDT)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Org Mode <emacs-orgmode@gnu.org>

Hi all

I suggest to change the config of git diff in the org-mode.git repo to
the more helpful hunk header (the @@...@@ line) style:

#+begin_src diff
@@ -12991,7 +12991,7 @@ (defun org-align-tags-here (to-col)
          (goto-char (match-beginning 1))
          (insert " ")
          (delete-region (point) (1+ (match-beginning 2)))
-         (setq ncol (max (1+ (current-column))
+         (setq ncol (max (current-column)
                          (1+ col)
                          (if (> to-col 0)
                              to-col
#+end_src

which is similar to GNU diff -p/--show-c-function. The current, not
configured default "style" is:

#+begin_src diff
@@ -12991,7 +12991,7 @@ If ONOFF is `on' or `off', don't toggle but set to thi
          (goto-char (match-beginning 1))
          (insert " ")
          (delete-region (point) (1+ (match-beginning 2)))
-         (setq ncol (max (1+ (current-column))
+         (setq ncol (max (current-column)
                          (1+ col)
                          (if (> to-col 0)
                              to-col
#+end_src

Would that be commonly welcome for at least firstly Emacs Lisp and texinfo?

If yes, the following is to be added to the org-mode.git repo:

1) new file .gitattributes:
#+begin_src
*.el    diff=el
*.texi  diff=texinfo
#+end_src

2) append to .git/config:
#+begin_src
[diff "el"]
	xfuncname = "^(\\(def[a-z]+ .+)$"
[diff "texinfo"]
	xfuncname="^(@(sub)*section.*)$"
#+end_src

I hope that somebody can do this in the repo in such a way that it
will be effective after git pull and git clone automatically, so that
nobody has to care about later.

Michael