From: David Kastrup Date: Fri, 18 Feb 2005 14:28:24 +0000 (+0000) Subject: (meta-mark-active): Fix condition to just X-Git-Tag: ttn-vms-21-2-B4~2215 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3a51abf1df61bfee39f8293c910028c2c86af16a;p=emacs.git (meta-mark-active): Fix condition to just use `mark-active' when defined. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 39b29326077..473afa9040d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-02-18 David Kastrup + + * progmodes/meta-mode.el (meta-mark-active): Fix condition to just + use `mark-active' when defined. + 2005-02-18 Kenichi Handa * ps-print.el (ps-font-info-database): New entry diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index ecf8da2e509..7bf9921b2ee 100644 --- 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)))