[Emacs-diffs] Changes to emacs/lisp/textmodes/ispell.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/textmodes/ispell.el
diff -c emacs/lisp/textmodes/ispell.el:1.140.2.4 
emacs/lisp/textmodes/ispell.el:1.140.2.5
*** emacs/lisp/textmodes/ispell.el:1.140.2.4    Thu Sep  9 09:36:33 2004
--- emacs/lisp/textmodes/ispell.el      Fri Oct 22 10:13:51 2004
***************
*** 1618,1627 ****
        (set-buffer (get-buffer-create ispell-choices-buffer))
        (setq mode-line-format (concat "--  %b  --  word: " word))
        ;; XEmacs: no need for horizontal scrollbar in choices window
!       (and (fboundp 'set-specifier)
!          (boundp 'horizontal-scrollbar-visible-p)
!            (set-specifier horizontal-scrollbar-visible-p nil
!                         (cons (current-buffer) nil)))
        (erase-buffer)
        (if guess
          (progn
--- 1618,1628 ----
        (set-buffer (get-buffer-create ispell-choices-buffer))
        (setq mode-line-format (concat "--  %b  --  word: " word))
        ;; XEmacs: no need for horizontal scrollbar in choices window
!       (with-no-warnings
!        (and (fboundp 'set-specifier)
!           (boundp 'horizontal-scrollbar-visible-p)
!           (set-specifier horizontal-scrollbar-visible-p nil
!                          (cons (current-buffer) nil))))
        (erase-buffer)
        (if guess
          (progn
***************
*** 1871,1877 ****
    (if (and ispell-use-framepop-p (fboundp 'framepop-display-buffer))
        (progn
        (framepop-display-buffer (get-buffer ispell-choices-buffer))
!       (get-buffer-window ispell-choices-buffer t)
        (select-window (previous-window))) ; *Choices* window
      ;; standard selection by splitting a small buffer out of this window.
      (let ((choices-window (get-buffer-window ispell-choices-buffer)))
--- 1872,1878 ----
    (if (and ispell-use-framepop-p (fboundp 'framepop-display-buffer))
        (progn
        (framepop-display-buffer (get-buffer ispell-choices-buffer))
! ;;;   (get-buffer-window ispell-choices-buffer t)
        (select-window (previous-window))) ; *Choices* window
      ;; standard selection by splitting a small buffer out of this window.
      (let ((choices-window (get-buffer-window ispell-choices-buffer)))
***************
*** 2355,2361 ****
        (if extended-char-mode          ; ~ extended character mode
          (ispell-send-string (concat extended-char-mode "\n"))))
      (if ispell-async-processp
!       (process-kill-without-query ispell-process))))
  
  ;;;###autoload
  (defun ispell-kill-ispell (&optional no-error)
--- 2356,2362 ----
        (if extended-char-mode          ; ~ extended character mode
          (ispell-send-string (concat extended-char-mode "\n"))))
      (if ispell-async-processp
!       (set-process-query-on-exit-flag ispell-process nil))))
  
  ;;;###autoload
  (defun ispell-kill-ispell (&optional no-error)
***************
*** 3286,3304 ****
            (cond
             ((functionp 'sc-cite-regexp)       ; sc 3.0
              (concat "\\(" (sc-cite-regexp) "\\)" "\\|"
!                     (ispell-non-empty-string sc-reference-tag-string)))
             ((boundp 'sc-cite-regexp)          ; sc 2.3
              (concat "\\(" sc-cite-regexp "\\)" "\\|"
!                     (ispell-non-empty-string sc-reference-tag-string)))
             ((or (equal major-mode 'news-reply-mode) ;GNUS 4 & below
                  (equal major-mode 'message-mode))   ;GNUS 5
              (concat "In article <" "\\|"
                      "[^,;&+=\n]+ <[^,;&+=]+> writes:" "\\|"
!                       message-cite-prefix-regexp "\\|"
                      default-prefix))
             ((equal major-mode 'mh-letter-mode) ; mh mail message
              (concat "[^,;&+=\n]+ writes:" "\\|"
!                     (ispell-non-empty-string mh-ins-buf-prefix)))
             ((not internal-messagep)   ; Assume nn sent us this message.
              (concat "In [a-zA-Z.]+ you write:" "\\|"
                      "In <[^,;&+=]+> [^,;&+=]+ writes:" "\\|"
--- 3287,3309 ----
            (cond
             ((functionp 'sc-cite-regexp)       ; sc 3.0
              (concat "\\(" (sc-cite-regexp) "\\)" "\\|"
!                     (with-no-warnings
!                      (ispell-non-empty-string sc-reference-tag-string))))
             ((boundp 'sc-cite-regexp)          ; sc 2.3
              (concat "\\(" sc-cite-regexp "\\)" "\\|"
!                     (with-no-warnings
!                      (ispell-non-empty-string sc-reference-tag-string))))
             ((or (equal major-mode 'news-reply-mode) ;GNUS 4 & below
                  (equal major-mode 'message-mode))   ;GNUS 5
              (concat "In article <" "\\|"
                      "[^,;&+=\n]+ <[^,;&+=]+> writes:" "\\|"
!                     (with-no-warnings message-cite-prefix-regexp)
!                     "\\|"
                      default-prefix))
             ((equal major-mode 'mh-letter-mode) ; mh mail message
              (concat "[^,;&+=\n]+ writes:" "\\|"
!                     (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:" "\\|"
                      "In <[^,;&+=]+> [^,;&+=]+ writes:" "\\|"