(rmail-start-mail): Use display-multi-frame-p

instead of looking at window-system.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 768bae5c84385df7e886f30e3ec5f8d8ba2d1b32..3d83e93c255ab018dac6e780ffcbdf671999514e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,29 @@
+2000-07-31  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * calendar/appt.el (appt-disp-window): Use display-multi-frame-p
+       instead of window-system.
+
+       * wid-edit.el (widget-choose): Use display-mouse-p instead of
+       window-system.
+       (widget-choice-mouse-down-action): Use display-popup-menus-p
+       instead of window-system.
+
+       * strokes.el (strokes-file): Run the file name through
+       convert-standard-filename.
+       (strokes-mode): Call display-mouse-p instead of looking at
+       window-system.  Change the error message accordingly.
+
+       * progmodes/cpp.el (toplevel): Support faces on tty's.
+
+       * play/landmark.el (lm-font-lock-face-O, lm-font-lock-face-X)
+       (lm-plot-square, lm-init-display): Don't use window-system.
+
+       * play/gomoku.el (gomoku-font-lock-O-face, gomoku-font-lock-X-face)
+       (gomoku-plot-square, gomoku-init-display): Don't use window-system.
+
+       * mail/rmail.el (rmail-start-mail): Use display-multi-frame-p
+       instead of looking at window-system.
+
 2000-07-30  Gerd Moellmann  <gerd@gnu.org>
 
        * iswitchb.el (iswitchb-entryfn-p): Test this-command instead

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index e3040e6a283a1a1f19a072239a0b97538e6d330d..b603148e6634981952864d577edce87999b0cd7f 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2767,7 +2767,7 @@ Deleted messages stay in the file until the \\[rmail-expunge] command is given."
        (compose-mail to subject others
                      noerase nil
                      yank-action sendactions)
-      (if (and window-system rmail-mail-new-frame)
+      (if (and (display-multi-frame-p) rmail-mail-new-frame)
          (prog1
              (compose-mail to subject others
                            noerase 'switch-to-buffer-other-frame