From 69909c47304b9ba74bc8c6c2be2702488f43848c Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Tue, 4 Sep 2012 20:57:54 +0000 Subject: Fix compile for Emacs 24 --- lib/unicode-tokens.el | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib/unicode-tokens.el') diff --git a/lib/unicode-tokens.el b/lib/unicode-tokens.el index 4d6c5edb..f9972aea 100644 --- a/lib/unicode-tokens.el +++ b/lib/unicode-tokens.el @@ -45,13 +45,11 @@ (require 'quail) (eval-when-compile - (require 'maths-menu)) ; nuke compile warnings - - -;; Emacs <24 compatibility -(unless (and (fboundp 'flet) + (require 'maths-menu) ; nuke compile warnings + ;; Emacs <24 compatibility + (when (and (fboundp 'flet) (not (get 'flet 'byte-obsolete-info))) - (defalias 'cl-flet 'flet)) + (defalias 'cl-flet 'flet))) ;; ;; Customizable user options @@ -867,8 +865,8 @@ Starts from point." (regexp-opt (mapcar 'car unicode-tokens-shortcut-replacement-alist)))) ;; override the display of the regexp because it's huge! ;; (doesn't help with C-h: need way to programmatically show string) - (cl-flet ((query-replace-descr (str) (if (eq str shortcut-regexp) - "shortcut" str))) + (cl-flet ((query-replace-descr (str) + (if (eq str shortcut-regexp) "shortcut" str))) (perform-replace shortcut-regexp (cons 'unicode-tokens-replace-shortcut-match nil) t t nil)))) -- cgit v1.2.3