From a73951d7b002b3e4defc3f97c715a824544766d6 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Sat, 27 Aug 2005 02:25:35 +0000 Subject: [PATCH] Allow Emacs 21.3 to use extended character classes in regexps. * lisp/muse-regexps.el (muse-extreg-usable-p): Use a simpler algorithm. Since enough positive reports have come in about the usability of 21.3, we'll allow it to use extended character classes in regexps by default. git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-210 --- ChangeLog | 15 +++++++++++++++ lisp/muse-regexps.el | 18 +++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4335a94..480ef74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,21 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0 # +2005-08-27 02:25:35 GMT Michael Olson patch-210 + + Summary: + Allow Emacs 21.3 to use extended character classes in regexps. + Revision: + muse--main--1.0--patch-210 + + * lisp/muse-regexps.el (muse-extreg-usable-p): Use a simpler algorithm. + Since enough positive reports have come in about the usability of 21.3, + we'll allow it to use extended character classes in regexps by default. + + modified files: + ChangeLog lisp/muse-regexps.el + + 2005-08-26 14:48:08 GMT Michael Olson patch-209 Summary: diff --git a/lisp/muse-regexps.el b/lisp/muse-regexps.el index ba7f22a..2cdaba6 100644 --- a/lisp/muse-regexps.el +++ b/lisp/muse-regexps.el @@ -64,19 +64,11 @@ options." t) ((eq muse-regexp-use-character-classes nil) nil) - (t - (save-match-data - (string-match "^[0-9]+\\.[0-9]+\\.\\([0-9]+\\)" - emacs-version) - (cond ((featurep 'xemacs) nil) ; unusable on XEmacs - ((> emacs-major-version 21) t) ; usable if > 21 - ((< emacs-major-version 21) nil) - ((< emacs-minor-version 3) nil) - ;; don't use if version is of format 21.x - ((null (match-string 1 emacs-version)) nil) - ;; don't trust the 21.3.1 release or its predecessors - ((> (string-to-number (match-string 1 emacs-version)) 1) t) - (t nil)))))) + ((featurep 'xemacs) nil) ; unusable on XEmacs + ((> emacs-major-version 21) t) + ((< emacs-major-version 21) nil) + ((> emacs-minor-version 2) t) + (t nil))) (defcustom muse-regexp-blank (if (muse-extreg-usable-p) -- 2.11.4.GIT