I think so, and I was going to recommend this when the review of the
21.5 version is done.
The replace.el performance patch will not be applicable to 21.4.
Best regards,
Adrian
Thanks,
Vin
On Wed, 23 Feb 2005 00:30:45 +0100, Adrian Aichner <adrian(a)xemacs.org> wrote:
>
> As discussed recently.
>
> I intend to commit this tomorrow.
>
> Best regards,
>
> Adrian
>
> xemacs-21.5-clean ChangeLog patch:
> Diff command: cvs -q diff -U 0
> Files affected: lisp/ChangeLog
>
> Index: lisp/ChangeLog
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
> retrieving revision 1.643
> diff -u -U0 -r1.643 ChangeLog
> --- lisp/ChangeLog 22 Feb 2005 07:16:06 -0000 1.643
> +++ lisp/ChangeLog 22 Feb 2005 23:27:40 -0000
> @@ -0,0 +1,9 @@
> +2005-02-23 Adrian Aichner <adrian(a)xemacs.org>
> +
> + * cmdloop.el (keyboard-quit): Remove workaround for
> + `region-active-p' not making sure active region is in current
> + buffer now that it does.
> + * minibuf.el (minibuffer-keyboard-quit): Ditto.
> + * simple.el (region-active-p): `region-active-p' to only return t
> + when active region is in current buffer.
> +
>
> xemacs-21.5-clean source patch:
> Diff command: cvs -f -z3 -q diff -u -w -N
> Files affected: lisp/simple.el lisp/minibuf.el lisp/cmdloop.el
>
> Index: lisp/cmdloop.el
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cmdloop.el,v
> retrieving revision 1.16
> diff -u -w -r1.16 cmdloop.el
> --- lisp/cmdloop.el 2 May 2003 06:32:29 -0000 1.16
> +++ lisp/cmdloop.el 22 Feb 2005 23:20:59 -0000
> @@ -72,8 +72,7 @@
> If `zmacs-regions' is true, and the zmacs region is active in this buffer,
> then this key deactivates the region without beeping or signalling."
> (interactive)
> - (if (and (region-active-p)
> - (eq (current-buffer) (zmacs-region-buffer)))
> + (if (region-active-p)
> ;; pseudo-zmacs compatibility: don't beep if this ^G is simply
> ;; deactivating the region. If it is inactive, beep.
> nil
> Index: lisp/minibuf.el
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/minibuf.el,v
> retrieving revision 1.27
> diff -u -w -r1.27 minibuf.el
> --- lisp/minibuf.el 28 Jan 2005 02:58:40 -0000 1.27
> +++ lisp/minibuf.el 22 Feb 2005 23:21:00 -0000
> @@ -271,8 +271,7 @@
> If `zmacs-regions' is true, and the zmacs region is active in this buffer,
> then this key deactivates the region without beeping."
> (interactive)
> - (if (and (region-active-p)
> - (eq (current-buffer) (zmacs-region-buffer)))
> + (if (region-active-p)
> ;; pseudo-zmacs compatibility: don't beep if this ^G is simply
> ;; deactivating the region. If it is inactive, beep.
> nil
> Index: lisp/simple.el
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/simple.el,v
> retrieving revision 1.49
> diff -u -w -r1.49 simple.el
> --- lisp/simple.el 17 Jan 2005 11:23:01 -0000 1.49
> +++ lisp/simple.el 22 Feb 2005 23:21:02 -0000
> @@ -3795,7 +3795,7 @@
>
> ;; XEmacs
> (defun region-active-p ()
> - "Return non-nil if the region is active.
> + "Return non-nil if the region is active in the current buffer.
> If `zmacs-regions' is true, this is equivalent to `region-exists-p'.
> Otherwise, this function always returns false.
>
> @@ -3805,7 +3805,8 @@
> [ ... ... :active (region-exists-p)]
>
> Which correctly caters to the user's setting of `zmacs-regions'."
> - (and zmacs-regions zmacs-region-extent))
> + (and zmacs-regions zmacs-region-extent
> + (eq (current-buffer) (zmacs-region-buffer))))
>
> (defvar zmacs-activate-region-hook nil
> "Function or functions called when the region becomes active;
>
> --
> Adrian Aichner
> mailto:adrian@xemacs.org
>
http://www.xemacs.org/
>
>