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

Protect the require 'org-irc calls until we have something better.

This commit is contained in:
Carsten Dominik 2008-03-13 12:59:20 +01:00
parent eaa5446e6b
commit 0b1207b43c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.el
View File

@ -12177,7 +12177,7 @@ For some link types, a prefix arg is interpreted:
For links to usenet articles, arg negates `org-usenet-links-prefer-google'. For links to usenet articles, arg negates `org-usenet-links-prefer-google'.
For file links, arg negates `org-context-in-file-links'." For file links, arg negates `org-context-in-file-links'."
(interactive "P") (interactive "P")
(require 'org-irc) (condition-case nil (require 'org-irc) (error nil))
(setq org-store-link-plist nil) ; reset (setq org-store-link-plist nil) ; reset
(let (link cpltxt desc description search txt) (let (link cpltxt desc description search txt)
(cond (cond
@ -12832,7 +12832,7 @@ the end of the current subtree.
Normally, files will be opened by an appropriate application. If the Normally, files will be opened by an appropriate application. If the
optional argument IN-EMACS is non-nil, Emacs will visit the file." optional argument IN-EMACS is non-nil, Emacs will visit the file."
(interactive "P") (interactive "P")
(require 'org-irc) (condition-case nil (require 'org-irc) (error nil))
(move-marker org-open-link-marker (point)) (move-marker org-open-link-marker (point))
(setq org-window-config-before-follow-link (current-window-configuration)) (setq org-window-config-before-follow-link (current-window-configuration))
(org-remove-occur-highlights nil nil t) (org-remove-occur-highlights nil nil t)