Mercurial > hg > xemacs-beta
changeset 2611:139afe9fb2ee
[xemacs-hg @ 2005-02-23 22:25:15 by adrian]
[PATCH] xemacs-21.5-clean: `region-active-p' to only return t when <zmxwtboa.fsf@smtprelay.t-online.de>
| author | adrian |
|---|---|
| date | Wed, 23 Feb 2005 22:25:16 +0000 |
| parents | 16738b49b833 |
| children | dbf2014618e0 |
| files | lisp/ChangeLog lisp/cmdloop.el lisp/minibuf.el lisp/simple.el |
| diffstat | 4 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Feb 23 22:09:15 2005 +0000 +++ b/lisp/ChangeLog Wed Feb 23 22:25:16 2005 +0000 @@ -1,3 +1,12 @@ +2005-02-23 Adrian Aichner <adrian@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. + 2005-02-20 Adrian Aichner <adrian@xemacs.org> * replace.el (operate-on-non-matching-lines): Append matching
--- a/lisp/cmdloop.el Wed Feb 23 22:09:15 2005 +0000 +++ b/lisp/cmdloop.el Wed Feb 23 22:25:16 2005 +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
--- a/lisp/minibuf.el Wed Feb 23 22:09:15 2005 +0000 +++ b/lisp/minibuf.el Wed Feb 23 22:25:16 2005 +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
--- a/lisp/simple.el Wed Feb 23 22:09:15 2005 +0000 +++ b/lisp/simple.el Wed Feb 23 22:25:16 2005 +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;