[Emacs-diffs] /srv/bzr/emacs/trunk r109453: erc-match: add option to exclude server buffer

[Julien Danjou]

------------------------------------------------------------
revno: 109453
committer: Julien Danjou <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-06 02:15:34 +0200
message:
  erc-match: add option to exclude server buffer
  
  * erc-match.el (erc-match-exclude-server-buffer)
  (erc-match-message): Add new option to exclude server buffer from
  matching.
modified:
  lisp/erc/ChangeLog
  lisp/erc/erc-match.el

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2012-07-21 11:08:32 +0000
+++ b/lisp/erc/ChangeLog        2012-08-06 00:15:34 +0000
@@ -1,3 +1,9 @@
+2012-08-06  Julien Danjou  <address@hidden>
+
+       * erc-match.el (erc-match-exclude-server-buffer)
+       (erc-match-message): Add new option to exclude server buffer from
+       matching.
+
 2012-07-21  Julien Danjou  <address@hidden>
 
        * erc-notifications.el: New file.

=== modified file 'lisp/erc/erc-match.el'
--- a/lisp/erc/erc-match.el     2012-06-08 16:39:49 +0000
+++ b/lisp/erc/erc-match.el     2012-08-06 00:15:34 +0000
@@ -232,6 +232,14 @@
   :group 'erc-match
   :type 'hook)
 
+(defcustom erc-match-exclude-server-buffer nil
+  "If true, don't perform match on the server buffer; this is
+useful for excluding all the things like MOTDs from the server
+and other miscellaneous functions."
+  :group 'erc-match
+  :version "24.2"
+  :type 'boolean)
+
 ;; Internal variables:
 
 ;; This is exactly the same as erc-button-syntax-table.  Should we
@@ -449,7 +457,9 @@
                                        (+ 2 nick-end)
                                      (point-min))
                                    (point-max))))
-    (when vector
+    (when (and vector
+              (not (and erc-track-exclude-server-buffer
+                        (erc-server-buffer-p))))
       (mapc
        (lambda (match-type)
         (goto-char (point-min))