From cc6dbcb7b7d825535366c3ce4fb6720ad96ebbb0 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Wed, 4 Feb 2009 23:01:58 +0000 Subject: [PATCH] 2009-02-04 Carsten Dominik * org.el (org-return-follows-link): Revert setting `org-return-follows-link' to t by default. --- doc/misc/org.texi | 2 +- etc/ChangeLog | 15 +++++++++++++++ lisp/org/ChangeLog | 5 +++++ lisp/org/org.el | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 102f8bcf6a..baf89533a5 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -2796,7 +2796,7 @@ link and description parts of the link. @cindex following links @kindex C-c C-o @kindex RET -@item C-c C-o @r{or} @key{RET} +@item C-c C-o Open link at point. This will launch a web browser for URLs (using @command{browse-url-at-point}), run VM/MH-E/Wanderlust/Rmail/Gnus/BBDB for the corresponding links, and execute the command in a shell link. When the diff --git a/etc/ChangeLog b/etc/ChangeLog index 45ecf6cbac..4f9935c915 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,17 @@ +<<<<<<< ChangeLog +2009-02-02 Carsten Dominik + + * refcards/orgcard.tex: New version number. + +2009-01-31 Carsten Dominik + + * refcards/orgcard.tex: New version number. + +2009-01-30 Carsten Dominik + + * refcards/orgcard.tex: New version number. + +======= 2009-02-04 Dan Nicolaescu * compilation.txt (gnu): Add an example for the "note" format. @@ -6,6 +20,7 @@ * PROBLEMS (CPP): Note problem with resource compiler of MSVC. +>>>>>>> 1.761 2009-01-28 Juanma Barranquero * PROBLEMS (Windows): Add entry about TCC/4NT and App Paths keys. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 994b3be379..57552fcc31 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,8 @@ +2009-02-04 Carsten Dominik + + * org.el (org-return-follows-link): Revert setting + `org-return-follows-link' to t by default. + 2009-02-02 Carsten Dominik * org.el (org-cycle-global-at-bob): Fix typo. diff --git a/lisp/org/org.el b/lisp/org/org.el index f60be95d7f..e98750b48e 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -1113,7 +1113,7 @@ Needs to be set before org.el is loaded." :group 'org-link-follow :type 'boolean) -(defcustom org-return-follows-link t +(defcustom org-return-follows-link nil "Non-nil means, on links RET will follow the link. Needs to be set before org.el is loaded." :group 'org-link-follow -- 2.20.1