1 files changed, 10 insertions, 9 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index fbeeffaee02..444cf1985e8 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1161,12 +1161,13 @@ The variable `ispell-library-directory' defines the library location."
              (delete-menu-item '("Edit" "Spell")) ; in case already defined
              (add-menu '("Edit") "Spell" ispell-menu-xemacs))))))
-;;; Allow incrementing characters as integers in XEmacs 20
+(defalias 'ispell-int-char
-(if (and (featurep 'xemacs)
+  ;; Allow incrementing characters as integers in XEmacs 20
-         (fboundp 'int-char))
+  (if (and (featurep 'xemacs)
-    (fset 'ispell-int-char 'int-char)
+           (fboundp 'int-char))
-  ;; Emacs and XEmacs 19 or earlier
+      'int-char
-  (fset 'ispell-int-char 'identity))
+    ;; Emacs and XEmacs 19 or earlier
+    'identity))
 ;;; **********************************************************************
@@ -3533,9 +3534,9 @@ 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)       ; sc 3.0
-              (concat "\\(" (sc-cite-regexp) "\\)" "\\|"
+              (with-no-warnings
-                      (with-no-warnings
+                (concat "\\(" (sc-cite-regexp) "\\)" "\\|"
-                       (ispell-non-empty-string sc-reference-tag-string))))
+                        (ispell-non-empty-string sc-reference-tag-string))))
             ((boundp 'sc-cite-regexp)          ; sc 2.3
              (concat "\\(" sc-cite-regexp "\\)" "\\|"
                      (with-no-warnings

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index fbeeffaee02..444cf1985e8 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el
@@ -1161,12 +1161,13 @@ The variable `ispell-library-directory' defines the library location."
1161	(delete-menu-item '("Edit" "Spell")) ; in case already defined	1161	(delete-menu-item '("Edit" "Spell")) ; in case already defined
1162	(add-menu '("Edit") "Spell" ispell-menu-xemacs))))))	1162	(add-menu '("Edit") "Spell" ispell-menu-xemacs))))))
1163		1163
1164	;;; Allow incrementing characters as integers in XEmacs 20	1164	(defalias 'ispell-int-char
1165	(if (and (featurep 'xemacs)	1165	;; Allow incrementing characters as integers in XEmacs 20
1166	(fboundp 'int-char))	1166	(if (and (featurep 'xemacs)
1167	(fset 'ispell-int-char 'int-char)	1167	(fboundp 'int-char))
1168	;; Emacs and XEmacs 19 or earlier	1168	'int-char
1169	(fset 'ispell-int-char 'identity))	1169	;; Emacs and XEmacs 19 or earlier
		1170	'identity))
1170		1171
1171		1172
1172	;;; **********************************************************************	1173	;;; **********************************************************************
@@ -3533,9 +3534,9 @@ You can bind this to the key C-c i in GNUS or mail by adding to
3533	(cite-regexp ;Prefix of quoted text	3534	(cite-regexp ;Prefix of quoted text
3534	(cond	3535	(cond
3535	((functionp 'sc-cite-regexp) ; sc 3.0	3536	((functionp 'sc-cite-regexp) ; sc 3.0
3536	(concat "\\(" (sc-cite-regexp) "\\)" "\\\|"	3537	(with-no-warnings
3537	(with-no-warnings	3538	(concat "\\(" (sc-cite-regexp) "\\)" "\\\|"
3538	(ispell-non-empty-string sc-reference-tag-string))))	3539	(ispell-non-empty-string sc-reference-tag-string))))
3539	((boundp 'sc-cite-regexp) ; sc 2.3	3540	((boundp 'sc-cite-regexp) ; sc 2.3
3540	(concat "\\(" sc-cite-regexp "\\)" "\\\|"	3541	(concat "\\(" sc-cite-regexp "\\)" "\\\|"
3541	(with-no-warnings	3542	(with-no-warnings