diff options
author | Bastien Guerry <bzg@altern.org> | 2012-10-02 12:17:30 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-10-02 12:17:30 +0200 |
commit | c7d6970864065665f51f366a4589443fb564365f (patch) | |
tree | 17b42c4bd54f72e4f5f2390f5203a10053e20e8b | |
parent | 5dcca7201171d7e874c520d6a0b96a4418a52d2c (diff) | |
download | org-mode-c7d6970864065665f51f366a4589443fb564365f.tar.gz |
Fix manuals: don't mention (require 'org-install) anymore.
* org.texi (Installation): Don't mention org-install.el
anymore as the replacement file org-loaddefs.el is now loaded
by org.el.
* orgguide.texi (Installation): Ditto.
-rw-r--r-- | doc/org.texi | 13 | ||||
-rw-r--r-- | doc/orgguide.texi | 7 |
2 files changed, 1 insertions, 19 deletions
diff --git a/doc/org.texi b/doc/org.texi index 72e8d11..500ba96 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -965,13 +965,6 @@ on your system). make install-info @end example -Then add the following line to @file{.emacs}. It is needed so that -Emacs can autoload functions that are located in files not immediately loaded -when Org mode starts. -@lisp -(require 'org-install) -@end lisp - Do not forget to activate Org as described in the following section. @page @@ -1093,9 +1086,6 @@ shown below. ;; add latest org-mode to load path (add-to-list 'load-path (expand-file-name "/path/to/org-mode/lisp")) (add-to-list 'load-path (expand-file-name "/path/to/org-mode/contrib/lisp" t)) - -;; activate org -(require 'org-install) @end example If an error occurs, a backtrace can be very useful (see below on how to @@ -14524,14 +14514,13 @@ Be sure to adjust the paths to fit your system. # DIR=`pwd` FILES="" -ORGINSTALL="~/src/org/lisp/org-install.el" # wrap each argument in the code required to call tangle on it for i in $@@; do FILES="$FILES \"$i\"" done -emacs -Q --batch -l $ORGINSTALL \ +emacs -Q --batch \ --eval "(progn (add-to-list 'load-path (expand-file-name \"~/src/org/lisp/\")) (add-to-list 'load-path (expand-file-name \"~/src/org/contrib/lisp/\" t)) diff --git a/doc/orgguide.texi b/doc/orgguide.texi index 0c6f668..ea086f2 100644 --- a/doc/orgguide.texi +++ b/doc/orgguide.texi @@ -271,13 +271,6 @@ command: make @end smallexample -Then add the following line to @file{.emacs}. It is needed so that -Emacs can autoload functions that are located in files not immediately loaded -when Org-mode starts. -@smalllisp -(require 'org-install) -@end smalllisp - @node Activation, Feedback, Installation, Introduction @section Activation |