[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 80a4282 6/7: Remove some compat code from forms.el
From: |
Lars Ingebrigtsen |
Subject: |
master 80a4282 6/7: Remove some compat code from forms.el |
Date: |
Tue, 18 Aug 2020 17:19:18 -0400 (EDT) |
branch: master
commit 80a42824299e69462448575782a39350805c3d7e
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Remove some compat code from forms.el
* lisp/forms.el (forms-mode): make-face always exists.
---
lisp/forms.el | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/lisp/forms.el b/lisp/forms.el
index fcb6075..83daabd 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -504,12 +504,9 @@ Commands: Equivalent keys in
read-only mode:
(setq forms-new-record-filter nil)
(setq forms-modified-record-filter nil)
- ;; If running Emacs 19 under X, setup faces to show read-only and
- ;; read-write fields.
- (if (fboundp 'make-face)
- (progn
- (make-local-variable 'forms-ro-face)
- (make-local-variable 'forms-rw-face)))
+ ;; Setup faces to show read-only and read-write fields.
+ (make-local-variable 'forms-ro-face)
+ (make-local-variable 'forms-rw-face)
;; eval the buffer, should set variables
;;(message "forms: processing control file...")
@@ -609,16 +606,14 @@ Commands: Equivalent keys in
read-only mode:
(setq forms--mode-setup t)
;; Copy desired faces to the actual variables used by the forms formatter.
- (if (fboundp 'make-face)
+ (make-local-variable 'forms--ro-face)
+ (make-local-variable 'forms--rw-face)
+ (if forms-read-only
(progn
- (make-local-variable 'forms--ro-face)
- (make-local-variable 'forms--rw-face)
- (if forms-read-only
- (progn
- (setq forms--ro-face forms-ro-face)
- (setq forms--rw-face forms-ro-face))
- (setq forms--ro-face forms-ro-face)
- (setq forms--rw-face forms-rw-face))))
+ (setq forms--ro-face forms-ro-face)
+ (setq forms--rw-face forms-ro-face))
+ (setq forms--ro-face forms-ro-face)
+ (setq forms--rw-face forms-rw-face))
;; Make more local variables.
(make-local-variable 'forms--file-buffer)
- master updated (a9086ef -> 556ff98), Lars Ingebrigtsen, 2020/08/18
- master 66d8322 2/7: Remove some compat code from ps files, Lars Ingebrigtsen, 2020/08/18
- master 5a6ed46 1/7: Remove some compat code from woman.el, Lars Ingebrigtsen, 2020/08/18
- master 3c76397 3/7: Remove some compat code from htmlfontify.el, Lars Ingebrigtsen, 2020/08/18
- master 556ff98 7/7: Remove some compat code from ps-print.el, Lars Ingebrigtsen, 2020/08/18
- master ace7eeb 4/7: Remove some compat code from chart.el, Lars Ingebrigtsen, 2020/08/18
- master 1a31051 5/7: Remove some compat code from smiley.el, Lars Ingebrigtsen, 2020/08/18
- master 80a4282 6/7: Remove some compat code from forms.el,
Lars Ingebrigtsen <=