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

[Juri Linkov]

Index: emacs/lisp/textmodes/ispell.el
diff -c emacs/lisp/textmodes/ispell.el:1.168 
emacs/lisp/textmodes/ispell.el:1.169
*** emacs/lisp/textmodes/ispell.el:1.168        Mon Jul  4 16:44:59 2005
--- emacs/lisp/textmodes/ispell.el      Sat Jul  9 20:47:19 2005
***************
*** 1659,1665 ****
      ;; setup the *Choices* buffer with valid data.
      (save-excursion
        (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)
--- 1659,1668 ----
      ;; setup the *Choices* buffer with valid data.
      (save-excursion
        (set-buffer (get-buffer-create ispell-choices-buffer))
!       (setq mode-line-format
!           (concat "--  %b  --  word: " word
!                   "  --  dict: " (or ispell-current-dictionary "default")
!                   "  --  prog: " (file-name-nondirectory 
ispell-program-name)))
        ;; XEmacs: no need for horizontal scrollbar in choices window
        (with-no-warnings
         (and (fboundp 'set-specifier)
***************
*** 1819,1827 ****
                              (erase-buffer)
                              (setq count ?0
                                    skipped 0
!                                   mode-line-format (concat
!                                                     "--  %b  --  word: "
!                                                     new-word)
                                    miss (lookup-words new-word)
                                    choices miss
                                    line ispell-choices-win-default-height)
--- 1822,1831 ----
                              (erase-buffer)
                              (setq count ?0
                                    skipped 0
!                                   mode-line-format
!                                   (concat "--  %b  --  word: " new-word
!                                           "  --  dict: "
!                                           ispell-alternate-dictionary)
                                    miss (lookup-words new-word)
                                    choices miss
                                    line ispell-choices-win-default-height)
***************
*** 2512,2520 ****
        (rstart (make-marker)))
    (unwind-protect
        (save-excursion
!       (message "Spell checking %s using %s dictionary..."
                 (if (and (= reg-start (point-min)) (= reg-end (point-max)))
                     (buffer-name) "region")
                 (or ispell-current-dictionary "default"))
        ;; Returns cursor to original location.
        (save-window-excursion
--- 2516,2525 ----
        (rstart (make-marker)))
    (unwind-protect
        (save-excursion
!       (message "Spell checking %s using %s with %s dictionary..."
                 (if (and (= reg-start (point-min)) (= reg-end (point-max)))
                     (buffer-name) "region")
+                (file-name-nondirectory ispell-program-name)
                 (or ispell-current-dictionary "default"))
        ;; Returns cursor to original location.
        (save-window-excursion
***************
*** 2532,2538 ****
                  (set-marker skip-region-start (- (point) (length key)))
                  (goto-char reg-start)))
            (let (message-log-max)
!             (message "Continuing spelling check using %s dictionary..."
                       (or ispell-current-dictionary "default")))
            (set-marker rstart reg-start)
            (set-marker ispell-region-end reg-end)
--- 2537,2544 ----
                  (set-marker skip-region-start (- (point) (length key)))
                  (goto-char reg-start)))
            (let (message-log-max)
!             (message "Continuing spelling check using %s with %s 
dictionary..."
!                      (file-name-nondirectory ispell-program-name)
                       (or ispell-current-dictionary "default")))
            (set-marker rstart reg-start)
            (set-marker ispell-region-end reg-end)
***************
*** 2609,2615 ****
        (if (not recheckp) (set-marker ispell-region-end nil))
        ;; Only save if successful exit.
        (ispell-pdict-save ispell-silently-savep)
!       (message "Spell-checking done")))))
  
  
  (defun ispell-begin-skip-region-regexp ()
--- 2615,2623 ----
        (if (not recheckp) (set-marker ispell-region-end nil))
        ;; Only save if successful exit.
        (ispell-pdict-save ispell-silently-savep)
!       (message "Spell-checking using %s with %s dictionary done"
!              (file-name-nondirectory ispell-program-name)
!              (or ispell-current-dictionary "default"))))))
  
  
  (defun ispell-begin-skip-region-regexp ()
***************
*** 2960,2966 ****
              ))
            (if (not ispell-quit)
                (let (message-log-max)
!                 (message "Continuing spelling check using %s dictionary..."
                           (or ispell-current-dictionary "default"))))
            (sit-for 0)
            (setq start (marker-position line-start)
--- 2968,2975 ----
              ))
            (if (not ispell-quit)
                (let (message-log-max)
!                 (message "Continuing spelling check using %s with %s 
dictionary..."
!                          (file-name-nondirectory ispell-program-name)
                           (or ispell-current-dictionary "default"))))
            (sit-for 0)
            (setq start (marker-position line-start)