From de6201b19c78c9f13f857f43a8f097e56d75fa0f Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 28 Dec 2012 11:03:58 +0100 Subject: [PATCH 1/4] org.el (org-insert-link): Fix bug when inserting links to headlines containing the ">" character MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * org.el (org-insert-link): Fix bug when inserting links to headlines containing the ">" character. Thanks to William Léchelle for reporting this. --- lisp/org.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 0fabaf600..837d49b59 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9317,10 +9317,11 @@ Use TAB to complete link prefixes, then RET for type-specific completion support ;; URL-like link, normalize the use of angular brackets. (setq link (org-remove-angle-brackets link))) - ;; Check if we are linking to the current file with a search option - ;; If yes, simplify the link by using only the search option. + ;; Check if we are linking to the current file with a search + ;; option If yes, simplify the link by using only the search + ;; option. (when (and buffer-file-name - (string-match "^file:\\(.+?\\)::\\([^>]+\\)" link)) + (string-match "^file:\\(.+?\\)::\\(.+\\)" link)) (let* ((path (match-string 1 link)) (case-fold-search nil) (search (match-string 2 link))) From 5c4d3cbcbfc16abb6956e2ca1ec90c4f1cb77696 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 28 Dec 2012 11:06:57 +0100 Subject: [PATCH 2/4] org-clock.el (org-clock-persist): Docstring fix: document the 'history value * org-clock.el (org-clock-persist): Docstring fix: document the 'history value. Thanks to Ivan Andrus for reporting this. --- lisp/org-clock.el | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index e8ced67e6..3b3e8865c 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -159,12 +159,15 @@ the clock can be resumed from that point." The clock is resumed when Emacs restarts. When this is t, both the running clock, and the entire clock history are saved. When this is the symbol `clock', only the -running clock is saved. +running clock is saved. When this is the symbol `history', only +the clock history is saved. -When Emacs restarts with saved clock information, the file containing the -running clock as well as all files mentioned in the clock history will -be visited. -All this depends on running `org-clock-persistence-insinuate' in .emacs" +When Emacs restarts with saved clock information, the file containing +the running clock as well as all files mentioned in the clock history +will be visited. + +All this depends on running `org-clock-persistence-insinuate' in your +Emacs initialization file." :group 'org-clock :type '(choice (const :tag "Just the running clock" clock) From ffcd23cf30c7ef70bdd54d0b555b4551087e73c8 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 28 Dec 2012 12:41:07 +0100 Subject: [PATCH 3/4] org.el (org-cycle-internal-local): Fix bug: allow headings with leading blank characters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * org.el (org-cycle-internal-local): Fix bug: allow headings with leading blank characters. Thanks to Rémi Vanicat for sending a patch for this. --- lisp/org.el | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 837d49b59..6cf5b8d08 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6259,11 +6259,7 @@ in special contexts. (setq has-children (org-list-has-child-p (point) struct))) (org-back-to-heading) (setq eoh (save-excursion (outline-end-of-heading) (point))) - (setq eos (save-excursion - (org-end-of-subtree t) - (unless (eobp) - (skip-chars-forward " \t\n")) - (if (eobp) (point) (1- (point))))) + (setq eos (save-excursion (1- (org-end-of-subtree t t)))) (setq has-children (or (save-excursion (let ((level (funcall outline-level))) From 43a242c44d6af058559b6d13fce3bb6c460edd1c Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Fri, 28 Dec 2012 08:20:56 -0700 Subject: [PATCH 4/4] Pass the dir option on through org-export-as-string * lisp/org-exp.el (org-export-string): Pass the dir option on through to any subsequent export functions. --- lisp/org-exp.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index a578fe70f..c49075354 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -3047,7 +3047,7 @@ to the value of `temporary-file-directory'." (eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode' (list 'let org-local-vars (list (intern (format "org-export-as-%s" fmt)) - nil nil nil ''string t)))) + nil nil nil ''string t dir)))) (delete-file tmp-file)))) ;;;###autoload