Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
51fa99f1
Commit
51fa99f1
authored
May 14, 2012
by
Stefan Merten
Browse files
(rst-re-alist): Fix loading (bug#11462).
parent
2d21d7f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
11 deletions
+16
-11
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/textmodes/rst.el
lisp/textmodes/rst.el
+12
-11
No files found.
lisp/ChangeLog
View file @
51fa99f1
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).
...
...
lisp/textmodes/rst.el
View file @
51fa99f1
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment