From c4d53a843efb30862a48869ecc9f83e0d689266b Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Sun, 4 Dec 2016 22:01:56 +0000 Subject: [PATCH 21/21] Remove XEmacs-specific ispell-with-no-warnings * lisp/textmodes/ispell.el (ispell-with-no-warnings): Remove this defmacro, needed only for XEmacs. (ispell-command-loop, ispell-message): Use with-no-warnings directly. --- lisp/textmodes/ispell.el | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 9bd43cc..eb7f017 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -118,10 +118,6 @@ ;; Recursive edits (?C-r or ?R) inside a keyboard text replacement check (?r) ;; can cause misalignment errors. -;;; XEmacs21 does not have `with-no-warnings'. Taken from org mode. -(defmacro ispell-with-no-warnings (&rest body) - (cons (if (fboundp 'with-no-warnings) 'with-no-warnings 'progn) body)) - ;;; Code: (eval-when-compile (require 'cl-lib)) @@ -2077,7 +2073,7 @@ ispell-command-loop " -- dict: " (or ispell-current-dictionary "default") " -- prog: " (file-name-nondirectory ispell-program-name))) ;; No need for horizontal scrollbar in choices window - (ispell-with-no-warnings + (with-no-warnings (setq horizontal-scroll-bar nil)) (erase-buffer) (if guess @@ -3847,18 +3843,18 @@ ispell-message (cite-regexp ;Prefix of quoted text (cond ((functionp 'sc-cite-regexp) ; supercite >= 3.0 - (ispell-with-no-warnings + (with-no-warnings (concat "\\(" (sc-cite-regexp) "\\)" "\\|" (ispell-non-empty-string sc-reference-tag-string)))) ((equal major-mode 'message-mode) ; GNUS >= 5 (concat "In article <" "\\|" "[^,;&+=\n]+ <[^,;&+=]+> writes:" "\\|" - (ispell-with-no-warnings message-cite-prefix-regexp) + (with-no-warnings message-cite-prefix-regexp) "\\|" default-prefix)) ((equal major-mode 'mh-letter-mode) ; mh mail message (concat "[^,;&+=\n]+ writes:" "\\|" - (ispell-with-no-warnings + (with-no-warnings (ispell-non-empty-string mh-ins-buf-prefix)))) ((not internal-messagep) ; Assume nn sent us this message. (concat "In [a-zA-Z.]+ you write:" "\\|" -- 2.7.4