* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):

* play/yow.el (doctor-ret-or-read):
* vc-hooks.el (vc-dired-resynch-file):
* vc-hg.el (log-view-get-marked):
* smerge-mode.el (ediff-cleanup-mess):
* pcvs.el (vc-editable-p, vc-checkout):
* pcomplete.el (comint-bol):
* informat.el (texinfo-format-refill):
* ido.el (tramp-tramp-file-p):
* ibuffer.el (ibuffer-mark-on-buffer, ibuffer-format-qualifier)
(ibuffer-generate-filter-groups, ibuffer-format-filter-group-data):
* add-log.el (c-beginning-of-defun, c-end-of-defun): Declare as
functions.

* textmodes/ispell.el (ispell-int-char): Make it a defalias
instead of fset.
(ispell-message): Use with-no-warnings for sc-cite-regexp call.

* ido.el (ido-file-internal): Move with-no-warnings to include the
ffap-string-at-point call.

* pcomplete.el (pcomplete-executables): Move defsubst before first use.

* vc-hg.el (vc-hg-revision-table): Fix last change.

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
-(if (and (featurep 'xemacs)
-         (fboundp 'int-char))
-    (fset 'ispell-int-char 'int-char)
-  ;; Emacs and XEmacs 19 or earlier
-  (fset 'ispell-int-char 'identity))
+(defalias 'ispell-int-char
+  ;; Allow incrementing characters as integers in XEmacs 20
+  (if (and (featurep 'xemacs)
+           (fboundp 'int-char))
+      'int-char
+    ;; 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
-                       (ispell-non-empty-string sc-reference-tag-string))))
+              (with-no-warnings
+                (concat "\\(" (sc-cite-regexp) "\\)" "\\|"
+                        (ispell-non-empty-string sc-reference-tag-string))))
              ((boundp 'sc-cite-regexp)          ; sc 2.3
               (concat "\\(" sc-cite-regexp "\\)" "\\|"
                       (with-no-warnings