Commit 6b5ac583 authored by Reuben Thomas's avatar Reuben Thomas
Browse files

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.
parent 8af9cb22
...@@ -118,10 +118,6 @@ ...@@ -118,10 +118,6 @@
;; Recursive edits (?C-r or ?R) inside a keyboard text replacement check (?r) ;; Recursive edits (?C-r or ?R) inside a keyboard text replacement check (?r)
;; can cause misalignment errors. ;; 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: ;;; Code:
(eval-when-compile (require 'cl-lib)) (eval-when-compile (require 'cl-lib))
...@@ -2077,7 +2073,7 @@ Global `ispell-quit' set to start location to continue spell session." ...@@ -2077,7 +2073,7 @@ Global `ispell-quit' set to start location to continue spell session."
" -- dict: " (or ispell-current-dictionary "default") " -- dict: " (or ispell-current-dictionary "default")
" -- prog: " (file-name-nondirectory ispell-program-name))) " -- prog: " (file-name-nondirectory ispell-program-name)))
;; No need for horizontal scrollbar in choices window ;; No need for horizontal scrollbar in choices window
(ispell-with-no-warnings (with-no-warnings
(setq horizontal-scroll-bar nil)) (setq horizontal-scroll-bar nil))
(erase-buffer) (erase-buffer)
(if guess (if guess
...@@ -3849,18 +3845,18 @@ You can bind this to the key C-c i in GNUS or mail by adding to ...@@ -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 (cite-regexp ;Prefix of quoted text
(cond (cond
((functionp 'sc-cite-regexp) ; supercite >= 3.0 ((functionp 'sc-cite-regexp) ; supercite >= 3.0
(ispell-with-no-warnings (with-no-warnings
(concat "\\(" (sc-cite-regexp) "\\)" "\\|" (concat "\\(" (sc-cite-regexp) "\\)" "\\|"
(ispell-non-empty-string sc-reference-tag-string)))) (ispell-non-empty-string sc-reference-tag-string))))
((equal major-mode 'message-mode) ; GNUS >= 5 ((equal major-mode 'message-mode) ; GNUS >= 5
(concat "In article <" "\\|" (concat "In article <" "\\|"
"[^,;&+=\n]+ <[^,;&+=]+> writes:" "\\|" "[^,;&+=\n]+ <[^,;&+=]+> writes:" "\\|"
(ispell-with-no-warnings message-cite-prefix-regexp) (with-no-warnings message-cite-prefix-regexp)
"\\|" "\\|"
default-prefix)) default-prefix))
((equal major-mode 'mh-letter-mode) ; mh mail message ((equal major-mode 'mh-letter-mode) ; mh mail message
(concat "[^,;&+=\n]+ writes:" "\\|" (concat "[^,;&+=\n]+ writes:" "\\|"
(ispell-with-no-warnings (with-no-warnings
(ispell-non-empty-string mh-ins-buf-prefix)))) (ispell-non-empty-string mh-ins-buf-prefix))))
((not internal-messagep) ; Assume nn sent us this message. ((not internal-messagep) ; Assume nn sent us this message.
(concat "In [a-zA-Z.]+ you write:" "\\|" (concat "In [a-zA-Z.]+ you write:" "\\|"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment