Hi Nicolas,
On Thu, Aug 13, 2015 at 11:37 PM, Nicolas Goaziou
<m...@nicolasgoaziou.fr> wrote:
> Hello,
>
> Pip Cet <pip...@gmail.com> writes:
>
>> Can you try this patch? That appears to fix the issue here, at least
>> for this one file, at the cost of yet another shy group added to the
>> regular expression.
>
> Thanks for the patch.
>
> Would you mind providing a proper commit message and send it again using
> "git format-patch"?
Of course, here we go. Please let me know if there's anything wrong
with it still. (I don't think gmail copy-and-paste preserves tabs, so
this is sent as an attachment. Is that okay, for future reference?)
It would be great if README_contribute could be updated no longer to
refer to ChangeLog files, and instead refer to the Emacs CONTRIBUTE
file (it would also be great if the special git commit messages could
be generated as easily as C-x 4 a does for ChangeLog entries. What do
people use for that?); I've attached a patch to change that as well,
but I'm not sure whether it's still properly a TINYCHANGE. Again, it
would be great if you could let me know if there's anything wrong with
it so I can avoid making the same mistake for future contributions.
Thanks!
Pip
From 4dac047849bdb44b631f0b8d7013eb0e15a0f512 Mon Sep 17 00:00:00 2001
From: Philip <pip...@gmail.com>
Date: Thu, 13 Aug 2015 18:49:56 +0000
Subject: [PATCH 1/2] org.el: fix recursive regular expression backtracking
* org.el (org-link-search): Avoid recursive regexp
backtracking behaviour when following search links.
<http://article.gmane.org/gmane.emacs.orgmode/100010>
TINYCHANGE
---
lisp/org.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index a908d9e..7f46687 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -11128,18 +11128,18 @@ of matched result, with is either `dedicated' or `fuzzy'."
"\\[[0-9]*\\(?:%\\|/[0-9]*\\)\\]"
wspaceopt
"\\)"))
- (sep (concat "\\(?:" wspace "+\\|" cookie "+\\)"))
+ (sep (concat "\\(?:\\(?:" wspace "\\|" cookie "\\)+\\)"))
(re (concat
org-outline-regexp-bol
"\\(?:" org-todo-regexp "[ \t]+\\)?"
"\\(?:\\[#.\\][ \t]+\\)?"
"\\(?:" org-comment-string "[ \t]+\\)?"
- sep "*"
+ sep "?"
(let ((title (mapconcat #'regexp-quote
words
- (concat sep "+"))))
+ sep)))
(if starred (substring title 1) title))
- sep "*"
+ sep "?"
(org-re "\\(?:[ \t]+:[[:alnum:]_@#%%:]+:\\)?")
"[ \t]*$")))
(goto-char (point-min))
--
2.5.0
From f52f2e428d5d981ad6db43cd8c73724c8d62b037 Mon Sep 17 00:00:00 2001
From: Philip <pip...@gmail.com>
Date: Fri, 14 Aug 2015 16:42:02 +0000
Subject: [PATCH 2/2] Remove references to ChangeLog.
* README_contribute: remove references to ChangeLog. Instead,
reference the Emacs `CONTRIBUTE' file which documents how to
format git commit messages.
TINYCHANGE
---
README_contribute | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/README_contribute b/README_contribute
index 3e1ef6d..63ed0bd 100644
--- a/README_contribute
+++ b/README_contribute
@@ -58,10 +58,10 @@ development.
new mechanism to make sure all changes end up in the right
place.
- - Creating and pushing a change to the Org-mode core requires
- you also to provide ChangeLog entries. Just press `C-x 4 a'
- in each function or variable you have modified and describe
- the change you made in the ChangeLog buffer/file.
+ - Org-mode no longer uses ChangeLog entries to document
+ changes. Instead, special commit messages are used, as
+ described in the `CONTRIBUTE' file in the main Emacs
+ repository.
- Among other things, Org-mode is widely appreciated because
of its simplicity, cleanness and consistency. We should try
--
2.5.0
