User: adrian Date: 05/02/23 23:25:18 Modified: xemacs/lisp ChangeLog cmdloop.el minibuf.el simple.el Log: [PATCH] xemacs-21.5-clean: `region-active-p' to only return t when <zmxwtboa.fsf(a)smtprelay.t-online.de&gt; Revision Changes Path 1.646 +9 -0 XEmacs/xemacs/lisp/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.645 retrieving revision 1.646 diff -u -r1.645 -r1.646 --- ChangeLog 2005/02/23 22:09:13 1.645 +++ ChangeLog 2005/02/23 22:25:15 1.646 ＠＠ -1,3 +1,12 ＠＠ +2005-02-23 Adrian Aichner <adrian(a)xemacs.org&gt; + + * 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(a)xemacs.org&gt; * replace.el (operate-on-non-matching-lines): Append matching 1.17 +1 -2 XEmacs/xemacs/lisp/cmdloop.el Index: cmdloop.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cmdloop.el,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- cmdloop.el 2003/05/02 06:32:29 1.16 +++ cmdloop.el 2005/02/23 22:25:16 1.17 ＠＠ -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 1.28 +1 -2 XEmacs/xemacs/lisp/minibuf.el Index: minibuf.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/minibuf.el,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- minibuf.el 2005/01/28 02:58:40 1.27 +++ minibuf.el 2005/02/23 22:25:16 1.28 ＠＠ -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 1.50 +3 -2 XEmacs/xemacs/lisp/simple.el Index: simple.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/simple.el,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- simple.el 2005/01/17 11:23:01 1.49 +++ simple.el 2005/02/23 22:25:16 1.50 ＠＠ -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;