Mercurial > emacs
comparison lisp/smerge-mode.el @ 37430:a0e805e3a7f1
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker): Use
display-color-p instead of window-system.
(calendar-mode-map, calendar-mode): Use display-popup-menus-p instead of
window-system.
(calendar-hide-window): Use display-multi-frame-p instead of window-system.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Mon, 23 Apr 2001 14:19:57 +0000 |
| parents | c0360458748f |
| children | 11f935c05521 |
comparison
equal
deleted
inserted
replaced
| 37429:8536ad236a7d | 37430:a0e805e3a7f1 |
|---|