upstream

8 files changed, 40 insertions, 40 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index d72d3f51bb1..9a029893352 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * erc-notify.el (erc-notify-interval, erc-cmd-NOTIFY): Fix typos.
+
 2011-10-20  Chong Yidong  <cyd@gnu.org>
 
         * erc.el (define-erc-module): Fix autogenerated docstring to
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index 4016586abc7..1e90b33a23b 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -160,9 +160,9 @@
 
         * debian/control: integrated erc-speak back into erc
 
-        * debian/maint/conffiles, debian/maint/conffiles.in, debian/maint/postinst, 
-          debian/maint/postinst.in, debian/maint/prerm, debian/maint/prerm.in, 
-          debian/scripts/install, debian/scripts/install.in, debian/scripts/remove, 
+        * debian/maint/conffiles, debian/maint/conffiles.in, debian/maint/postinst,
+          debian/maint/postinst.in, debian/maint/prerm, debian/maint/prerm.in,
+          debian/scripts/install, debian/scripts/install.in, debian/scripts/remove,
           debian/scripts/remove.in, debian/scripts/startup.erc-speak:
         since erc-speak is gone, resurrect the static files, and update them to support the latest erc
 
@@ -220,7 +220,7 @@
         * erc.el:
         * Applied antifuchs/mhp patches, the latest on erc-help, unmodified
         * New variable: erc-reuse-buffers default to t.
-        * Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same, 
+        * Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same,
           then one can assume thats the same channel/query target again.
 
 2001-11-23  Mario Lang  <mlang@delysid.org>
@@ -238,7 +238,7 @@
 
         * erc.el: * New local variable, erc-announced-server-name
         * erc-mode-line-format supports a new symbol, target-and/or-server
-        * The mode-line displays the announced server name now (for autojoin later..., 
+        * The mode-line displays the announced server name now (for autojoin later...,
           greets Adam)
         * New macro, erc-server-hook-list for a nice way to define the defcustoms of the erc-server-*-hook's
           Thanks go to the guy from #emacs who helped with that
@@ -457,7 +457,7 @@
         * erc.el: * Reduction patch 2
           This time, we move the input ring handling into erc-ring.el
           Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature
-          And remeber, that you don't need it if you don't use input ring :-)
+          And remember, that you don't need it if you don't use input ring :-)
 
         * erc-ring.el: * Initial checkin
 
@@ -603,11 +603,11 @@
 
         * debian/control: added the new erc-speak package
 
-        * debian/README.erc-speak, debian/maint/postinst.in, debian/maint/prerm.in, 
+        * debian/README.erc-speak, debian/maint/postinst.in, debian/maint/prerm.in,
           debian/scripts/install.in, debian/scripts/remove.in:
         new file
 
-        * debian/maint/postinst, debian/maint/prerm, debian/scripts/install, 
+        * debian/maint/postinst, debian/maint/prerm, debian/scripts/install,
           debian/scripts/remove:
         removed, superseded by its .in counterpart
 
@@ -625,7 +625,7 @@
 2001-10-23  Mario Lang  <mlang@delysid.org>
 
         * erc-speak.el:
-        * Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to, 
+        * Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to,
           especially if you are on more than one channel simultaneously.
 
         * erc.el:
@@ -643,7 +643,7 @@
         * Removed now really obsolete code. Package size reduced by 50%
 
         * erc-speak.el:
-        * Very important fix! Now erc-speak is really complete. Messages don't get cut anymore. Be sure to use auditory icons, 
+        * Very important fix! Now erc-speak is really complete. Messages don't get cut anymore. Be sure to use auditory icons,
           it's reallllly cool now!!!
 
         * erc-speak.el: *** empty log message ***
@@ -655,9 +655,9 @@
 
         * debian/changelog: oops, silly typo
 
-        * debian/changelog, debian/control, debian/copyright, 
-          debian/maint/conffiles, debian/maint/postinst, debian/maint/prerm, 
-          debian/rules, debian/scripts/install, debian/scripts/remove, 
+        * debian/changelog, debian/control, debian/copyright,
+          debian/maint/conffiles, debian/maint/postinst, debian/maint/prerm,
+          debian/rules, debian/scripts/install, debian/scripts/remove,
           debian/scripts/startup:
         initial check-in
 
