aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-10 16:00:12 +1100
committerLars Ingebrigtsen2016-02-10 16:00:12 +1100
commit4ccd2688911b90bcb8cdcd2a8de608e09471a91a (patch)
treee2b04cc83ab12c72977629532fa4ad46a3822d4f
parente384370e19f40f6c58e3a0cb8be50b59d6479ab7 (diff)
downloademacs-4ccd2688911b90bcb8cdcd2a8de608e09471a91a.tar.gz
emacs-4ccd2688911b90bcb8cdcd2a8de608e09471a91a.zip
* lisp/gnus/gnus-cite.el: Remove XEmacs compat code.
-rw-r--r--lisp/gnus/gnus-cite.el27
1 files changed, 6 insertions, 21 deletions
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index aa3635fdf7b..57f463f14c2 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -24,9 +24,6 @@
24;;; Code: 24;;; Code:
25 25
26(eval-when-compile (require 'cl)) 26(eval-when-compile (require 'cl))
27(eval-when-compile
28 (when (featurep 'xemacs)
29 (require 'easy-mmode))) ; for `define-minor-mode'
30 27
31(require 'gnus) 28(require 'gnus)
32(require 'gnus-range) 29(require 'gnus-range)
@@ -1194,9 +1191,7 @@ Returns nil if there is no such line before LIMIT, t otherwise."
1194(defvar font-lock-keywords) 1191(defvar font-lock-keywords)
1195(defvar font-lock-set-defaults) 1192(defvar font-lock-set-defaults)
1196 1193
1197(eval-and-compile 1194(autoload 'font-lock-set-defaults "font-lock")
1198 (unless (featurep 'xemacs)
1199 (autoload 'font-lock-set-defaults "font-lock")))
1200 1195
1201(define-minor-mode gnus-message-citation-mode 1196(define-minor-mode gnus-message-citation-mode
1202 "Minor mode providing more font-lock support for nested citations. 1197 "Minor mode providing more font-lock support for nested citations.
@@ -1206,9 +1201,7 @@ When enabled, it automatically turns on `font-lock-mode'."
1206 nil ;; keymap 1201 nil ;; keymap
1207 (when (eq major-mode 'message-mode) ;FIXME: Use derived-mode-p. 1202 (when (eq major-mode 'message-mode) ;FIXME: Use derived-mode-p.
1208 ;; FIXME: Use font-lock-add-keywords! 1203 ;; FIXME: Use font-lock-add-keywords!
1209 (let ((defaults (car (if (featurep 'xemacs) 1204 (let ((defaults (car font-lock-defaults))
1210 (get 'message-mode 'font-lock-defaults)
1211 font-lock-defaults)))
1212 default keywords) 1205 default keywords)
1213 (while defaults 1206 (while defaults
1214 (setq default (if (consp defaults) 1207 (setq default (if (consp defaults)
@@ -1227,19 +1220,11 @@ When enabled, it automatically turns on `font-lock-mode'."
1227 gnus-message-citation-keywords)) 1220 gnus-message-citation-keywords))
1228 (kill-local-variable default)))) 1221 (kill-local-variable default))))
1229 ;; Force `font-lock-set-defaults' to update `font-lock-keywords'. 1222 ;; Force `font-lock-set-defaults' to update `font-lock-keywords'.
1230 (if (featurep 'xemacs) 1223 (setq font-lock-set-defaults nil)
1231 (progn
1232 (require 'font-lock)
1233 (setq font-lock-defaults-computed nil
1234 font-lock-keywords nil))
1235 (setq font-lock-set-defaults nil))
1236 (font-lock-set-defaults) 1224 (font-lock-set-defaults)
1237 (cond (font-lock-mode 1225 (if font-lock-mode
1238 (if (fboundp 'font-lock-flush) 1226 (font-lock-flush)
1239 (font-lock-flush) 1227 (gnus-message-citation-mode (font-lock-mode 1)))))
1240 (font-lock-fontify-buffer)))
1241 (gnus-message-citation-mode
1242 (font-lock-mode 1)))))
1243 1228
1244(defun turn-on-gnus-message-citation-mode () 1229(defun turn-on-gnus-message-citation-mode ()
1245 "Turn on `gnus-message-citation-mode'." 1230 "Turn on `gnus-message-citation-mode'."