From: Jesper Harder <harder@ifa.au.dk>
Date: Wed, 7 Jan 2004 17:47:39 +0000 (+0000)
Subject: * message.el (message-cite-prefix-regexp): Use with-syntax-table.
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=10edaa5f14988a7802cada508ab0b60aba35faed;p=gnus

* message.el (message-cite-prefix-regexp): Use with-syntax-table.

* nnmail.el (nnmail-split-fancy): do.

* mml.el (mml-parse): do.

* gnus-score.el (gnus-enter-score-words-into-hashtb)
(gnus-score-adaptive): do.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56b99b2f3..f3cda1050 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-07  Jesper Harder  <harder@ifa.au.dk>
+
+	* message.el (message-cite-prefix-regexp): Use with-syntax-table.
+
+	* nnmail.el (nnmail-split-fancy): do.
+
+	* mml.el (mml-parse): do.
+
+	* gnus-score.el (gnus-enter-score-words-into-hashtb)
+	(gnus-score-adaptive): do.
+
 2004-01-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (gnus-treat-emphasize): Ignore Emacs version number.
diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 29d0df53e..07297ae96 100644
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -2188,23 +2188,19 @@ score in `gnus-newsgroup-scored' by SCORE."
 (defun gnus-enter-score-words-into-hashtb (hashtb)
   ;; Find all the words in the buffer and enter them into
   ;; the hashtable.
-  (let ((syntab (syntax-table))
-	word val)
+  (let (word val)
     (goto-char (point-min))
-    (unwind-protect
-	(progn
-	  (set-syntax-table gnus-adaptive-word-syntax-table)
-	  (while (re-search-forward "\\b\\w+\\b" nil t)
-	    (setq val
-		  (gnus-gethash
-		   (setq word (downcase (buffer-substring
-					 (match-beginning 0) (match-end 0))))
-		   hashtb))
-	    (gnus-sethash
-	     word
-	     (append (get-text-property (point-at-eol) 'articles) val)
-	     hashtb)))
-      (set-syntax-table syntab))
+    (with-syntax-table gnus-adaptive-word-syntax-table
+      (while (re-search-forward "\\b\\w+\\b" nil t)
+	(setq val
+	      (gnus-gethash
+	       (setq word (downcase (buffer-substring
+				     (match-beginning 0) (match-end 0))))
+	       hashtb))
+	(gnus-sethash
+	 word
+	 (append (get-text-property (point-at-eol) 'articles) val)
+	 hashtb)))
     ;; Make all the ignorable words ignored.
     (let ((ignored (append gnus-ignored-adaptive-words
 			   (if gnus-adaptive-word-no-group-words
@@ -2307,39 +2303,35 @@ score in `gnus-newsgroup-scored' by SCORE."
 	(let* ((hashtb (gnus-make-hashtable 1000))
 	       (date (date-to-day (current-time-string)))
 	       (data gnus-newsgroup-data)
-	       (syntab (syntax-table))
 	       word d score val)
-	  (unwind-protect
-	      (progn
-		(set-syntax-table gnus-adaptive-word-syntax-table)
-		;; Go through all articles.
-		(while (setq d (pop data))
-		  (when (and
-			 (not (gnus-data-pseudo-p d))
-			 (setq score
-			       (cdr (assq
-				     (gnus-data-mark d)
-				     gnus-adaptive-word-score-alist))))
-		    ;; This article has a mark that should lead to
-		    ;; adaptive word rules, so we insert the subject
-		    ;; and find all words in that string.
-		    (insert (mail-header-subject (gnus-data-header d)))
-		    (downcase-region (point-min) (point-max))
-		    (goto-char (point-min))
-		    (while (re-search-forward "\\b\\w+\\b" nil t)
-		      ;; Put the word and score into the hashtb.
-		      (setq val (gnus-gethash (setq word (match-string 0))
-					      hashtb))
-		      (when (or (not gnus-adaptive-word-length-limit)
-				(> (length word)
-				   gnus-adaptive-word-length-limit))
-			(setq val (+ score (or val 0)))
-			(if (and gnus-adaptive-word-minimum
-				 (< val gnus-adaptive-word-minimum))
-			    (setq val gnus-adaptive-word-minimum))
-			(gnus-sethash word val hashtb)))
-		    (erase-buffer))))
-	    (set-syntax-table syntab))
+	  (with-syntax-table gnus-adaptive-word-syntax-table
+	    ;; Go through all articles.
+	    (while (setq d (pop data))
+	      (when (and
+		     (not (gnus-data-pseudo-p d))
+		     (setq score
+			   (cdr (assq
+				 (gnus-data-mark d)
+				 gnus-adaptive-word-score-alist))))
+		;; This article has a mark that should lead to
+		;; adaptive word rules, so we insert the subject
+		;; and find all words in that string.
+		(insert (mail-header-subject (gnus-data-header d)))
+		(downcase-region (point-min) (point-max))
+		(goto-char (point-min))
+		(while (re-search-forward "\\b\\w+\\b" nil t)
+		  ;; Put the word and score into the hashtb.
+		  (setq val (gnus-gethash (setq word (match-string 0))
+					  hashtb))
+		  (when (or (not gnus-adaptive-word-length-limit)
+			    (> (length word)
+			       gnus-adaptive-word-length-limit))
+		    (setq val (+ score (or val 0)))
+		    (if (and gnus-adaptive-word-minimum
+			     (< val gnus-adaptive-word-minimum))
+			(setq val gnus-adaptive-word-minimum))
+		    (gnus-sethash word val hashtb)))
+		(erase-buffer))))
 	  ;; Make all the ignorable words ignored.
 	  (let ((ignored (append gnus-ignored-adaptive-words
 				 (if gnus-adaptive-word-no-group-words
diff --git a/lisp/message.el b/lisp/message.el
index 6ed9f0d48..85680fe88 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -540,15 +540,13 @@ Done before generating the new subject of a forward."
   (if (string-match "[[:digit:]]" "1") ;; support POSIX?
       "\\([ \t]*[-_.[:word:]]+>+\\|[ \t]*[]>|}+]\\)+"
     ;; ?-, ?_ or ?. MUST NOT be in syntax entry w.
-    (let ((old-table (syntax-table))
-	  non-word-constituents)
-      (set-syntax-table text-mode-syntax-table)
-      (setq non-word-constituents
-	    (concat
-	     (if (string-match "\\w" "-")  "" "-")
-	     (if (string-match "\\w" "_")  "" "_")
-	     (if (string-match "\\w" ".")  "" ".")))
-      (set-syntax-table old-table)
+    (let (non-word-constituents)
+      (with-syntax-table text-mode-syntax-table
+	(setq non-word-constituents
+	      (concat
+	       (if (string-match "\\w" "-")  "" "-")
+	       (if (string-match "\\w" "_")  "" "_")
+	       (if (string-match "\\w" ".")  "" "."))))
       (if (equal non-word-constituents "")
 	  "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|}+]\\)+"
 	(concat "\\([ \t]*\\(\\w\\|["
diff --git a/lisp/mml.el b/lisp/mml.el
index d736a25e6..3b8ed9f55 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -137,12 +137,8 @@ one charsets.")
   "Parse the current buffer as an MML document."
   (save-excursion
     (goto-char (point-min))
-    (let ((table (syntax-table)))
-      (unwind-protect
-	  (progn
-	    (set-syntax-table mml-syntax-table)
-	    (mml-parse-1))
-	(set-syntax-table table)))))
+    (with-syntax-table mml-syntax-table
+      (mml-parse-1))))
 
 (defun mml-parse-1 ()
   "Parse the current buffer as an MML document."
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 6a2764de7..cc42f6c86 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1307,12 +1307,8 @@ to actually put the message in the right group."
 (defun nnmail-split-fancy ()
   "Fancy splitting method.
 See the documentation for the variable `nnmail-split-fancy' for details."
-  (let ((syntab (syntax-table)))
-    (unwind-protect
-	(progn
-	  (set-syntax-table nnmail-split-fancy-syntax-table)
-	  (nnmail-split-it nnmail-split-fancy))
-      (set-syntax-table syntab))))
+  (with-syntax-table nnmail-split-fancy-syntax-table
+    (nnmail-split-it nnmail-split-fancy)))
 
 (defvar nnmail-split-cache nil)
 ;; Alist of split expressions their equivalent regexps.