4 files changed, 22 insertions, 2 deletions

diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 102f8bcf6a0..baf89533a52 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 45ecf6cbac2..4f9935c9150 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,17 @@
+<<<<<<< ChangeLog
+2009-02-02  Carsten Dominik  <dominik@science.uva.nl>
+
+        * refcards/orgcard.tex: New version number.
+
+2009-01-31  Carsten Dominik  <dominik@science.uva.nl>
+
+        * refcards/orgcard.tex: New version number.
+
+2009-01-30  Carsten Dominik  <dominik@science.uva.nl>
+
+        * refcards/orgcard.tex: New version number.
+
+=======
 2009-02-04  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * 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  <lekktu@gmail.com>
 
         * PROBLEMS (Windows): Add entry about TCC/4NT and App Paths keys.
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 994b3be3791..57552fcc312 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-04  Carsten Dominik  <dominik@science.uva.nl>
+
+        * org.el (org-return-follows-link): Revert setting
+        `org-return-follows-link' to t by default.
+
 2009-02-02  Carsten Dominik  <dominik@science.uva.nl>
 
         * org.el (org-cycle-global-at-bob): Fix typo.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index f60be95d7f3..e98750b48e7 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