Mercurial > emacs
changeset 101802:800be5321d24
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.
| author | Carsten Dominik <dominik@science.uva.nl> |
|---|---|
| date | Wed, 04 Feb 2009 23:01:58 +0000 |
| parents | 7f4c7258fee5 |
| children | 775ac8caba3d |
| files | doc/misc/org.texi etc/ChangeLog lisp/org/ChangeLog lisp/org/org.el |
| diffstat | 4 files changed, 22 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/org.texi Wed Feb 04 14:11:36 2009 +0000 +++ b/doc/misc/org.texi Wed Feb 04 23:01:58 2009 +0000 @@ -2796,7 +2796,7 @@ @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
--- a/etc/ChangeLog Wed Feb 04 14:11:36 2009 +0000 +++ b/etc/ChangeLog Wed Feb 04 23:01:58 2009 +0000 @@ -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.
--- a/lisp/org/ChangeLog Wed Feb 04 14:11:36 2009 +0000 +++ b/lisp/org/ChangeLog Wed Feb 04 23:01:58 2009 +0000 @@ -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.
--- a/lisp/org/org.el Wed Feb 04 14:11:36 2009 +0000 +++ b/lisp/org/org.el Wed Feb 04 23:01:58 2009 +0000 @@ -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