From 49a00abf3d2b149b8fb72eca531569e6f4d56b5e Mon Sep 17 00:00:00 2001 From: David Maus Date: Sun, 7 Nov 2010 16:21:32 +0100 Subject: [PATCH 1/2] Remove stale link handler for news: links * org.el (org-open-at-point): Remove stale link handler for news: links. This condition case is never evaluated because the news: link is already passed to `browse-url'. --- lisp/org.el | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 57ada2922..8227ed9eb 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9170,10 +9170,6 @@ application the system uses for this file type." (dired path) (org-open-file path in-emacs line search))) - ((string= type "news") - (require 'org-gnus) - (org-gnus-follow-link path)) - ((string= type "shell") (let ((cmd path)) (if (or (not org-confirm-shell-link-function) From 6c95170ca0eda739d699f207bcb09528297d8ca1 Mon Sep 17 00:00:00 2001 From: David Maus Date: Sun, 7 Nov 2010 20:06:54 +0100 Subject: [PATCH 2/2] Limit search for in-buffer options beginning of first headline * org-exp.el (org-export-visible): Limit search for in-buffer options beginning of first headline. --- lisp/org-exp.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index fb867c0a2..9004dd5ea 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2608,9 +2608,10 @@ command." ;; does do the trick. (if (looking-at "#[^\r\n]*") (append-to-buffer buffer (match-beginning 0) (1+ (match-end 0)))) - (while (re-search-forward "[\n\r]#[^\n\r]*" nil t) - (append-to-buffer buffer (1+ (match-beginning 0)) - (min (point-max) (1+ (match-end 0)))))) + (when (re-search-forward "^\\*+[ \t]+" nil t) + (while (re-search-backward "[\n\r]#[^\n\r]*" nil t) + (append-to-buffer buffer (1+ (match-beginning 0)) + (min (point-max) (1+ (match-end 0))))))) (set-buffer buffer) (let ((buffer-file-name file) (org-inhibit-startup t))