[Emacs-diffs] master 250d24f: Spelling fixes

[Paul Eggert]

branch: master
commit 250d24fa7333046fb187cf4f544dc4358f16e2df
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Spelling fixes
    
    * lisp/gnus/nndiary.el (nndiary-last-occurrence):
    Rename from nndiary-last-occurence.
    (nndiary-next-occurrence):
    Rename from nndiary-next-occurence.  All uses changed.
---
 doc/lispref/processes.texi |  2 +-
 lisp/gnus/gnus-diary.el    |  8 ++++----
 lisp/gnus/gnus-sum.el      |  2 +-
 lisp/gnus/nndiary.el       | 22 ++++++++++++----------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 1d200ce..292d55d 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -690,7 +690,7 @@ information, is available via the @code{process-contact} 
function.
 The current working directory of the subprocess is set to the current
 buffer's value of @code{default-directory} if that is local (as
 determined by `unhandled-file-name-directory'), or "~" otherwise.  If
-you want to run a process in a remote direcotry use
+you want to run a process in a remote directory use
 @code{start-file-process}.
 @end defun
 
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index 99d3a2b..b81c6d0 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -159,7 +159,7 @@ There are currently two built-in format functions:
   ;; Code partly stolen from article-make-date-line
   (let* ((extras (mail-header-extra header))
         (sched (gnus-diary-header-schedule extras))
-        (occur (nndiary-next-occurence sched (current-time)))
+        (occur (nndiary-next-occurrence sched (current-time)))
         (now (current-time))
         (real-time (time-subtract occur now)))
     (if (null real-time)
@@ -194,7 +194,7 @@ There are currently two built-in format functions:
   ;; Returns a formatted time string for the next occurrence of this message.
   (let* ((extras (mail-header-extra header))
         (sched (gnus-diary-header-schedule extras))
-        (occur (nndiary-next-occurence sched (current-time))))
+        (occur (nndiary-next-occurrence sched (current-time))))
     (format-time-string gnus-diary-time-format occur)))
 
 
@@ -206,8 +206,8 @@ There are currently two built-in format functions:
         (e2 (mail-header-extra h2))
         (s1 (gnus-diary-header-schedule e1))
         (s2 (gnus-diary-header-schedule e2))
-        (o1 (nndiary-next-occurence s1 now))
-        (o2 (nndiary-next-occurence s2 now)))
+        (o1 (nndiary-next-occurrence s1 now))
+        (o2 (nndiary-next-occurrence s2 now)))
     (if (and (= (car o1) (car o2)) (= (cadr o1) (cadr o2)))
        (< (mail-header-number h1) (mail-header-number h2))
       (time-less-p o1 o2))))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 183cd46..9bdd0c6 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8600,7 +8600,7 @@ these articles."
       ;; subject, while the second pop gets us back to the state
       ;; before we started to deal with the thread. presumably we want
       ;; to think of the thread and its associated subject matches as
-      ;; a single thing so that we onnly need to pop once to get back
+      ;; a single thing so that we need to pop only once to get back
       ;; to the original view.
       (pop gnus-newsgroup-limits)
       (gnus-summary-position-point))))
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index bed35b5..0390b5b 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -1304,9 +1304,7 @@ all.  This may very well take some time.")
        res))
     (sort res 'time-less-p)))
 
-;; FIXME: "occurrence" is misspelled in this function name.
-
-(defun nndiary-last-occurence (sched)
+(defun nndiary-last-occurrence (sched)
   ;; Returns the last occurrence of schedule SCHED as an Emacs time struct, or
   ;; nil for permanent schedule or errors.
   (let ((minute (nndiary-max (nth 0 sched)))
@@ -1385,10 +1383,11 @@ all.  This may very well take some time.")
           (nnheader-report 'nndiary "Undecidable schedule")
           nil))
        ))))
+(define-obsolete-function-alias
+  'nndiary-last-occurence
+  'nndiary-last-occurrence "26.1")
 
-;; FIXME: "occurrence" is misspelled in this function name.
-
-(defun nndiary-next-occurence (sched now)
+(defun nndiary-next-occurrence (sched now)
   ;; Returns the next occurrence of schedule SCHED, starting from time NOW.
   ;; If there's no next occurrence, returns the last one (if any) which is then
   ;; in the past.
@@ -1517,10 +1516,13 @@ all.  This may very well take some time.")
                       ))
                   )))
             ))
-        (nndiary-last-occurence sched))
+        (nndiary-last-occurrence sched))
       ;; else
-      (nndiary-last-occurence sched))
+      (nndiary-last-occurrence sched))
     ))
+(define-obsolete-function-alias
+  'nndiary-next-occurence
+  'nndiary-next-occurrence "26.1")
 
 (defun nndiary-expired-article-p (file)
   (with-temp-buffer
@@ -1529,7 +1531,7 @@ all.  This may very well take some time.")
          ;; An article has expired if its last schedule (if any) is in the
          ;; past. A permanent schedule never expires.
          (and sched
-              (setq sched (nndiary-last-occurence sched))
+              (setq sched (nndiary-last-occurrence sched))
               (time-less-p sched (current-time))))
       ;; else
       (nnheader-report 'nndiary "Could not read file %s" file)
@@ -1543,7 +1545,7 @@ all.  This may very well take some time.")
            (sched (nndiary-schedule)))
        ;; The article should be re-considered as unread if there's a reminder
        ;; between the group timestamp and the current time.
-       (when (and sched (setq sched (nndiary-next-occurence sched now)))
+       (when (and sched (setq sched (nndiary-next-occurrence sched now)))
          (let ((reminders ;; add the next occurrence itself at the end.
                 (append (nndiary-compute-reminders sched) (list sched))))
            (while (and reminders (time-less-p (car reminders) timestamp))