@@ -666,7 +666,7 @@
         * erc.el:
         * Changed erc-insert-hook to get two arguments, START and END of the region
           which got inserted. CAREFUL! This could break stuff, but it makes the hook
-          much more useable.
+          much more usable.
 
         * erc.el:
         * Made erc-smiley a new option, currently set to t to showoff this feature. :)
@@ -826,11 +826,11 @@
         * (erc-complete-nick): Add ": " only if one completes directly after the erc-prompt, otherwise, add just one space
 
         * erc.el:
-        * Changed menu-definition to use easymenu (hopefully this now works under Xemacs)
+        * Changed menu-definition to use easymenu (hopefully this now works under XEmacs)
         * Fix for custom problem with :must-match on XEmacs (thanks shapr)
         * Added /COUNTRY command using (what-domain) from package mail-extr (shapr)
         * Fix for case-sensitivity problem with pals (they are now all downcased)
-        * Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer, 
+        * Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer,
           instead of just displaying it in the minibuffer.
 
 2001-09-10  Mario Lang  <mlang@delysid.org>
@@ -1055,4 +1055,3 @@
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
-
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index 09ab1cb3796..d1b05a23140 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -1373,7 +1373,7 @@
 
         * erc-menu.el:
         * changed how we check if we should activate "Track hidden channels" and
-          whether it should be selected - fixes a bug Xemacs where whole menu bar
+          whether it should be selected - fixes a bug XEmacs where whole menu bar
           does not work if menu is loaded
 
         * erc-menu.el:
@@ -1545,7 +1545,7 @@
 
         * added s461 to english catalog
 
-        * fixed bug where Xemacs would not quit if erc-quit-reason was
+        * fixed bug where XEmacs would not quit if erc-quit-reason was
           set to erc-quit-reason-various and assoc-default was not defined
 
 2002-06-04  Andreas Fuchs  <asf@void.at>
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index 7f82a9bcbe2..956ef5f4c66 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -323,7 +323,7 @@
 
         * erc.el(erc-modules): Add some more symbols to the set
 
-        * erc.el(erc-modules):  * erc.el(erc-modules): Add :greedy t to the set in 
+        * erc.el(erc-modules):  * erc.el(erc-modules): Add :greedy t to the set in
 
         * erc-dcc.el:
         More autoloads which make dcc autoload upon ctcp dcc query received.
@@ -744,7 +744,7 @@
 
 2003-04-27  Damien Elmes  <erc@repose.cx>
 
-        * erc.el:       * erc.el: erc-modules: added 
+        * erc.el:       * erc.el: erc-modules: added
 
 2003-04-27  Alex Schroeder  <alex@gnu.org>
 
@@ -1232,7 +1232,7 @@
 
 2003-01-19  Mario Lang  <mlang@delysid.org>
 
-        * debian/README.Debian, debian/changelog, debian/scripts/install, 
+        * debian/README.Debian, debian/changelog, debian/scripts/install,
           debian/scripts/startup.erc, Makefile:
         Prepare for 20030119 debian package
 
@@ -1305,7 +1305,7 @@
         * (erc-current-logfile): call expand-file-name, so that downcase doesn't mess up ~
 
         * erc.el: * (erc-mode): Define a proper case-table.
-        * (erc-downcase): just call downcase for now, lets see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway...
+        * (erc-downcase): just call downcase for now, let's see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway...
 
         * erc-button.el: * (erc-button-add-buttons): regex-quote the nick
 
@@ -1600,7 +1600,8 @@
 
         * erc-dcc.el: * erc-dcc-ipv4-regexp: New constant
         * (erc-ip-to-decimal): Use it.
-        * erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp:        * erc-dcc-host: :type
+        * erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp:
+        * erc-dcc-host: :type
         * (pcomplete/erc-mode/DCC): Add completion for GET and CLOSE.
         * Some docstring/comment fixes.
 
@@ -1609,8 +1610,8 @@
         POS in any case, otherwise, linewrap occurs.
 
         * erc-dcc.el:
-        * Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil), 
-          and saves correctly (tried with 21.3.50). Thanks to Eli for suggesting it!
+        * Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil),
+          and saves correctly (tried with 21.3.50)). Thanks to Eli for suggesting it!
         * Added :start-time plist property/value to GET handling so that we can calculate elapsed-time.
         * Some (unwind-protect (progn (set-buffer ...) ...)) constructs replaced with (with-current-buffer ...)
 
