mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-13 16:38:14 +00:00
Code Issues Releases Activity

Remove some XEmacs compat code for display-graphic-p

Browse Source 
* lisp/dframe.el (dframe-have-timer-flag):
* lisp/emacs-lisp/chart.el (chart-face-pixmap-list):
* lisp/speedbar.el (speedbar-easymenu-definition-base): Remove
XEmacs compat code; assume display-graphic-p is fboundp.

* lisp/progmodes/cperl-mode.el (cperl-tags-hier-init): Remove XEmacs
compat code.
This commit is contained in:
Stefan Kangas 2022-05-14 22:36:36 +02:00
parent b5621dbe2f
commit a0af789d06
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/dframe.el
View File

@ -120,9 +120,7 @@
:prefix "dframe-"
:group 'dframe)
(defvar dframe-have-timer-flag (if (fboundp 'display-graphic-p)
(display-graphic-p)
window-system)
(defvar dframe-have-timer-flag (display-graphic-p)
"Non-nil means that timers are available for this Emacs.
This is nil for terminals, since updating a frame in a terminal
is not useful to the user.")

6
lisp/emacs-lisp/chart.el
View File

@ -1,7 +1,6 @@
;;; chart.el --- Draw charts (bar charts, etc) -*- lexical-binding: t -*-
;; Copyright (C) 1996, 1998-1999, 2001, 2004-2005, 2007-2022 Free
;; Software Foundation, Inc.
;; Copyright (C) 1996-2022 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Old-Version: 0.2
@ -76,8 +75,7 @@
Colors will be the background color.")
(defvar chart-face-pixmap-list
(if (and (fboundp 'display-graphic-p)
(display-graphic-p))
(if (display-graphic-p)
'("dimple1" "scales" "dot" "cross_weave" "boxes" "dimple3"))
"If pixmaps are allowed, display these background pixmaps.
Useful if new Emacs is used on B&W display.")

4
lisp/progmodes/cperl-mode.el
View File

@ -7080,9 +7080,7 @@ One may build such TAGS files from CPerl mode menu."
(error "No items found"))
(setq update
;; (imenu-choose-buffer-index "Packages: " (nth 2 cperl-hierarchy))
(if (if (fboundp 'display-popup-menus-p)
(display-popup-menus-p)
window-system)
(if (display-popup-menus-p)
(x-popup-menu t (nth 2 cperl-hierarchy))
(require 'tmm)
(tmm-prompt (nth 2 cperl-hierarchy))))

13
lisp/speedbar.el
View File

@ -800,15 +800,10 @@ This basically creates a sparse keymap, and makes its parent be
["Auto Update" speedbar-toggle-updates
:active (not speedbar-update-flag-disable)
:style toggle :selected speedbar-update-flag])
(if (and (or (fboundp 'defimage)
(fboundp 'make-image-specifier))
(if (fboundp 'display-graphic-p)
(display-graphic-p)
window-system))
(list
["Use Images" speedbar-toggle-images
:style toggle :selected speedbar-use-images]))
)
(when (and (fboundp 'defimage) (display-graphic-p))
(list
["Use Images" speedbar-toggle-images
:style toggle :selected speedbar-use-images])))
"Base part of the speedbar menu.")
(defvar speedbar-easymenu-definition-special