# HG changeset patch
# User David Kastrup <dak@gnu.org>
# Date 1108736904 0
# Node ID d1fdce4dfc73f438b93a1d88802d8bc18530ae31
# Parent  23d1c18f95f057315d0fd2f9481fce7c1eaf1c4b
(meta-mark-active): Fix condition to just
use `mark-active' when defined.

diff -r 23d1c18f95f0 -r d1fdce4dfc73 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Feb 18 07:08:18 2005 +0000
+++ b/lisp/ChangeLog	Fri Feb 18 14:28:24 2005 +0000
@@ -1,3 +1,8 @@
+2005-02-18  David Kastrup  <dak@gnu.org>
+
+	* progmodes/meta-mode.el (meta-mark-active): Fix condition to just
+	use `mark-active' when defined.
+
 2005-02-18  Kenichi Handa  <handa@m17n.org>
 
 	* ps-print.el (ps-font-info-database): New entry
diff -r 23d1c18f95f0 -r d1fdce4dfc73 lisp/progmodes/meta-mode.el
--- a/lisp/progmodes/meta-mode.el	Fri Feb 18 07:08:18 2005 +0000
+++ b/lisp/progmodes/meta-mode.el	Fri Feb 18 14:28:24 2005 +0000
@@ -898,7 +898,7 @@
 ;; Compatibility: XEmacs doesn't have the  `mark-active' variable.
 (defun meta-mark-active ()
   "Return whether the mark and region are currently active in this buffer."
-  (or (and (boundp 'mark-active) mark-active) (mark)))
+  (if (boundp 'mark-active) mark-active (mark)))