mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-06 20:49:33 +00:00
Code Issues Releases Activity

(rx-check-any, rx-check-not): Quote "]"s in regexps when they have no

Browse Source 
special meaning.
This commit is contained in:
Eli Zaretskii 2006-03-03 12:20:26 +00:00
parent ddb72af931
commit a6966c1ce7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,5 +1,10 @@
2006-03-03 Martin Rudalics <rudalics@gmx.at>
* font-lock.el (lisp-font-lock-keywords-2)
* emacs-lisp/rx.el (rx-check-any, rx-check-not)
* generic-x.el (reg-generic-mode): Quote "]"s in regexps when
they have no special meaning.
* midnight.el (clean-buffer-list): Handle case where base-buffer of
indirect buffer gets killed before indirect buffer. Use dolist.

6
lisp/emacs-lisp/rx.el
View File

@ -372,8 +372,8 @@ FORM is of the form `(and FORM1 ...)'."
(if (eq ?^ (aref arg 0))
(setq arg (concat "\\" arg)))
;; Remove ] and set flag for adding it to start of overall result.
(when (string-match "]" arg)
(setq arg (replace-regexp-in-string "]" "" arg)
(when (string-match "\\]" arg)
(setq arg (replace-regexp-in-string "\\]" "" arg)
rx-bracket "]")))
(when (symbolp arg)
(let ((translation (condition-case nil
@ -405,7 +405,7 @@ ARG is optional."
(defun rx-check-not (arg)
"Check arg ARG for Rx `not'."
(unless (or (and (symbolp arg)
(string-match "\\`\\[\\[:[-a-z]:]]\\'"
(string-match "\\`\\[\\[:[-a-z]:\\]\\]\\'"
(condition-case nil
(rx-to-string arg 'no-group)
(error ""))))