diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-03-04 23:07:13 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-03-04 23:07:13 +0000 |
| commit | 00bc10dab1f80e3fcf1b8e67dd7618c32ae3926d (patch) | |
| tree | 875ed4fe8e87a4a52d5ea46140b3c70487847c81 /lisp/emacs-lisp | |
| parent | bdf36482bbea390390ae7ab1461b14b807c4fb1f (diff) | |
| parent | 5e9edb94b78ef77981213fca9319d591c7362855 (diff) | |
| download | emacs-00bc10dab1f80e3fcf1b8e67dd7618c32ae3926d.tar.gz emacs-00bc10dab1f80e3fcf1b8e67dd7618c32ae3926d.tar.bz2 emacs-00bc10dab1f80e3fcf1b8e67dd7618c32ae3926d.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-128
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-129
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-130
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-131
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-132
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-133
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-134
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-135
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-43
Munge arch explicit ids in etc/images to match Emacs
* emacs@sv.gnu.org/gnus--rel--5.10--patch-44
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-45
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-46
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-47
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-48
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-524
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/rx.el | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 49cf4115923..444c310920d 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -2660,13 +2660,14 @@ MSG is printed after `::::} '." ;; Display result of previous evaluation. (if (and edebug-break (not (eq edebug-execution-mode 'Continue-fast))) - (sit-for 1)) ; Show break message. + (edebug-sit-for edebug-sit-for-seconds)) ; Show message. (edebug-previous-result))) (cond (edebug-break (cond - ((eq edebug-execution-mode 'continue) (edebug-sit-for 1)) + ((eq edebug-execution-mode 'continue) + (edebug-sit-for edebug-sit-for-seconds)) ((eq edebug-execution-mode 'Continue-fast) (edebug-sit-for 0)) (t (setq edebug-stop t)))) ;; not edebug-break diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 763aa97f214..694544e3c52 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -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 "")))) |