mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00
Code Issues Releases Activity

(rst-re-alist): Fix loading (bug#11462).

Browse Source
This commit is contained in:
Stefan Merten 2012-05-14 11:31:08 +02:00
parent 2d21d7f676
commit 51fa99f1e6
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2012-05-14 Stefan Merten <smerten@oekonux.de>
* textmodes/rst.el (rst-re-alist): Fix loading (bug#11462).
2012-05-14 Wolfgang Jenkner <wjenkner@inode.at>
* image-mode.el: Fit to width/height for rotated images (bug#11431).

23
lisp/textmodes/rst.el
View File

@ -422,17 +422,6 @@ in parentheses follows the development revision and the timestamp.")
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 @@ After interpretation of ARGS the results are concatenated as for
(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.