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.

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

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.

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.

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