diff options
Diffstat (limited to 'lisp/progmodes/ebnf2ps.el')
| -rw-r--r-- | lisp/progmodes/ebnf2ps.el | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index d5820bbfe0a..f7ac9d36032 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -1157,21 +1157,6 @@ Please send all bug fixes and enhancements to (and (string< ps-print-version "5.2.3") (error "`ebnf2ps' requires `ps-print' package version 5.2.3 or later")) - -;; to avoid gripes with Emacs 20 -(or (fboundp 'assq-delete-all) - (defun assq-delete-all (key alist) - "Delete from ALIST all elements whose car is KEY. -Return the modified alist. -Elements of ALIST that are not conses are ignored." - (let ((tail alist)) - (while tail - (if (and (consp (car tail)) - (eq (car (car tail)) key)) - (setq alist (delq (car tail) alist))) - (setq tail (cdr tail))) - alist))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; User Variables: @@ -2053,8 +2038,7 @@ It must be a float between 0.0 (top) and 1.0 (bottom)." ;; Printing color requires x-color-values. -(defcustom ebnf-color-p (or (fboundp 'x-color-values) ; Emacs - (fboundp 'color-instance-rgb-components)) ; XEmacs +(defcustom ebnf-color-p t "Non-nil means use color." :type 'boolean :version "20" @@ -2738,8 +2722,7 @@ Used in functions `ebnf-reset-style', `ebnf-push-style' and (ebnf-eps-footer-font . '(7 Helvetica "Black" "White" bold)) (ebnf-eps-footer . nil) (ebnf-entry-percentage . 0.5) - (ebnf-color-p . (or (fboundp 'x-color-values) ; Emacs - (fboundp 'color-instance-rgb-components))) ; XEmacs + (ebnf-color-p . t) (ebnf-line-width . 1.0) (ebnf-line-color . "Black") (ebnf-debug-ps . nil) @@ -4979,18 +4962,6 @@ killed after process termination." (kill-buffer (current-buffer)))) -;; function `ebnf-range-regexp' is used to avoid a bug of `skip-chars-forward' -;; on version 20.4.1, that is, it doesn't accept ranges like "\240-\377" (or -;; "\177-\237"), but it accepts the character sequence from \240 to \377 (or -;; from \177 to \237). It seems that version 20.7 has the same problem. -(defun ebnf-range-regexp (prefix from to) - (let (str) - (while (<= from to) - (setq str (concat str (char-to-string from)) - from (1+ from))) - (concat prefix str))) - - (defvar ebnf-map-name (let ((map (make-vector 256 ?\_))) (mapc #'(lambda (char) @@ -5987,8 +5958,7 @@ killed after process termination." (point)))) -;; replace the range "\240-\377" (see `ebnf-range-regexp'). -(defconst ebnf-8-bit-chars (ebnf-range-regexp "" ?\240 ?\377)) +(defconst ebnf-8-bit-chars "\u00a0-\u00ff") (defun ebnf-string (chars eos-char kind) |