X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fsimple.el;h=b0666a1d7cc7bc58386c6866963be0a22972151d;hb=099e49380bf87248e625016bfd7c6cac8915d280;hp=55ae78623445a5bac92f88d3bba28cdbdbc4234f;hpb=d81014e89b5102527e5b50aac62edeed2955671d;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/simple.el b/lisp/simple.el
index 55ae786..b0666a1 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1966,7 +1966,7 @@ intervening text will be added to the active region.
 
 When the region has been enabled or augmented as a result of a shifted
 motion key, an unshifted motion key will normally deselect the region.
-However, if `unshifted-motion-keys-deselect-region' is t, the region
+However, if `unshifted-motion-keys-deselect-region' is nil, the region
 will remain active, augmented by the characters moved over by this
 motion key.
 
@@ -3898,7 +3898,7 @@ This correctly caters to the user's setting of `zmacs-regions'."
 
 ;; 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.
 
@@ -3908,7 +3908,8 @@ want grayed out when the region is not active.  Instead, use this:
   [ ... ... :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;