From 453492ca957d3a2bf06d17eb89be1a9a99e815f2 Mon Sep 17 00:00:00 2001 From: Philip Date: Thu, 13 Aug 2015 18:49:56 +0000 Subject: [PATCH 1/2] org.el: Fix recursive regexp backtracking * org.el (org-link-search): Avoid recursive regexp backtracking behavior when following search links. TINYCHANGE --- lisp/org.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 7984bdebe..ec4a59c48 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -11131,18 +11131,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)) From 80b1ebc6812275da3224e3b184cf3137b3bc2104 Mon Sep 17 00:00:00 2001 From: Philip 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 3e1ef6d6b..2dc62e62b 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