[Emacs-diffs] emacs doc/misc/org.texi etc/ChangeLog lisp/org/...

[Carsten Dominik]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Carsten Dominik <cdominik>      09/02/04 23:01:59

Modified files:
        doc/misc       : org.texi 
        etc            : ChangeLog 
        lisp/org       : ChangeLog org.el 

Log message:
        2009-02-04  Carsten Dominik  <address@hidden>
        
                * org.el (org-return-follows-link): Revert setting
                `org-return-follows-link' to t by default.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/misc/org.texi?cvsroot=emacs&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/ChangeLog?cvsroot=emacs&r1=1.761&r2=1.762
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/ChangeLog?cvsroot=emacs&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org.el?cvsroot=emacs&r1=1.44&r2=1.45

Patches:
Index: doc/misc/org.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/misc/org.texi,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- doc/misc/org.texi   2 Feb 2009 21:00:47 -0000       1.43
+++ doc/misc/org.texi   4 Feb 2009 23:01:58 -0000       1.44
@@ -2796,7 +2796,7 @@
 @cindex following links
 @kindex C-c C-o
 @kindex RET
address@hidden C-c C-o @r{or} @key{RET}
address@hidden 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

Index: etc/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/etc/ChangeLog,v
retrieving revision 1.761
retrieving revision 1.762
diff -u -b -r1.761 -r1.762
--- etc/ChangeLog       4 Feb 2009 13:36:59 -0000       1.761
+++ etc/ChangeLog       4 Feb 2009 23:01:58 -0000       1.762
@@ -1,3 +1,17 @@
+<<<<<<< ChangeLog
+2009-02-02  Carsten Dominik  <address@hidden>
+
+       * refcards/orgcard.tex: New version number.
+
+2009-01-31  Carsten Dominik  <address@hidden>
+
+       * refcards/orgcard.tex: New version number.
+
+2009-01-30  Carsten Dominik  <address@hidden>
+
+       * refcards/orgcard.tex: New version number.
+
+=======
 2009-02-04  Dan Nicolaescu  <address@hidden>
 
        * 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  <address@hidden>
 
        * PROBLEMS (Windows): Add entry about TCC/4NT and App Paths keys.

Index: lisp/org/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- lisp/org/ChangeLog  2 Feb 2009 21:50:00 -0000       1.62
+++ lisp/org/ChangeLog  4 Feb 2009 23:01:59 -0000       1.63
@@ -1,3 +1,8 @@
+2009-02-04  Carsten Dominik  <address@hidden>
+
+       * org.el (org-return-follows-link): Revert setting
+       `org-return-follows-link' to t by default.
+
 2009-02-02  Carsten Dominik  <address@hidden>
 
        * org.el (org-cycle-global-at-bob): Fix typo.

Index: lisp/org/org.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- lisp/org/org.el     2 Feb 2009 21:50:01 -0000       1.44
+++ lisp/org/org.el     4 Feb 2009 23:01:59 -0000       1.45
@@ -1113,7 +1113,7 @@
   :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