From ae72217329d663b8d8e5034d880f8d422dcb10c1 Mon Sep 17 00:00:00 2001
From: blais <blais@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Mon, 3 Dec 2007 20:22:26 +0000
Subject: [PATCH] Misc rst.el adjustments

git-svn-id: https://docutils.svn.sourceforge.net/svnroot/docutils/trunk/docutils@5467 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el         | 22 ++++++++++------------
 tools/editors/emacs/tests/Makefile | 11 +++++++----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index b85d62f42..b8c726c77 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -156,8 +156,6 @@
 ;;   below one below the last section decoration level preceding the
 ;;   cursor.  We need to fix that.
 
-
-
 ;;; TODO LIST
 
 ;; rst-toc-insert features
@@ -357,6 +355,13 @@ is for which (pred elem) is true)"
   "Syntax table used while in `rst-mode'.")
 
 
+(defcustom rst-mode-hook nil
+  "Hook run when Rst Mode is turned on. The hook for Text Mode is run before
+  this one."
+  :group 'rst
+  :type '(hook))
+
+
 ;;;###autoload
 (define-derived-mode rst-mode text-mode "ReST"
   :abbrev-table rst-mode-abbrev-table
@@ -2544,17 +2549,8 @@ set the empty lines too."
 
 
 
-
-
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Customization:
-
-(defcustom rst-mode-hook nil
-  "Hook run when Rst Mode is turned on. The hook for Text Mode is run before
-  this one."
-  :group 'rst
-  :type '(hook))
+;;; Customization for font-lock support:
 
 (defcustom rst-mode-lazy t
   "*If non-nil Rst Mode font-locks comment, literal blocks, and section titles
@@ -2567,6 +2563,8 @@ The value of this variable is used when Rst Mode is turned on."
   :group 'rst
   :type '(boolean))
 
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (require 'font-lock)
diff --git a/tools/editors/emacs/tests/Makefile b/tools/editors/emacs/tests/Makefile
index ea024e3fd..a7a05a759 100644
--- a/tools/editors/emacs/tests/Makefile
+++ b/tools/editors/emacs/tests/Makefile
@@ -1,9 +1,12 @@
+#!/usr/bin/env make
+
+EMACS=/usr/bin/emacs-23-unicode
 
 runtests:
-	emacs-21 --batch -l tests-basic.el
-	emacs-21 --batch -l tests-adjust-section.el
+	$(EMACS) --batch -l tests-basic.el
+	$(EMACS) --batch -l tests-adjust-section.el
 
 runtests-emacs-cvs:
-	emacs --script tests-basic.el
-	emacs --script tests-adjust-section.el
+	$(EMACS) --script tests-basic.el
+	$(EMACS) --script tests-adjust-section.el
 
-- 
2.11.4.GIT