[gnus git] branch master updated: n0-15-15-gf8fe0c5 =1= Use the local gnus-simplify-subject-fuzzy-regex instead of the global one.

       via  f8fe0c5eb8fe98b5cce79ee9f2cf6e2cc510026f (commit)
      from  7280feff116a662645fac9e08de3aef8403b780e (commit)


- Log -----------------------------------------------------------------
commit f8fe0c5eb8fe98b5cce79ee9f2cf6e2cc510026f
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Tue Mar 29 19:42:41 2011 +0200

    Use the local gnus-simplify-subject-fuzzy-regex instead of the global one.
    
    This makes using this variable in group parameters work.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59eb9d5..ccc0eb0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-29  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* gnus-sum.el (gnus-simplify-buffer-fuzzy): Take the regexp explicitly
+	instead of using the global gnus-simplify-subject-fuzzy-regexp.
+	(gnus-simplify-subject-fuzzy): Use the local
+	gnus-simplify-subject-fuzzy-regex instead of the global one.  This
+	makes using this variable in group parameters work.
+
 2011-03-29  Teodor Zlatanov  <[email protected]>
 
 	* gnus-registry.el (gnus-registry-unfollowed-groups): Add
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 9b22bbe..e1b8775 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1734,7 +1734,7 @@ If RE-ONLY is non-nil, strip leading `Re:'s only."
   (while (re-search-forward regexp nil t)
     (replace-match (or newtext ""))))
 
-(defun gnus-simplify-buffer-fuzzy ()
+(defun gnus-simplify-buffer-fuzzy (regexp)
   "Simplify string in the buffer fuzzily.
 The string in the accessible portion of the current buffer is simplified.
 It is assumed to be a single-line subject.
@@ -1748,11 +1748,10 @@ matter is removed.  Additional things can be deleted by setting
     (while (not (eq modified-tick (buffer-modified-tick)))
       (setq modified-tick (buffer-modified-tick))
       (cond
-       ((listp gnus-simplify-subject-fuzzy-regexp)
-	(mapc 'gnus-simplify-buffer-fuzzy-step
-	      gnus-simplify-subject-fuzzy-regexp))
-       (gnus-simplify-subject-fuzzy-regexp
-	(gnus-simplify-buffer-fuzzy-step gnus-simplify-subject-fuzzy-regexp)))
+       ((listp regexp)
+	(mapc 'gnus-simplify-buffer-fuzzy-step regexp))
+       (regexp
+	(gnus-simplify-buffer-fuzzy-step regexp)))
       (gnus-simplify-buffer-fuzzy-step "^ *\\[[-+?*!][-+?*!]\\] *")
       (gnus-simplify-buffer-fuzzy-step
        "^ *\\(re\\|fw\\|fwd\\)[[{(^0-9]*[])}]?[:;] *")
@@ -1767,6 +1766,7 @@ matter is removed.  Additional things can be deleted by setting
   "Simplify a subject string fuzzily.
 See `gnus-simplify-buffer-fuzzy' for details."
   (save-excursion
+    (let ((regexp gnus-simplify-subject-fuzzy-regexp))
     (gnus-set-work-buffer)
     (let ((case-fold-search t))
       ;; Remove uninteresting prefixes.
@@ -1774,8 +1774,8 @@ See `gnus-simplify-buffer-fuzzy' for details."
 		 (string-match gnus-simplify-ignored-prefixes subject))
 	(setq subject (substring subject (match-end 0))))
       (insert subject)
-      (inline (gnus-simplify-buffer-fuzzy))
-      (buffer-string))))
+	(inline (gnus-simplify-buffer-fuzzy regexp))
+	(buffer-string)))))
 
 (defsubst gnus-simplify-subject-fully (subject)
   "Simplify a subject string according to `gnus-summary-gather-subject-limit'."

-----------------------------------------------------------------------
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   |    8 ++++++++
 lisp/gnus-sum.el |   30 +++++++++++++++---------------
 2 files changed, 23 insertions(+), 15 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