From: yamaoka <yamaoka>
Date: Wed, 28 May 2003 22:09:12 +0000 (+0000)
Subject: Synch to Gnus 200305282207.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4972013d8bec305c465307cde67a7bdba37549b;p=elisp%2Fgnus.git-

Synch to Gnus 200305282207.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2055cac..216ccec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2003-05-28  Jesper Harder  <harder@ifa.au.dk>
+
+	* lpath.el: Add put-char-table and get-char-table.
+
+2003-05-28  Teodor Zlatanov  <tzz@bwh.harvard.edu>
+
+	* gnus-registry.el (gnus-registry-dirty): flag for modified registry
+	(gnus-registry-save, gnus-registry-read) 
+	(gnus-registry-store-extra, gnus-registry-clear): use it (note
+	that gnus-registry-store-extra is invoked for all modifications to
+	set the mtime, so gnus-registry-dirty only needs to be set there)
+
 2003-05-23  Simon Josefsson  <jas@extundo.com>
 
 	* mml1991.el (mml1991-pgg-sign): Use mml-sender instead of
diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index e97b1e4..b43e488 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -33,6 +33,9 @@
 (require 'gnus-sum)
 (require 'nnmail)
 
+(defvar gnus-registry-dirty t
+ "Boolean set to t when the registry is modified")
+
 (defgroup gnus-registry nil
   "The Gnus registry."
   :group 'gnus)
@@ -77,7 +80,6 @@ The group names are matched, they don't have to be fully qualified."
   (interactive)
   (let ((file gnus-registry-cache-file))
     (save-excursion
-      ;; Save .newsrc.eld.
       (set-buffer (gnus-get-buffer-create " *Gnus-registry-cache*"))
       (make-local-variable 'version-control)
     (setq version-control gnus-backup-startup-file)
@@ -148,12 +150,16 @@ The group names are matched, they don't have to be fully qualified."
       (replace-match "" t t))))
 
 (defun gnus-registry-save ()
-  (setq gnus-registry-alist (hashtable-to-alist gnus-registry-hashtb))
-  (gnus-registry-cache-save))
+;; TODO: delete entries with 0 groups
+  (when gnus-registry-dirty
+    (setq gnus-registry-alist (hashtable-to-alist gnus-registry-hashtb))
+    (gnus-registry-cache-save)
+    (setq gnus-registry-dirty nil)))
 
 (defun gnus-registry-read ()
   (gnus-registry-cache-read)
-  (setq gnus-registry-hashtb (alist-to-hashtable gnus-registry-alist)))
+  (setq gnus-registry-hashtb (alist-to-hashtable gnus-registry-alist))
+  (setq gnus-registry-dirty nil))
 
 (defun alist-to-hashtable (alist)
   "Build a hashtable from the values in ALIST."
@@ -294,7 +300,8 @@ The message must have at least one group name."
     (let ((trail (gethash id gnus-registry-hashtb))
 	  (old-extra (gnus-registry-fetch-extra id)))
       (puthash id (cons extra (delete old-extra trail))
-	       gnus-registry-hashtb))))
+	       gnus-registry-hashtb)
+      (setq gnus-registry-dirty t))))
 
 (defun gnus-registry-store-extra-entry (id key value)
   "Put a specific entry in the extras field of the registry entry for id."
@@ -355,7 +362,8 @@ Returns the first place where the trail finds a group name."
   "Clear the Gnus registry."
   (interactive)
   (setq gnus-registry-alist nil)
-  (setq gnus-registry-hashtb (alist-to-hashtable gnus-registry-alist)))
+  (setq gnus-registry-hashtb (alist-to-hashtable gnus-registry-alist))
+  (setq gnus-registry-dirty t))
 
 (defun gnus-registry-install-hooks ()
   "Install the registry hooks."
diff --git a/lisp/lpath.el b/lisp/lpath.el
index 5a7970c..de90854 100644
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -20,7 +20,8 @@
 	       spam-enter-ham-BBDB string-to-multibyte tool-bar-add-item
 	       tool-bar-add-item-from-menu tool-bar-local-item-from-menu
 	       url-http-file-exists-p vcard-pretty-print w32-focus-frame
-	       w3m-charset-to-coding-system x-focus-frame))
+	       w3m-charset-to-coding-system x-focus-frame put-char-table
+	       get-char-table))
 (maybe-bind '(filladapt-mode
 	      mc-pgp-always-sign mm-w3m-mode-map rmail-enable-mime-composing
 	      rmail-insert-mime-forwarded-message-function
diff --git a/lisp/message.el b/lisp/message.el
index 91dbcd1..9430c6c 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5213,7 +5213,8 @@ give as trustworthy answer as possible."
       user-domain)
      ;; Default to this bogus thing.
      (t
-      (concat system-name ".i-did-not-set--mail-host-address--so-tickle-me")))))
+      (concat system-name
+	      ".i-did-not-set--mail-host-address--so-tickle-me")))))
 
 (defun message-make-host-name ()
   "Return the name of the host."