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

[Richard M. Stallman]

Index: emacs/lisp/emacs-lisp/checkdoc.el
diff -c emacs/lisp/emacs-lisp/checkdoc.el:1.29 
emacs/lisp/emacs-lisp/checkdoc.el:1.30
*** emacs/lisp/emacs-lisp/checkdoc.el:1.29      Sun Jul 14 11:26:01 2002
--- emacs/lisp/emacs-lisp/checkdoc.el   Thu Aug  8 21:56:00 2002
***************
*** 91,97 ****
  ;;   The variable `checkdoc-spellcheck-documentation-flag' can be set
  ;; to customize how spell checking is to be done.  Since spell
  ;; checking can be quite slow, you can optimize how best you want your
! ;; checking done.  The default is 'defun, which spell checks each time
  ;; `checkdoc-defun' or `checkdoc-eval-defun' is used.  Setting to nil
  ;; prevents spell checking during normal usage.
  ;;   Setting this variable to nil does not mean you cannot take
--- 91,97 ----
  ;;   The variable `checkdoc-spellcheck-documentation-flag' can be set
  ;; to customize how spell checking is to be done.  Since spell
  ;; checking can be quite slow, you can optimize how best you want your
! ;; checking done.  The default is `defun', which spell checks each time
  ;; `checkdoc-defun' or `checkdoc-eval-defun' is used.  Setting to nil
  ;; prevents spell checking during normal usage.
  ;;   Setting this variable to nil does not mean you cannot take
