ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Eric Schulte 2010-11-08 14:19:39 -07:00
parent c676f62361 6c95170ca0
commit 839a60f310
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org-exp.el
View File

@ -2608,9 +2608,10 @@ command."
;; does do the trick. ;; does do the trick.
(if (looking-at "#[^\r\n]*") (if (looking-at "#[^\r\n]*")
(append-to-buffer buffer (match-beginning 0) (1+ (match-end 0)))) (append-to-buffer buffer (match-beginning 0) (1+ (match-end 0))))
(while (re-search-forward "[\n\r]#[^\n\r]*" nil t) (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)) (append-to-buffer buffer (1+ (match-beginning 0))
(min (point-max) (1+ (match-end 0)))))) (min (point-max) (1+ (match-end 0)))))))
(set-buffer buffer) (set-buffer buffer)
(let ((buffer-file-name file) (let ((buffer-file-name file)
(org-inhibit-startup t)) (org-inhibit-startup t))

4
lisp/org.el
View File

@ -9170,10 +9170,6 @@ application the system uses for this file type."
(dired path) (dired path)
(org-open-file path in-emacs line search))) (org-open-file path in-emacs line search)))
((string= type "news")
(require 'org-gnus)
(org-gnus-follow-link path))
((string= type "shell") ((string= type "shell")
(let ((cmd path)) (let ((cmd path))
(if (or (not org-confirm-shell-link-function) (if (or (not org-confirm-shell-link-function)