branch: elpa/gnuplot
commit 8d5b7f5d935fc019043ef51c4de3dcae20a86a47
Merge: e47e77e 7830b22
Author: Naoya Yamashita <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #51 from vxid/master
Add configuration instructions in README.org. Remove dotemacs.el.
---
INSTALL.org | 4 +---
Makefile.am | 2 +-
Makefile.in | 2 +-
README.org | 27 +++++++++++++++++++++++++++
dotemacs.el | 21 ---------------------
5 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/INSTALL.org b/INSTALL.org
index 6a4f7df..7535ac4 100644
--- a/INSTALL.org
+++ b/INSTALL.org
@@ -55,9 +55,7 @@
~dvips gpelcard.dvi~, or ~pdflatex gpelcard.tex~.
* Post-installation setup
- 1. Insert the contents of the ~dotemacs.el~ file into your
- ~.emacs~ or into the system's emacs start-up file to enable
- gnuplot mode.
+ 1. Enable gnuplot mode from your emacs configuration (see README.org).
2. The function ~gnuplot-info-lookup-symbol~ looks at the Gnuplot
info file that comes with this package or that can be made from
diff --git a/Makefile.am b/Makefile.am
index b500d48..2c81a39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
dist_lisp_LISP = gnuplot.el gnuplot-gui.el gnuplot-context.el
-EXTRA_DIST = dotemacs.el gpelcard.dvi gpelcard.pdf gpelcard.ps gpelcard.tex
+EXTRA_DIST = gpelcard.dvi gpelcard.pdf gpelcard.ps gpelcard.tex
CLEANFILES = gpelcard.pdf gpelcard.ps gpelcard.dvi gpelcard.log gpelcard.aux
DISTCLEANFILES =
diff --git a/Makefile.in b/Makefile.in
index 05860b3..5504140 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -260,7 +260,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
dist_lisp_LISP = gnuplot.el gnuplot-gui.el gnuplot-context.el
-EXTRA_DIST = dotemacs.el gpelcard.dvi gpelcard.pdf gpelcard.ps gpelcard.tex
+EXTRA_DIST = gpelcard.dvi gpelcard.pdf gpelcard.ps gpelcard.tex
CLEANFILES = gpelcard.pdf gpelcard.ps gpelcard.dvi gpelcard.log gpelcard.aux
DISTCLEANFILES =
SUFFIXES = .el .elc .pdf .ps .tex
diff --git a/README.org b/README.org
index 1ade48b..afa249d 100644
--- a/README.org
+++ b/README.org
@@ -41,6 +41,33 @@
*** Installing from cloned repository or .tar.gz
See the file INSTALL.org for details.
+** Documentation
+*** Configuration Example
+
+First of all, make sure that =gnuplot.el= is in your load-path (this is
automatic if using a package helper like use-package). To do so manually, us
something like
+
+#+begin_src emacs-lisp
+(add-to-list 'load-path "/path/to/gnuplot")
+#+end_src
+
+A basic gnuplot configuration can be found below.
+
+#+begin_src emacs-lisp
+;; these lines enable the use of gnuplot mode
+(autoload 'gnuplot-mode "gnuplot" "gnuplot major mode" t)
+(autoload 'gnuplot-make-buffer "gnuplot" "open a buffer in gnuplot mode" t)
+
+;; this line automatically causes all files with the .gp extension to be
loaded into gnuplot mode
+(setq auto-mode-alist (append '(("\\.gp$" . gnuplot-mode)) auto-mode-alist))
+
+;; This line binds the function-9 key so that it opens a buffer into gnuplot
mode
+(global-set-key [(f9)] 'gnuplot-make-buffer)
+#+end_src
+
+*** Reference Card
+
+ A reference card for gnuplot-mode can be compiled using the =gpelcard.tex=
file included in this package.
+
** New features for gnuplot-mode 0.7
Version 0.7 of gnuplot-mode is designed for use with gnuplot
version 4.4 and up. It will also mostly work fine with older
diff --git a/dotemacs.el b/dotemacs.el
deleted file mode 100644
index 310cf03..0000000
--- a/dotemacs.el
+++ /dev/null
@@ -1,21 +0,0 @@
-;;--------------------------------------------------------------------
-;; Lines enabling gnuplot-mode
-
-;; move the files gnuplot.el to someplace in your lisp load-path or
-;; use a line like
-;; (setq load-path (append (list "/path/to/gnuplot") load-path))
-
-;; these lines enable the use of gnuplot mode
-(autoload 'gnuplot-mode "gnuplot" "gnuplot major mode" t)
-(autoload 'gnuplot-make-buffer "gnuplot" "open a buffer in gnuplot mode" t)
-
-;; this line automatically causes all files with the .gp extension to
-;; be loaded into gnuplot mode
-(setq auto-mode-alist (append '(("\\.gp$" . gnuplot-mode)) auto-mode-alist))
-
-;; This line binds the function-9 key so that it opens a buffer into
-;; gnuplot mode
-(global-set-key [(f9)] 'gnuplot-make-buffer)
-
-;; end of line for gnuplot-mode
-;;--------------------------------------------------------------------