(meta-mark-active): Fix condition to just

use `mark-active' when defined.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39b2932607755b831f42798030097dcf8bdccf4b..473afa9040d3a0c01eadcef21c3c6e6ae7fdfbd2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index ecf8da2e509ed750403b631f7bcb8e9ed9c1f5aa..7bf9921b2eeeabd504e4d580c6879622afbf1280 100644 (file)
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -898,7 +898,7 @@ The environment marked is the one that contains point or follows point."
 ;; 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)))
 
 
 \f