mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-08 15:35:02 +00:00
Code Issues Releases Activity

* lisp/emacs-lisp/regexp-opt.el (regexp-opt-charset): Fix ^.

Browse Source 
* test/automated/regexp-tests.el: New file.

Fixes: debbugs:16046
This commit is contained in:
Cameron Desautels 2013-12-05 15:25:54 -05:00 committed by Stefan Monnier
parent c619527c15
commit bf4906d7ca
4 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2013-12-05 Cameron Desautels <camdez@gmail.com> (tiny change)
* emacs-lisp/regexp-opt.el (regexp-opt-charset): Fix ^ (bug#16046).
2013-12-05 Teodor Zlatanov <tzz@lifelogs.com>
* net/eww.el (eww-current-source): New variable to store page

4
lisp/emacs-lisp/regexp-opt.el
View File

@ -285,7 +285,9 @@ CHARS should be a list of characters."
;;
;; Make sure a caret is not first and a dash is first or last.
(if (and (string-equal charset "") (string-equal bracket ""))
(concat "[" dash caret "]")
(if (string-equal dash "")
"\\^" ; [^] is not a valid regexp
(concat "[" dash caret "]"))
(concat "[" bracket charset caret dash "]"))))
(provide 'regexp-opt)

17
test/ChangeLog
View File

@ -1,13 +1,16 @@
2013-12-05 Stefan Monnier <monnier@iro.umontreal.ca>
* automated/regexp-tests.el: New file.
2013-11-29 Eli Zaretskii <eliz@gnu.org>
* automated/reftex-tests.el (reftex-parse-from-file-test): Run
temp-dir through file-truename, to make sure the temporary file
* automated/reftex-tests.el (reftex-parse-from-file-test):
Run temp-dir through file-truename, to make sure the temporary file
names are comparable as strings.
* automated/decoder-tests.el (ert-test-decoder-prefer-utf-8):
Force Unix EOLs by using 'utf-8-unix', since the default of
'utf-8' is system-dependent, while the test expects to see Unix
EOLs.
'utf-8' is system-dependent, while the test expects to see Unix EOLs.
2013-11-28 Glenn Morris <rgm@gnu.org>
@ -15,8 +18,7 @@
2013-11-28 Eli Zaretskii <eliz@gnu.org>
* automated/Makefile.in (PATH_SEP): Set this instead of
PATH_SEPARATOR.
* automated/Makefile.in (PATH_SEP): Set this instead of PATH_SEPARATOR.
(EMACSOPT): Use $(PATH_SEP).
2013-11-28 Michael Albinus <michael.albinus@gmx.de>
@ -115,8 +117,7 @@
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process):
(tramp-test28-shell-command): Protect unwindforms with
`ignore-errors'.
(tramp-test28-shell-command): Protect unwindforms with `ignore-errors'.
(tramp-test29-utf8): New test.
2013-11-13 Michael Albinus <michael.albinus@gmx.de>

31
test/automated/regexp-tests.el Normal file
View File

@ -0,0 +1,31 @@
;;; regexp-tests.el --- Test suite for regular expression handling.
;; Copyright (C) 2013 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: internal
;; Human-Keywords: internal
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
(ert-deftest regexp-test-regexp-opt ()
"Test the `compilation-error-regexp-alist' regexps.
The test data is in `compile-tests--test-regexps-data'."
(should (string-match (regexp-opt-charset '(?^)) "a^b")))
;;; regexp-tests.el ends here.