summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-12-20 15:38:40 +0100
committerCarsten Dominik <carsten.dominik@gmail.com>2010-12-20 15:38:40 +0100
commit2d47a109b2bbe7739fcbe0ff6384070e0dee7c6b (patch)
treea100872c18c4d9604831b732e10230c20741ef07
parentee035ae12bf13944c9ac293e8ba953403a182df5 (diff)
downloadorg-mode-2d47a109b2bbe7739fcbe0ff6384070e0dee7c6b.tar.gz
Modify activation section in manual
-rw-r--r--doc/org.texi29
1 files changed, 14 insertions, 15 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 7c62faa..2657e46 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -886,28 +886,27 @@ Do not forget to activate Org as described in the following section.
@cindex global key bindings
@cindex key bindings, global
-Add the following lines to your @file{.emacs} file. The last three lines
-define @emph{global} keys for the commands @command{org-store-link},
-@command{org-agenda}, and @command{org-iswitchb}---please choose suitable
-keys yourself.
-
+To make sure files with extension @file{.org} use Org mode, add the following
+line to your @file{.emacs} file.
@lisp
-;; The following lines are always needed. Choose your own keys.
(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
+@end lisp
+@noindent Org mode buffers need font-lock to be turned on - this is the
+default in Emacs@footnote{If you don't use font-lock globally, turn it on in
+Org buffer with @code{(add-hook 'org-mode-hook 'turn-on-font-lock)}}.
+
+The four Org commands @command{org-store-link}, @command{org-capture},
+@command{org-agenda}, and @command{org-iswitchb} should be accessible through
+global keys (i.e. anywhere in Emacs, not just in Org buffers). Here are
+suggested bindings for these keys, please modify the keys to your own
+liking.
+@lisp
(global-set-key "\C-cl" 'org-store-link)
+(global-set-key "\C-cc" 'org-capture)
(global-set-key "\C-ca" 'org-agenda)
(global-set-key "\C-cb" 'org-iswitchb)
@end lisp
-Furthermore, you must activate @code{font-lock-mode} in Org
-buffers, because significant functionality depends on font-locking being
-active. You can do this with either one of the following two lines
-(XEmacs users must use the second option):
-@lisp
-(global-font-lock-mode 1) ; for all buffers
-(add-hook 'org-mode-hook 'turn-on-font-lock) ; Org buffers only
-@end lisp
-
@cindex Org-mode, turning on
With this setup, all files with extension @samp{.org} will be put
into Org-mode. As an alternative, make the first line of a file look