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

[Pavel Janík]

Index: emacs/lisp/textmodes/flyspell.el
diff -c emacs/lisp/textmodes/flyspell.el:1.40 
emacs/lisp/textmodes/flyspell.el:1.41
*** emacs/lisp/textmodes/flyspell.el:1.40       Sat Jan 12 16:35:37 2002
--- emacs/lisp/textmodes/flyspell.el    Tue Jan 29 08:42:12 2002
***************
*** 33,46 ****
  ;; To enable Flyspell in text representing computer programs, type
  ;; M-x flyspell-prog-mode.
  ;; In that mode only text inside comments is checked.
! ;;                                                                  
  ;; Note: consider setting the variable ispell-parser to `tex' to
  ;; avoid TeX command checking; use `(setq ispell-parser 'tex)'.
! ;;                                                                  
  ;; Some user variables control the behavior of flyspell.  They are
  ;; those defined under the `User variables' comment.
  
  ;;; Code:
  (require 'ispell)
  
  ;*---------------------------------------------------------------------*/
--- 33,47 ----
  ;; To enable Flyspell in text representing computer programs, type
  ;; M-x flyspell-prog-mode.
  ;; In that mode only text inside comments is checked.
! ;;
  ;; Note: consider setting the variable ispell-parser to `tex' to
  ;; avoid TeX command checking; use `(setq ispell-parser 'tex)'.
! ;;
  ;; Some user variables control the behavior of flyspell.  They are
  ;; those defined under the `User variables' comment.
  
  ;;; Code:
+ 
  (require 'ispell)
  
  ;*---------------------------------------------------------------------*/
***************
*** 203,209 ****
    :group 'flyspell
    :version "21.1"
    :type 'boolean)
!   
  ;;;###autoload
  (defcustom flyspell-mode-line-string " Fly"
    "*String displayed on the modeline when flyspell is active.
--- 204,210 ----
    :group 'flyspell
    :version "21.1"
    :type 'boolean)
! 
  ;;;###autoload
  (defcustom flyspell-mode-line-string " Fly"
    "*String displayed on the modeline when flyspell is active.
***************
*** 422,428 ****
  The default flyspell behavior is to highlight incorrect words.
  With no argument, this command toggles Flyspell mode.
  With a prefix argument ARG, turn Flyspell minor mode on iff ARG is positive.
!   
  Bindings:
  \\[ispell-word]: correct words (using Ispell).
  \\[flyspell-auto-correct-word]: automatically correct word.
--- 423,429 ----
  The default flyspell behavior is to highlight incorrect words.
  With no argument, this command toggles Flyspell mode.
  With a prefix argument ARG, turn Flyspell minor mode on iff ARG is positive.
! 
  Bindings:
  \\[ispell-word]: correct words (using Ispell).
  \\[flyspell-auto-correct-word]: automatically correct word.
***************
*** 472,478 ****
  ;*    For remembering buffers running flyspell                         */
  ;*---------------------------------------------------------------------*/
  (defvar flyspell-buffers nil)
!  
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-minibuffer-p ...                                        */
  ;*---------------------------------------------------------------------*/
--- 473,479 ----
  ;*    For remembering buffers running flyspell                         */
  ;*---------------------------------------------------------------------*/
  (defvar flyspell-buffers nil)
! 
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-minibuffer-p ...                                        */
  ;*---------------------------------------------------------------------*/
***************
*** 488,494 ****
    (ispell-accept-buffer-local-defs)
    (if (not (and (eq flyspell-dash-dictionary ispell-dictionary)
                (eq flyspell-dash-local-dictionary ispell-local-dictionary)))
!       ;; the dictionary as changed
        (progn
        (setq flyspell-dash-dictionary ispell-dictionary)
        (setq flyspell-dash-local-dictionary ispell-local-dictionary)
--- 489,495 ----
    (ispell-accept-buffer-local-defs)
    (if (not (and (eq flyspell-dash-dictionary ispell-dictionary)
                (eq flyspell-dash-local-dictionary ispell-local-dictionary)))
!       ;; the dictionary has changed
        (progn
        (setq flyspell-dash-dictionary ispell-dictionary)
        (setq flyspell-dash-local-dictionary ispell-local-dictionary)
***************
*** 767,773 ****
        (insert (format "  cache-start: %S\n" flyspell-word-cache-start))
        (insert (format "  cache-end  : %S\n" flyspell-word-cache-end))
        (goto-char (point-max)))))
!     
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-debug-signal-word-checked ...                           */
  ;*---------------------------------------------------------------------*/
--- 768,774 ----
        (insert (format "  cache-start: %S\n" flyspell-word-cache-start))
        (insert (format "  cache-end  : %S\n" flyspell-word-cache-end))
        (goto-char (point-max)))))
! 
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-debug-signal-word-checked ...                           */
  ;*---------------------------------------------------------------------*/
***************
*** 1106,1112 ****
        (setq flyspell-ispell-casechars-cache ispell-casechars)
        (setq flyspell-casechars-cache ispell-casechars)
        flyspell-casechars-cache))))
