X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fminibuf.el;h=8177a3edc8c3beb9bab89f8f6c65234286a198ff;hb=e41b671ad8ef8f9d0464058e49a3a1ff9a5e4d4d;hp=d6dc4c4a6c12087b0020ab38ed434469f4a7cb6d;hpb=d8654f7c5ad0c04060008c6fbbd90add1f4537e3;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/minibuf.el b/lisp/minibuf.el
index d6dc4c4..8177a3e 100644
--- a/lisp/minibuf.el
+++ b/lisp/minibuf.el
@@ -271,8 +271,7 @@ in `substitute-in-file-name'."
 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
@@ -2197,7 +2196,9 @@ whether it is a file(/result) or a directory (/result/)."
 				"/usr/local/lib/X11R5/X11/"
 				"/usr/X11/lib/X11/"
 				"/usr/lib/X11/"
+				"/usr/share/X11/"
 				"/usr/local/lib/X11/"
+				"/usr/local/share/X11/"
 				"/usr/X386/lib/X11/"
 				"/usr/x386/lib/X11/"
 				"/usr/XFree86/lib/X11/"