Mercurial > emacs
changeset 40024:2dee495c21db
(hilit-lookup-face-create): Call
set-face-font only if display-graphic-p.
(toplevel): Remove references to window-system.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 18 Oct 2001 09:55:02 +0000 |
| parents | 3914e6d2452f |
| children | 7e3b2224fd39 |
| files | lisp/obsolete/hilit19.el |
| diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/obsolete/hilit19.el Thu Oct 18 09:50:37 2001 +0000 +++ b/lisp/obsolete/hilit19.el Thu Oct 18 09:55:02 2001 +0000 @@ -1,6 +1,6 @@ ;;; hilit19.el --- customizable highlighting for Emacs 19 -;; Copyright (c) 1993, 1994 Free Software Foundation, Inc. +;; Copyright (c) 1993, 1994, 2001 Free Software Foundation, Inc. ;; Author: Jonathan Stigelman <stig@hackvan.com> ;; Maintainer: FSF @@ -635,7 +635,8 @@ ;; we wanted, but ignore errors making the face bold or italic ;; if the font isn't available, there's nothing to do about it... (progn - (set-face-font face basefont frame) + (when (display-graphic-p frame) + (set-face-font face basefont frame)) (set-face-underline-p face (string-match "underline" fn)) (if (string-match ".*bold" fn) ;; make face bold in all frames @@ -945,7 +946,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (and (not hilit-inhibit-rebinding) - window-system (progn (substitute-key-definition 'yank 'hilit-yank (current-global-map)) @@ -956,13 +956,11 @@ (global-set-key [?\C-\S-l] 'hilit-repaint-command) -(and window-system - (add-hook 'find-file-hooks 'hilit-find-file-hook t)) +(add-hook 'find-file-hooks 'hilit-find-file-hook t) (eval-when-compile (require 'gnus)) ; no compilation gripes (and (not hilit-inhibit-hooks) - window-system (condition-case c (progn