!       
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-get-not-casechars-cache ...                             */
  ;*---------------------------------------------------------------------*/
--- 1107,1113 ----
        (setq flyspell-ispell-casechars-cache ispell-casechars)
        (setq flyspell-casechars-cache ispell-casechars)
        flyspell-casechars-cache))))
! 
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-get-not-casechars-cache ...                             */
  ;*---------------------------------------------------------------------*/
***************
*** 1269,1275 ****
      ;; have to kill the temporary buffer
      (kill-buffer flyspell-external-ispell-buffer)
      (setq flyspell-external-ispell-buffer nil)))
!   
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-large-region ...                                        */
  ;*---------------------------------------------------------------------*/
--- 1270,1276 ----
      ;; have to kill the temporary buffer
      (kill-buffer flyspell-external-ispell-buffer)
      (setq flyspell-external-ispell-buffer nil)))
! 
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-large-region ...                                        */
  ;*---------------------------------------------------------------------*/
***************
*** 1458,1464 ****
                     flyspell-overlay-keymap-property-name
                     flyspell-mouse-map))
      flyspell-overlay))
!     
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-highlight-incorrect-region ...                          */
  ;*---------------------------------------------------------------------*/
--- 1459,1465 ----
                     flyspell-overlay-keymap-property-name
                     flyspell-mouse-map))
      flyspell-overlay))
! 
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-highlight-incorrect-region ...                          */
  ;*---------------------------------------------------------------------*/
***************
*** 1480,1486 ****
            ;; now we can use a new overlay
            (setq flyspell-overlay
                  (make-flyspell-overlay beg end
!                                   'flyspell-incorrect-face 'highlight))))))
  
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-highlight-duplicate-region ...                          */
--- 1481,1488 ----
            ;; now we can use a new overlay
            (setq flyspell-overlay
                  (make-flyspell-overlay beg end
!                                      'flyspell-incorrect-face
!                                      'highlight))))))
  
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-highlight-duplicate-region ...                          */
***************
*** 1677,1683 ****
                                                              old-max))))))))))
        (setq flyspell-auto-correct-pos (point))
        (ispell-pdict-save t)))))
!   
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-correct-word ...                                        */
  ;*---------------------------------------------------------------------*/
--- 1679,1685 ----
                                                              old-max))))))))))
        (setq flyspell-auto-correct-pos (point))
        (ispell-pdict-save t)))))
! 
  ;*---------------------------------------------------------------------*/
  ;*    flyspell-correct-word ...                                        */
  ;*---------------------------------------------------------------------*/
***************
*** 1928,1936 ****
                      menu))))
  
  ;*---------------------------------------------------------------------*/
! ;*    Some example functions for real autocorrecting                    */
  ;*---------------------------------------------------------------------*/
- 
  (defun flyspell-maybe-correct-transposition (beg end poss)
    "Check replacements for transposed characters.
  
--- 1930,1937 ----
                      menu))))
  
  ;*---------------------------------------------------------------------*/
! ;*    Some example functions for real autocorrecting                   */
  ;*---------------------------------------------------------------------*/
  (defun flyspell-maybe-correct-transposition (beg end poss)
    "Check replacements for transposed characters.
  
***************
*** 2004,2010 ****
  ;*---------------------------------------------------------------------*/
  (defun flyspell-change-abbrev (table old new)
    (set (abbrev-symbol old table) new))
!   
  (provide 'flyspell)
  
  ;;; flyspell.el ends here
--- 2005,2011 ----
  ;*---------------------------------------------------------------------*/
  (defun flyspell-change-abbrev (table old new)
    (set (abbrev-symbol old table) new))
! 
  (provide 'flyspell)
  
  ;;; flyspell.el ends here