***************
*** 467,474 ****
    (interactive)
    (let ((status (list "Checking..." "-" "-" "-"))
        (checkdoc-spellcheck-documentation-flag
!        (member checkdoc-spellcheck-documentation-flag
!                '(buffer interactive t)))
        ;; if the user set autofix to never, then that breaks the
        ;; obviously requested asking implied by using this function.
        ;; Set it to paranoia level.
--- 467,474 ----
    (interactive)
    (let ((status (list "Checking..." "-" "-" "-"))
        (checkdoc-spellcheck-documentation-flag
!        (car (memq checkdoc-spellcheck-documentation-flag
!                     '(buffer interactive t))))
        ;; if the user set autofix to never, then that breaks the
        ;; obviously requested asking implied by using this function.
        ;; Set it to paranoia level.
***************
*** 535,542 ****
  checkdoc status window instead of the usual behavior."
    (interactive "P")
    (let ((checkdoc-spellcheck-documentation-flag
!        (member checkdoc-spellcheck-documentation-flag
!                '(interactive t))))
      (checkdoc-interactive-loop start-here showstatus 'checkdoc-next-error)))
  
  ;;;###autoload
--- 535,542 ----
  checkdoc status window instead of the usual behavior."
    (interactive "P")
    (let ((checkdoc-spellcheck-documentation-flag
!        (car (memq checkdoc-spellcheck-documentation-flag
!                     '(interactive t)))))
      (checkdoc-interactive-loop start-here showstatus 'checkdoc-next-error)))
  
  ;;;###autoload
***************
*** 550,557 ****
  checkdoc status window instead of the usual behavior."
    (interactive "P")
    (let ((checkdoc-spellcheck-documentation-flag
!        (member checkdoc-spellcheck-documentation-flag
!                '(interactive t))))
      (checkdoc-interactive-loop start-here showstatus
                               'checkdoc-next-message-error)))
  
--- 550,557 ----
  checkdoc status window instead of the usual behavior."
    (interactive "P")
    (let ((checkdoc-spellcheck-documentation-flag
!        (car (memq checkdoc-spellcheck-documentation-flag
!                     '(interactive t)))))
      (checkdoc-interactive-loop start-here showstatus
                               'checkdoc-next-message-error)))
  
***************
*** 569,576 ****
                  (if (not start-here) (goto-char (point-min)))))
         ;; Assign a flag to spellcheck flag
         (checkdoc-spellcheck-documentation-flag
!         (member checkdoc-spellcheck-documentation-flag
!                 '(buffer interactive t)))
         ;; Fetch the error list
         (err-list (list (funcall findfunc nil)))
         (cdo nil)
--- 569,576 ----
                  (if (not start-here) (goto-char (point-min)))))
         ;; Assign a flag to spellcheck flag
         (checkdoc-spellcheck-documentation-flag
!         (car (memq checkdoc-spellcheck-documentation-flag
!                      '(buffer interactive t))))
         ;; Fetch the error list
         (err-list (list (funcall findfunc nil)))
         (cdo nil)
***************
*** 803,809 ****
    (if (interactive-p) (message "Checking buffer for style..."))
    ;; Assign a flag to spellcheck flag
    (let ((checkdoc-spellcheck-documentation-flag
!        (memq checkdoc-spellcheck-documentation-flag '(buffer t)))
        (checkdoc-autofix-flag (if take-notes 'never
                                 checkdoc-autofix-flag))
        (checkdoc-generate-compile-warnings-flag
--- 803,810 ----
    (if (interactive-p) (message "Checking buffer for style..."))
    ;; Assign a flag to spellcheck flag
    (let ((checkdoc-spellcheck-documentation-flag
!        (car (memq checkdoc-spellcheck-documentation-flag
!                     '(buffer t))))
        (checkdoc-autofix-flag (if take-notes 'never
                                 checkdoc-autofix-flag))
        (checkdoc-generate-compile-warnings-flag
***************
*** 847,854 ****
    (let ((wrong nil) (msg nil) (errors nil)
        ;; Assign a flag to spellcheck flag
        (checkdoc-spellcheck-documentation-flag
!        (member checkdoc-spellcheck-documentation-flag
!                '(buffer t)))
        (checkdoc-autofix-flag (if take-notes 'never
                                 checkdoc-autofix-flag))
        (checkdoc-generate-compile-warnings-flag
--- 848,855 ----
    (let ((wrong nil) (msg nil) (errors nil)
        ;; Assign a flag to spellcheck flag
        (checkdoc-spellcheck-documentation-flag
!        (car (memq checkdoc-spellcheck-documentation-flag
!                     '(buffer t))))
        (checkdoc-autofix-flag (if take-notes 'never
                                 checkdoc-autofix-flag))
        (checkdoc-generate-compile-warnings-flag
***************
*** 891,898 ****
    (if (not buffer-file-name)
       (error "Can only check comments for a file buffer"))
    (let* ((checkdoc-spellcheck-documentation-flag
!         (member checkdoc-spellcheck-documentation-flag
!                 '(buffer t)))
         (checkdoc-autofix-flag (if take-notes 'never checkdoc-autofix-flag))
         (e (checkdoc-file-comments-engine))
        (checkdoc-generate-compile-warnings-flag
--- 892,899 ----
    (if (not buffer-file-name)
       (error "Can only check comments for a file buffer"))
    (let* ((checkdoc-spellcheck-documentation-flag
!         (car (memq checkdoc-spellcheck-documentation-flag
!                      '(buffer t))))
         (checkdoc-autofix-flag (if take-notes 'never checkdoc-autofix-flag))
         (e (checkdoc-file-comments-engine))
        (checkdoc-generate-compile-warnings-flag
***************
*** 971,978 ****
        (forward-sexp 1)
        (skip-chars-forward " \n\t")
        (let* ((checkdoc-spellcheck-documentation-flag
!             (member checkdoc-spellcheck-documentation-flag
!                     '(defun t)))
             (beg (save-excursion (beginning-of-defun) (point)))
             (end (save-excursion (end-of-defun) (point)))
             (msg (checkdoc-this-string-valid)))
--- 972,979 ----
        (forward-sexp 1)
        (skip-chars-forward " \n\t")
        (let* ((checkdoc-spellcheck-documentation-flag
!             (car (memq checkdoc-spellcheck-documentation-flag
!                          '(defun t))))
             (beg (save-excursion (beginning-of-defun) (point)))
             (end (save-excursion (end-of-defun) (point)))
             (msg (checkdoc-this-string-valid)))
***************
*** 2052,2058 ****
    (if (or (not checkdoc-spellcheck-documentation-flag)
          ;; If the user wants no questions or fixing, then we must
          ;; disable spell checking as not useful.
!         (not checkdoc-autofix-flag)
          (eq checkdoc-autofix-flag 'never))
        nil
      (checkdoc-ispell-init)
--- 2053,2063 ----
    (if (or (not checkdoc-spellcheck-documentation-flag)
          ;; If the user wants no questions or fixing, then we must
          ;; disable spell checking as not useful.
!           ;; FIXME: Somehow, `checkdoc-autofix-flag' is always nil
!           ;; when `checkdoc-ispell-docstring-engine' is called to be
!           ;; used on a docstring.  As a workround, I commented out the
!           ;; next line.
!         ;; (not checkdoc-autofix-flag)
          (eq checkdoc-autofix-flag 'never))
        nil
      (checkdoc-ispell-init)