* textmodes/rst.el: Fix compiler warning.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39e0cba4e3e3cd83437e4570019298aa8444d004..eb0c75d66d910c209479d20a2a5e2aa0db74315d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-23  Stefan Merten  <smerten@oekonux.de>
+
+       * textmodes/rst.el: Fix compiler warning.
+
 2012-09-23  Roland Winkler  <winkler@gnu.org>
 
        * textmodes/bibtex.el (bibtex-autokey-transcriptions): Transcribe
@@ -79,7 +83,7 @@
 
 2012-09-22  Stefan Merten  <smerten@oekonux.de>
 
-       * rst.el: Revamp section title faces.
+       * textmodes/rst.el: Revamp section title faces.
        (rst-official-version)
        (rst-package-emacs-version-alist): Sync with official version
        V1.4.0.
@@ -154,7 +158,7 @@
 
 2012-09-20  Stefan Merten  <smerten@oekonux.de>
 
-       * rst.el: Integrate support for `imenu' and `which-function'.
+       * textmodes/rst.el: Integrate support for `imenu' and `which-function'.
        Fixes feature request bug#11711.
        (rst-mode): Create `imenu-create-index-function'.
        (rst-get-stripped-line): Delete after refactoring.
@@ -294,7 +298,7 @@
 
 2012-09-17  Stefan Merten  <smerten@oekonux.de>
 
-       * rst.el: Add support for `testcover'.
+       * textmodes/rst.el: Add support for `testcover'.
        (rst-defcustom-testcover, rst-testcover-add-compose)
        (rst-testcover-add-1value): New functions.
        (rst-portable-mark-active-p): Replace by `use-region-p'.
@@ -2130,7 +2134,7 @@
 
 2012-07-30  Stefan Merten  <smerten@oekonux.de>
 
-       * rst.el: Silence `checkdoc-ispell'.
+       * textmodes/rst.el: Silence `checkdoc-ispell'.
        (rst-cvs-header, rst-svn-rev, rst-svn-timestamp)
        (rst-official-version, rst-official-cvs-rev)
        (rst-package-emacs-version-alist): Update to upstream V1.3.1.

diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index eeafe586c27c9e11fbf16eaf3b5c492352937dda..869da63064a166612889a93c8b508b6d303559e9 100644 (file)
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -118,7 +118,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Support for `testcover'
 
-(when (boundp 'testcover-1value-functions)
+(when (and (boundp 'testcover-1value-functions)
+          (boundp 'testcover-compose-functions))
   ;; Below `lambda' is used in a loop with varying parameters and is thus not
   ;; 1valued.
   (setq testcover-1value-functions
@@ -217,7 +218,7 @@ and before TAIL-RE and DELIM-RE in VAR or DEFAULT for no match."
 ;; Use CVSHeader to really get information from CVS and not other version
 ;; control systems.
 (defconst rst-cvs-header
-  "$CVSHeader: sm/rst_el/rst.el,v 1.327.2.1 2012-09-22 09:06:56 stefan Exp $")
+  "$CVSHeader: sm/rst_el/rst.el,v 1.327.2.2 2012-09-23 14:44:25 stefan Exp $")
 (defconst rst-cvs-rev
   (rst-extract-version "\\$" "CVSHeader: \\S + " "[0-9]+\\(?:\\.[0-9]+\\)+"
                       " .*" rst-cvs-header "0.0")
@@ -246,7 +247,7 @@ SVN revision is the upstream (docutils) revision.")
   "Official version of the package.")
 (defconst rst-official-cvs-rev
   (rst-extract-version "[%$]" "Revision: " "[0-9]+\\(?:\\.[0-9]+\\)+" " "
-                      "$Revision: 1.327.2.1 $")
+                      "$Revision: 1.327.2.2 $")
   "CVS revision of this file in the official version.")
 
 (defconst rst-version