@@ -1691,12 +1692,12 @@
 
 2003-01-11  Mario Lang  <mlang@delysid.org>
 
-        * erc-dcc.el:   * erc-dcc.el: * (erc-dcc-do-LIST-command): Fix 
+        * erc-dcc.el:   * erc-dcc.el: * (erc-dcc-do-LIST-command): Fix
 
         * erc-dcc.el:
         * buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed
           Keep This info in erc-dcc-member :sent and :confirmed plist values
-        * :     * :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer 
+        * :     * :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer
         * erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-connected, which now prints a msg...
 
         * erc-dcc.el:
@@ -1985,7 +1986,7 @@
         (erc-server-PRIVMSG-or-NOTICE): Capitalized first word in message to user.
 
         * erc.el(erc-scroll-to-bottom):
-        Temporarilly bind resize-mini-windows to nil so that
+        Temporarily bind resize-mini-windows to nil so that
             users who have it set to a non-nil value will not suffer from premature
             minibuffer shrinkage due to the below recenter call.  I have no idea why
             this works, but it solves the problem, and has no negative side effects.
@@ -2160,4 +2161,3 @@ See ChangeLog.02 for earlier changes.
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
-
diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index 7db040fd23f..ff47372b8e3 100644
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -136,7 +136,7 @@
 2004-12-14  Diane Murray  <disumu@x3y2z1.net>
 
         * erc.el: The last change to `erc-mode-line-format' introduced a
-        bug in Xemacs - it can't handle the #(" "...) strings at all.  The
+        bug in XEmacs - it can't handle the #(" "...) strings at all.  The
         following changes fix the bug and simplify the mode-line handling
         considerably.  (erc-mode-line-format): Now defined as a string
         which will be formatted using `format-spec' and take the place of
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index a15e038dddc..74172b2573f 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -263,7 +263,7 @@ exceeds `erc-autoaway-idle-seconds'."
   "Set the away state globally.
 
 If NOTEST is specified, do not check to see whether there is an
-activer server buffer available."
+active server buffer available."
   ;; Note that the idle timer runs, even when Emacs is inactive.  In
   ;; order to prevent flooding when we connect, we test for an
   ;; existing process.
@@ -284,4 +284,3 @@ activer server buffer available."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index d363ea92bdb..f86c9ef845a 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -79,7 +79,7 @@
 
 ;;; TODO:
 
-;; o Generalise the display-line code so that we can use it to
+;; o Generalize the display-line code so that we can use it to
 ;;   display the stuff we send, as well as the stuff we receive.
 ;;   Then, move all display-related code into another backend-like
 ;;   file, erc-display.el, say.
@@ -2000,4 +2000,3 @@ See `erc-display-error-notice'." nil
 ;; Local Variables:
 ;; indent-tabs-mode: nil
 ;; End:
-
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 1b245ec2e33..10f6806ec12 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -46,7 +46,7 @@ status change."
   :type '(repeat string))
 
 (defcustom erc-notify-interval 60
-  "*Time interval (in seconds) for checking online status of notificated
+  "*Time interval (in seconds) for checking online status of notified
 people."
   :group 'erc-notify
   :type 'integer)
@@ -88,7 +88,7 @@ strings."
 (defun erc-notify-install-message-catalogs ()
   (erc-define-catalog
    'english
-   '((notify_current . "Notificated people online: %l")
+   '((notify_current . "Notified people online: %l")
      (notify_list    . "Current notify list: %l")
      (notify_on      . "Detected %n on IRC network %m")
      (notify_off     . "%n has left IRC network %m"))))
@@ -197,11 +197,11 @@ nick from `erc-last-ison' to prevent any further notifications."
 ;;;###autoload
 (defun erc-cmd-NOTIFY (&rest args)
   "Change `erc-notify-list' or list current notify-list members online.
-Without args, list the current list of notificated people online,
+Without args, list the current list of notified people online,
 with args, toggle notify status of people."
   (cond
    ((null args)
-    ;; Print current notificated people (online)
+    ;; Print current notified people (online)
     (let ((ison (erc-with-server-buffer erc-last-ison)))
       (if (not ison)
           (erc-display-message
@@ -250,4 +250,3 @@ with args, toggle notify status of people."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-