[Emacs-diffs] /srv/bzr/emacs/trunk r108232: (rst-re-alist): Fix loading (bug#11462).

[Stefan Merten]

------------------------------------------------------------
revno: 108232 [merge]
committer: Stefan Merten <address@hidden>
branch nick: trunk
timestamp: Mon 2012-05-14 22:39:14 +0200
message:
  (rst-re-alist): Fix loading (bug#11462).
modified:
  lisp/ChangeLog
  lisp/textmodes/rst.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-14 16:11:24 +0000
+++ b/lisp/ChangeLog    2012-05-14 20:39:14 +0000
@@ -1,3 +1,7 @@
+2012-05-14  Stefan Merten  <address@hidden>
+
+       * textmodes/rst.el (rst-re-alist): Fix loading (bug#11462).
+
 2012-05-14  Stefan Monnier  <address@hidden>
 
        * net/rlogin.el (rlogin-mode-map): Fix last change.

=== modified file 'lisp/textmodes/rst.el'
--- a/lisp/textmodes/rst.el     2012-05-09 00:57:18 +0000
+++ b/lisp/textmodes/rst.el     2012-05-14 09:31:08 +0000
@@ -422,17 +422,6 @@
 Each entry consists of the symbol naming the regex and an
 argument list for `rst-re'.")
 
-(defconst rst-re-alist
-  ;; Shadow global value we are just defining so we can construct it step by
-  ;; step
-  (let (rst-re-alist)
-    (dolist (re rst-re-alist-def)
-      (setq rst-re-alist
-           (nconc rst-re-alist
-                  (list (list (car re) (apply 'rst-re (cdr re)))))))
-    rst-re-alist)
-  "Alist mapping symbols from `rst-re-alist-def' to regex strings.")
-
 ;; FIXME: Use `sregex` or `rx` instead of re-inventing the wheel
 (defun rst-re (&rest args)
   "Interpret ARGS as regular expressions and return a regex string.
@@ -492,6 +481,18 @@
              (error "Unknown object type for building regex: %s" re))))
          args)))
 
+;; FIXME: Remove circular dependency between `rst-re' and `rst-re-alist'.
+(defconst rst-re-alist
+  ;; Shadow global value we are just defining so we can construct it step by
+  ;; step
+  (let (rst-re-alist)
+    (dolist (re rst-re-alist-def)
+      (setq rst-re-alist
+           (nconc rst-re-alist
+                  (list (list (car re) (apply 'rst-re (cdr re)))))))
+    rst-re-alist)
+  "Alist mapping symbols from `rst-re-alist-def' to regex strings.")
+
 
 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Mode definition.