aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman2007-03-05 20:27:34 +0000
committerRichard M. Stallman2007-03-05 20:27:34 +0000
commit7b1730dd1fd836aa4b524dd521557063ce33fd44 (patch)
tree31edc2c7e4632023a37a275b5c59b7175fa6922d /lisp
parenteb69fe3e0ad2641090ae3222d3d07fea26df318c (diff)
downloademacs-7b1730dd1fd836aa4b524dd521557063ce33fd44.tar.gz
emacs-7b1730dd1fd836aa4b524dd521557063ce33fd44.zip
(reb-re-syntax): Fix custom type.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/emacs-lisp/re-builder.el5
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01eccdb411e..e5832df2dd4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12007-03-05 Richard Stallman <rms@gnu.org>
2
3 * emacs-lisp/re-builder.el (reb-re-syntax): Fix custom type.
4
5 * files.el (find-file-noselect): No error if file no longer exists.
6 Display a message and avoid other questions.
7
12007-03-05 Stefan Monnier <monnier@iro.umontreal.ca> 82007-03-05 Stefan Monnier <monnier@iro.umontreal.ca>
2 9
3 * pcomplete.el (pcomplete-show-completions): Improve last change, so 10 * pcomplete.el (pcomplete-show-completions): Improve last change, so
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 08897bec72c..dc4562ab9bb 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -130,14 +130,13 @@
130 130
131(defcustom reb-re-syntax 'read 131(defcustom reb-re-syntax 'read
132 "*Syntax for the REs in the RE Builder. 132 "*Syntax for the REs in the RE Builder.
133Can either be `read', `string', `sregex' or `lisp-re'." 133Can either be `read', `string', `sregex', `lisp-re', `rx'."
134 :group 're-builder 134 :group 're-builder
135 :type '(choice (const :tag "Read syntax" read) 135 :type '(choice (const :tag "Read syntax" read)
136 (const :tag "String syntax" string) 136 (const :tag "String syntax" string)
137 (const :tag "`sregex' syntax" sregex) 137 (const :tag "`sregex' syntax" sregex)
138 (const :tag "`lisp-re' syntax" lisp-re) 138 (const :tag "`lisp-re' syntax" lisp-re)
139 (const :tag "`rx' syntax" rx) 139 (const :tag "`rx' syntax" rx)))
140 (value: string)))
141 140
142(defcustom reb-auto-match-limit 200 141(defcustom reb-auto-match-limit 200
143 "*Positive integer limiting the matches for RE Builder auto updates. 142 "*Positive integer limiting the matches for RE Builder auto updates.