Merge remote-tracking branch 'savannah/master' into HEAD

4 files changed, 9 insertions, 9 deletions

diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1
index ef813bd0325..90bd8bd09ee 100644
--- a/lisp/erc/ChangeLog.1
+++ b/lisp/erc/ChangeLog.1
@@ -7296,7 +7296,7 @@
 	again.
 	(erc): Require cl for delete-if.
 	(erc-button-remove-old-buttons): Rewrote using delete-if to
-	prevent excesive consing.  Having the marker list is still ugly,
+	prevent excessive consing.  Having the marker list is still ugly,
 	so another solution needs to be found.
 
 2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
@@ -10260,7 +10260,7 @@
 	Upcased the command defuns (erc-cmd-join is now erc-cmd-JOIN)
 	Fixed erc-complete to not require erc-command-table.
 	Implemented erc-cmd-HELP
-	  (You have to try that, its tooo coool!)
+	  (You have to try that, its too coool!)
 	  e.g. /help auto-q
 	fixed autoloads for erc-add-pal and so on to be interactive.
 
@@ -11242,7 +11242,7 @@
 2001-10-29  Mario Lang  <mlang@delysid.org>
 
 	* erc.el:
-	Imenu fixed somehow, added IRC services interactive function for indentify to NickServ. Read the diff
+	Imenu fixed somehow, added IRC services interactive function for identify to NickServ. Read the diff
 
 2001-10-26  Gergely Nagy  <algernon@debian.org>
 
@@ -11316,7 +11316,7 @@
 
 	* erc-speak.el:
 	* 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!!!
+	  it's really cool now!!!
 
 	* erc-speak.el: *** empty log message ***
 
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 5e6f7c8d107..b799b2427c6 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -198,12 +198,12 @@ PAR is a number of a regexp grouping whose text will be passed to
                         :inline t
                         (integer :tag "Regexp section number")))))
 
-(defcustom erc-emacswiki-url "http://www.emacswiki.org/cgi-bin/wiki.pl?"
+(defcustom erc-emacswiki-url "https://www.emacswiki.org/cgi-bin/wiki.pl?"
   "URL of the EmacsWiki Homepage."
   :group 'erc-button
   :type 'string)
 
-(defcustom erc-emacswiki-lisp-url "http://www.emacswiki.org/elisp/"
+(defcustom erc-emacswiki-lisp-url "https://www.emacswiki.org/elisp/"
   "URL of the EmacsWiki ELisp area."
   :group 'erc-button
   :type 'string)
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 3398c8b9d0c..60f0cfa942f 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -860,7 +860,7 @@ is in `erc-mode'."
 
 (defvar erc-track-last-non-erc-buffer nil
   "Stores the name of the last buffer you were in before activating
-`erc-track-switch-buffers'.")
+`erc-track-switch-buffer'.")
 
 (defun erc-track-sort-by-activest ()
   "Sort erc-modified-channels-alist by activity.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e7e43f87347..1d5506e2816 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5039,7 +5039,7 @@ information if it is not already present in the user or channel
 lists.
 
 If, and only if, changes are made, or the user is added,
-`erc-channel-members-updated-hook' is run, and t is returned.
+`erc-channel-members-changed-hook' is run, and t is returned.
 
 See also: `erc-update-user' and `erc-update-channel-member'."
   (let* (changed user-changed
@@ -6072,7 +6072,7 @@ Sets the buffer local variables:
 - `erc-session-connector'
 - `erc-session-server'
 - `erc-session-port'
-- `erc-session-full-name'
+- `erc-session-user-full-name'
 - `erc-server-current-nick'"
   (setq erc-session-connector erc-server-connect-function
         erc-session-server (erc-compute-server server)