merge trunk

7 files changed, 40 insertions, 11 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3558a8a90b5..8b4df6099bc 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,27 @@
+2012-10-07  Deniz Dogan  <deniz@dogan.se>
+
+        * erc-log.el (erc-generate-log-file-name-function):
+        Clarify tags for various choices.  (Bug#11186)
+
+2012-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * erc-button.el (erc-button-alist): Remove "finger".  (Bug#4443)
+
+2012-10-07  Antoine Levitt  <antoine.levitt@gmail.com>
+
+        * erc-stamp.el (erc-format-timestamp): Don't apply intangible
+        property to invisible stamps.  (Bug#11706)
+
+2012-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * erc-backend.el (NICK): Handle pre-existing buffers.  (Bug#12002)
+
+2012-10-06  Glenn Morris  <rgm@gnu.org>
+
+        * erc.el (erc-lurker):
+        * erc-desktop-notifications.el (erc-notifications):
+        Add missing group :version tags.
+
 2012-10-04  Julien Danjou  <julien@danjou.info>
 
         * erc-desktop-notifications.el: Rename from erc-notifications to
@@ -9,8 +33,7 @@
 
 2012-09-17  Chong Yidong  <cyd@gnu.org>
 
-        * erc-page.el (erc-page-function): 
-
+        * erc-page.el (erc-page-function):
         * erc-stamp.el (erc-stamp): Doc fix.
 
 2012-08-21  Josh Feinstein <jlf@foxtail.org>
@@ -103,7 +126,7 @@
         (erc-autojoin-after-ident): Ditto.
         (erc-autojoin-channels-alist): Mention auth-source.
 
-2012-04-10  Deniz Dogan  <deniz@dogan.se>  (tiny change)
+2012-04-10  Deniz Dogan  <deniz@dogan.se>
 
         * erc.el (erc-display-prompt): Adds the field text property to the
         ERC prompt.  This allows users to use `kill-whole-line' to kill
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 75f0047bf06..20ccd071b95 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1316,7 +1316,7 @@ add things to `%s' instead."
          (when (equal (erc-default-target) nick)
            (setq erc-default-recipients
                  (cons nn (cdr erc-default-recipients)))
-           (rename-buffer nn)
+           (rename-buffer nn t)         ; bug#12002
            (erc-update-mode-line)
            (add-to-list 'bufs (current-buffer)))))
       (erc-update-user-nick nick nn host nil nil login)
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 687d11d144e..433ffc05340 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -135,7 +135,7 @@ longer than `erc-fill-column'."
   '(('nicknames 0 erc-button-buttonize-nicks erc-nick-popup 0)
     (erc-button-url-regexp 0 t browse-url 0)
     ("<URL: *\\([^<> ]+\\) *>" 0 t browse-url 1)
-    ("(\\(\\([^~\n \t@][^\n \t@]*\\)@\\([a-zA-Z0-9.:-]+\\)\\)" 1 t finger 2 3)
+;;; ("(\\(\\([^~\n \t@][^\n \t@]*\\)@\\([a-zA-Z0-9.:-]+\\)\\)" 1 t finger 2 3)
     ;; emacs internal
     ("[`]\\([a-zA-Z][-a-zA-Z_0-9]+\\)[']" 1 t erc-button-describe-symbol 1)
     ;; pseudo links
@@ -183,6 +183,7 @@ PAR is a number of a regexp grouping whose text will be passed to
   'nicknames, these are ignored, and CALLBACK will be called with
   the nickname matched as the argument."
   :group 'erc-button
+  :version "24.3"                       ; remove finger (bug#4443)
   :type '(repeat
           (list :tag "Button"
                 (choice :tag "Matches"
diff --git a/lisp/erc/erc-desktop-notifications.el b/lisp/erc/erc-desktop-notifications.el
index 57b93f43219..2cc3c80a8ea 100644
--- a/lisp/erc/erc-desktop-notifications.el
+++ b/lisp/erc/erc-desktop-notifications.el
@@ -35,6 +35,7 @@
 
 (defgroup erc-notifications nil
   "Send notifications on PRIVMSG or mentions."
+  :version "24.3"
   :group 'erc)
 
 (defvar erc-notifications-last-notification nil
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 9e6c587bd12..b3f3f5865a1 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -114,11 +114,13 @@ If you want to write logs into different directories, make a
 custom function which returns the directory part and set
 `erc-log-channels-directory' to its name."
   :group 'erc-log
-  :type '(choice (const :tag "Long style" erc-generate-log-file-name-long)
-                 (const :tag "Long, but with network name rather than server"
+  :type '(choice (const :tag "#channel!nick@server:port.txt"
+                        erc-generate-log-file-name-long)
+                 (const :tag "#channel!nick@network.txt"
                         erc-generate-log-file-name-network)
-                 (const :tag "Short" erc-generate-log-file-name-short)
-                 (const :tag "With date" erc-generate-log-file-name-with-date)
+                 (const :tag "#channel.txt" erc-generate-log-file-name-short)
+                 (const :tag "#channel@date.txt"
+                        erc-generate-log-file-name-with-date)
                  (function :tag "Other function")))
 
 (defcustom erc-truncate-buffer-on-save nil
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 1613d03912c..4fa3f9f5915 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -353,8 +353,9 @@ Return the empty string if FORMAT is nil."
                                'isearch-open-invisible 'timestamp ts)
         ;; N.B. Later use categories instead of this harmless, but
         ;; inelegant, hack. -- BPT
-        (when erc-timestamp-intangible
-          (erc-put-text-property 0 (length ts) 'intangible t ts))
+        (and erc-timestamp-intangible
+             (not erc-hide-timestamps)  ; bug#11706
+             (erc-put-text-property 0 (length ts) 'intangible t ts))
         ts)
     ""))
 
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 687e60da28a..bbd9dad4310 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -102,6 +102,7 @@
 
 (defgroup erc-lurker nil
   "Hide specified message types sent by lurkers"
+  :version "24.3"
   :group 'erc-ignore)
 
 (defgroup erc-query nil