diff options
-rw-r--r-- | generic/pg-response.el | 46 | ||||
-rw-r--r-- | lib/unicode-tokens.el | 6 |
2 files changed, 17 insertions, 35 deletions
diff --git a/generic/pg-response.el b/generic/pg-response.el index 893d1f6f..8b6a413a 100644 --- a/generic/pg-response.el +++ b/generic/pg-response.el @@ -99,33 +99,21 @@ Internal variable, setting this will have no effect!") "List of GNU Emacs frame parameters for secondary frames.") (defun proof-multiple-frames-enable () - ; special-display-regexps is obsolete, let us let it for a while and - ; remove it later - (unless (eval-when-compile (boundp 'display-buffer-alist)) - (let ((spdres (cons - pg-response-special-display-regexp - proof-multiframe-parameters))) - (if proof-multiple-frames-enable - (add-to-list 'special-display-regexps spdres) - (setq special-display-regexps - (delete spdres special-display-regexps))))) - ; This is the current way to do it - (when (eval-when-compile (boundp 'display-buffer-alist)) - (let - ((display-buffer-entry - (cons pg-response-special-display-regexp - `((display-buffer-reuse-window display-buffer-pop-up-frame) . - ((reusable-frames . t) - (pop-up-frame-parameters - . - ,proof-multiframe-parameters)))))) - (if proof-multiple-frames-enable - (add-to-list - 'display-buffer-alist - display-buffer-entry) - ;(add-to-list 'display-buffer-alist (proof-buffer-dislay)) - (setq display-buffer-alist - (delete display-buffer-entry display-buffer-alist))))) + (let + ((display-buffer-entry + (cons pg-response-special-display-regexp + `((display-buffer-reuse-window display-buffer-pop-up-frame) . + ((reusable-frames . t) + (pop-up-frame-parameters + . + ,proof-multiframe-parameters)))))) + (if proof-multiple-frames-enable + (add-to-list + 'display-buffer-alist + display-buffer-entry) + ;(add-to-list 'display-buffer-alist (proof-buffer-dislay)) + (setq display-buffer-alist + (delete display-buffer-entry display-buffer-alist)))) (proof-layout-windows)) (defun proof-three-window-enable () @@ -521,9 +509,7 @@ and start at the first error." ;; Pop up a window. (display-buffer proof-response-buffer - (and (eval-when-compile - (boundp 'display-buffer-alist)) - proof-multiple-frames-enable + (and proof-multiple-frames-enable (cons nil proof-multiframe-parameters)))))) ;; Make sure the response buffer stays where it is, ;; and make sure source buffer is visible diff --git a/lib/unicode-tokens.el b/lib/unicode-tokens.el index ba3d036a..d05bfc1e 100644 --- a/lib/unicode-tokens.el +++ b/lib/unicode-tokens.el @@ -45,11 +45,7 @@ (require 'quail) (eval-when-compile - (require 'maths-menu) ; nuke compile warnings - ;; Emacs <24 compatibility - (when (and (fboundp 'flet) - (not (get 'flet 'byte-obsolete-info))) - (defalias 'cl-flet 'flet))) + (require 'maths-menu)) ; nuke compile warnings ;; ;; Customizable user options |