[gnus git] branch master updated: =1= gnus-art: fix matching when regexp is a symbol

       via  558b1a1e11f15859b6bba3988545c7520edb21f2 (commit)
      from  33a8056f8348d957aa6f42c06600c1b155edd530 (commit)


- Log -----------------------------------------------------------------
commit 558b1a1e11f15859b6bba3988545c7520edb21f2
Author: Julien Danjou <[email protected]>
Date:   Wed Jan 19 16:30:41 2011 +0100

    gnus-art: fix matching when regexp is a symbol
    
    Signed-off-by: Julien Danjou <[email protected]>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e301b3..7bda2a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
 	* gnus-art.el (gnus-article-add-buttons): Simplify condition.
 	(gnus-button-push): Remove gnus-button-entry function, it fails heavily
 	if you have the same regexp several times.
+	(gnus-button-push): Fix matching when regexp is symbol.
 
 2011-01-15  Glenn Morris  <[email protected]>
 
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 2f9a15d..7c56acf 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -7898,13 +7898,16 @@ url is put as the `gnus-button-url' overlay property on the button."
 (defun gnus-button-push (marker-and-entry)
   ;; Push button starting at MARKER.
   (save-excursion
-    (let ((marker (car marker-and-entry))
+    (let* ((marker (car marker-and-entry))
           (entry (cadr marker-and-entry))
+           (regexp (car entry))
           (inhibit-point-motion-hooks t))
       (goto-char marker)
       ;; This is obviously true, or something bad is happening :)
       ;; But we need it to have the match-data
-      (when (looking-at (car entry))
+      (when (looking-at (or (if (symbolp regexp)
+                                (symbol-value regexp)
+                              regexp)))
         (let ((fun (nth 3 entry))
               (args (or (and (eq (car entry) 'gnus-button-url-regexp)
                              (get-char-property marker 'gnus-button-url))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    1 +
 lisp/gnus-art.el |   11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project