diff options
| author | David Kastrup <[email protected]> | 2005-02-18 14:28:24 +0000 |
|---|---|---|
| committer | David Kastrup <[email protected]> | 2005-02-18 14:28:24 +0000 |
| commit | 3a51abf1df61bfee39f8293c910028c2c86af16a (patch) | |
| tree | c8a7804c3d10986ce0301be9b90ce4725e29bbf9 /lisp | |
| parent | 7e53cec24ef3d4adb600dacff58d9ca4a249692b (diff) | |
(meta-mark-active): Fix condition to just
use `mark-active' when defined.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/meta-mode.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 39b2932607..473afa9040 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-02-18 David Kastrup <[email protected]> + + * progmodes/meta-mode.el (meta-mark-active): Fix condition to just + use `mark-active' when defined. + 2005-02-18 Kenichi Handa <[email protected]> * ps-print.el (ps-font-info-database): New entry diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index ecf8da2e50..7bf9921b2e 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))) |