emacs-jabber jabber-history.el,1.29,1.30

[Evgenii T. <evg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26921

Modified Files:
	jabber-history.el 
Log Message:
jabber-chat-display-more-backlog fixed


Index: jabber-history.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-history.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- jabber-history.el	30 Aug 2007 09:24:37 -0000	1.29
+++ jabber-history.el	8 Mar 2008 12:42:24 -0000	1.30
@@ -32,6 +32,7 @@
 ;; enough backlog entries.
 
 (require 'jabber-core)
+(require 'jabber-util)
 
 (defgroup jabber-history nil "Customization options for Emacs
 Jabber history files."
@@ -181,7 +182,19 @@
   (when (file-readable-p history-file)
     (with-temp-buffer
       (let ((coding-system-for-read 'utf-8))
-	(insert-file-contents history-file))
+	(if jabber-use-global-history
+            (insert-file-contents history-file)
+          (let* ((lines-collected nil)
+                (matched-files (directory-files jabber-history-dir t (file-name-nondirectory history-file)))
+                (matched-files (cons (car matched-files) (sort (cdr matched-files) 'string>-numerical))))
+            (while (not lines-collected)
+              (if (null matched-files)
+                  (setq lines-collected t)
+                (let ((file (pop matched-files)))
+                  (progn
+                    (insert-file-contents file)
+                    (if (>= (count-lines (point-min) (point-max)) number)
+                        (setq lines-collected t)))))))))
       (let (collected current-line)
 	(goto-char (point-max))
 	(catch 'beginning-of-file