From: yamaoka <yamaoka>
Date: Fri, 10 Mar 2000 00:21:46 +0000 (+0000)
Subject: (gnus-compile): Modify the actual format specs as well;
X-Git-Tag: t-gnus-6_14_1-14~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=03b86622875f327f3f7df2213d0150ff9530a290;p=elisp%2Fgnus.git-

(gnus-compile): Modify the actual format specs as well;
don't bind `gnus-tmp-func'.
(gnus-update-format-specifications): Revert;
use`gnus-update-format-specification-1'.
(gnus-update-format-specification-1): New function.
(gnus-format-specs-compiled): Modify the form.
(TopLevel): Require `alist'.
---

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index c78fd17..14d52d5 100644
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -28,6 +28,7 @@
 
 (eval-when-compile (require 'cl))
 
+(require 'alist)
 (require 'gnus)
 
 ;;; Internal variables.
@@ -128,7 +129,8 @@
   "Alist of format specs.")
 
 (defvar gnus-format-specs-compiled nil
-  "Alist of compiled format specs.")
+  "Alist of compiled format specs.
+Each element should be the form (TYPE . BYTECODE).")
 
 (defvar gnus-article-mode-line-format-spec nil)
 (defvar gnus-summary-mode-line-format-spec nil)
@@ -167,7 +169,26 @@
     (lisp-interaction-mode)
     (insert (pp-to-string spec))))
 
-(defun gnus-update-format-specifications-1 (force types)
+(defun gnus-update-format-specification-1 (type val &optional new)
+  (if gnus-compile-user-specs
+      (let ((bytecode (if new
+			  nil
+			(cdr (assq type gnus-format-specs-compiled)))))
+	(unless bytecode
+	  (fset 'gnus-tmp-func `(lambda () ,val))
+	  (require 'bytecomp)
+	  (let (byte-compile-warnings)
+	    (byte-compile 'gnus-tmp-func))
+	  (setq bytecode (gnus-byte-code 'gnus-tmp-func))
+	  (when (get-buffer "*Compile-Log*")
+	    (bury-buffer "*Compile-Log*"))
+	  (when (get-buffer "*Compile-Log-Show*")
+	    (bury-buffer "*Compile-Log-Show*")))
+	(set (intern (format "gnus-%s-line-format-spec" type)) bytecode)
+	(set-alist 'gnus-format-specs-compiled type bytecode))
+    (set (intern (format "gnus-%s-line-format-spec" type)) val)))
+
+(defun gnus-update-format-specifications (&optional force &rest types)
   "Update all (necessary) format specifications."
   ;; Make the indentation array.
   ;; See whether all the stored info needs to be flushed.
@@ -197,8 +218,7 @@
 	(if (and (car entry)
 		 (equal (car entry) new-format))
 	    ;; Use the old format.
-	    (set (intern (format "gnus-%s-line-format-spec" type))
-		 (cadr entry))
+	    (gnus-update-format-specification-1 type (cadr entry))
 	  ;; This is a new format.
 	  (setq val
 		(if (not (stringp new-format))
@@ -216,18 +236,11 @@
 		(setcar (cdr entry) val)
 		(setcar entry new-format))
 	    (push (list type new-format val) gnus-format-specs))
-	  (set (intern (format "gnus-%s-line-format-spec" type)) val)))))
+	  (gnus-update-format-specification-1 type val 'new)))))
 
   (unless (assq 'version gnus-format-specs)
     (push (cons 'version emacs-version) gnus-format-specs)))
 
-(defun gnus-update-format-specifications (&optional force &rest types)
-  "Update all (necessary) format specifications."
-  (if gnus-format-specs-compiled
-      (let ((gnus-format-specs gnus-format-specs-compiled))
-	(gnus-update-format-specifications-1 force types))
-    (gnus-update-format-specifications-1 force types)))
-
 (defvar gnus-mouse-face-0 'highlight)
 (defvar gnus-mouse-face-1 'highlight)
 (defvar gnus-mouse-face-2 'highlight)
@@ -540,14 +553,14 @@ If PROPS, insert the result."
   (require 'bytecomp)
   (let ((entries gnus-format-specs)
 	(byte-compile-warnings '(unresolved callargs redefine))
-	entry gnus-tmp-func)
+	entry type bytecode)
     (save-excursion
       (gnus-message 7 "Compiling format specs...")
 
-      (setq gnus-format-specs-compiled nil)
       (while entries
-	(setq entry (pop entries))
-	(if (memq (car entry) '(version gnus-version))
+	(setq entry (pop entries)
+	      type (car entry))
+	(if (memq type '(version gnus-version))
 	    (setq gnus-format-specs (delq entry gnus-format-specs))
 	  (let ((form (caddr entry)))
 	    (when (and (listp form)
@@ -558,12 +571,11 @@ If PROPS, insert the result."
 				 (byte-code-function-p (cadr form)))))
 	      (fset 'gnus-tmp-func `(lambda () ,form))
 	      (byte-compile 'gnus-tmp-func)
-	      (push (nconc (butlast entry)
-			   (list (gnus-byte-code 'gnus-tmp-func)))
-		    gnus-format-specs-compiled)))))
+	      (setq bytecode (gnus-byte-code 'gnus-tmp-func))
+	      (set (intern (format "gnus-%s-line-format-spec" type)) bytecode)
+	      (set-alist 'gnus-format-specs-compiled type bytecode)))))
 
       (push (cons 'version emacs-version) gnus-format-specs)
-      (push (cons 'version emacs-version) gnus-format-specs-compiled)
       (gnus-message 7 "Compiling user specs...done"))))
 
 (defun gnus-set-format (type &optional insertable)