[Emacs-diffs] master 6b5ac58 20/23: Remove XEmacs-specific ispell-with-no-warnings

[Reuben Thomas]

branch: master
commit 6b5ac5837a1d519bc24a69d58343213fa149fc10
Author: Reuben Thomas <address@hidden>
Commit: Reuben Thomas <address@hidden>

    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 398e83e..c55d316 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 @@ Global `ispell-quit' set to start location to continue 
spell session."
              "  --  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
@@ -3849,18 +3845,18 @@ You can bind this to the key C-c i in GNUS or mail by 
adding to
           (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:" "\\|"