X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fecomplete.el;h=6a47b119f1059f4f1e96e5588f9be8b011262ddf;hb=fa8cd3f3ef09fa4bf3771512a2c520c4ef519827;hp=1c5eb57b6e3fdf3b26567dc8b634f64f03c822a3;hpb=3c2f2a7ac63ebf24bb65fd89a76c49d5c2a55146;p=gnus

diff --git a/lisp/ecomplete.el b/lisp/ecomplete.el
index 1c5eb57b6..6a47b119f 100644
--- a/lisp/ecomplete.el
+++ b/lisp/ecomplete.el
@@ -1,25 +1,24 @@
 ;;; ecomplete.el --- electric completion of addresses and the like
-;; Copyright (C) 2006 Free Software Foundation, Inc.
+
+;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -29,7 +28,7 @@
   (require 'cl))
 
 (defgroup ecomplete nil
-  "Suppression of duplicate articles."
+  "Electric completion of email addresses and the like."
   :group 'mail)
 
 (defcustom ecomplete-database-file "~/.ecompleterc"
@@ -37,20 +36,30 @@
   :group 'ecomplete
   :type 'file)
 
+(defcustom ecomplete-database-file-coding-system 'iso-2022-7bit
+  "Coding system used for writing the ecomplete database file."
+  :type '(symbol :tag "Coding system")
+  :group 'ecomplete)
+
 ;;; Internal variables.
 
 (defvar ecomplete-database nil)
 
+;;;###autoload
 (defun ecomplete-setup ()
   (when (file-exists-p ecomplete-database-file)
     (with-temp-buffer
-      (insert-file-contents ecomplete-database-file)
-      (setq ecomplete-database (read (current-buffer))))))
+      (let ((coding-system-for-read ecomplete-database-file-coding-system))
+	(insert-file-contents ecomplete-database-file)
+	(setq ecomplete-database (read (current-buffer)))))))
 
 (defun ecomplete-add-item (type key text)
   (let ((elems (assq type ecomplete-database))
 	(now (string-to-number
-	      (format "%.0f" (time-to-seconds (current-time)))))
+	      (format "%.0f" (if (featurep 'emacs)
+				 (float-time)
+			       (require 'gnus-util)
+			       (gnus-float-time)))))
 	entry)
     (unless elems
       (push (setq elems (list type)) ecomplete-database))
@@ -63,22 +72,24 @@
 
 (defun ecomplete-save ()
   (with-temp-buffer
-    (insert "(")
-    (loop for (type . elems) in ecomplete-database
-	  do
-	  (insert (format "(%s\n" type))
-	  (dolist (entry elems)
-	    (prin1 entry (current-buffer))
-	    (insert "\n"))
-	  (insert ")\n"))
-    (insert ")")
-    (write-region (point-min) (point-max) ecomplete-database-file nil 'silent)))
+    (let ((coding-system-for-write ecomplete-database-file-coding-system))
+      (insert "(")
+      (loop for (type . elems) in ecomplete-database
+	    do
+	    (insert (format "(%s\n" type))
+	    (dolist (entry elems)
+	      (prin1 entry (current-buffer))
+	      (insert "\n"))
+	    (insert ")\n"))
+      (insert ")")
+      (write-region (point-min) (point-max)
+		    ecomplete-database-file nil 'silent))))
 
 (defun ecomplete-get-matches (type match)
   (let* ((elems (cdr (assq type ecomplete-database)))
 	 (match (regexp-quote match))
 	 (candidates
-	  (sort 
+	  (sort
 	   (loop for (key count time text) in elems
 		 when (string-match match text)
 		 collect (list count time text))
@@ -101,6 +112,7 @@
   (let* ((matches (ecomplete-get-matches type word))
 	 (line 0)
 	 (max-lines (when matches (- (length (split-string matches "\n")) 2)))
+	 (message-log-max nil)
 	 command highlight)
     (if (not matches)
 	(progn
@@ -108,7 +120,7 @@
 	  nil)
       (if (not choose)
 	  (progn
-	    (message matches)
+	    (message "%s" matches)
 	    nil)
 	(setq highlight (ecomplete-highlight-match-line matches line))
 	(while (not (memq (setq command (read-event highlight)) '(? return)))
@@ -127,16 +139,15 @@
     (goto-char (point-min))
     (forward-line line)
     (save-restriction
-      (narrow-to-region (point) (line-end-position))
+      (narrow-to-region (point) (point-at-eol))
       (while (not (eobp))
-	;; Put the 'region face on any charactes on this line that
+	;; Put the 'region face on any characters on this line that
 	;; aren't already highlighted.
 	(unless (get-text-property (point) 'face)
-	  (put-text-property (point) (1+ (point)) 'face 'region))
+	  (put-text-property (point) (1+ (point)) 'face 'highlight))
 	(forward-char 1)))
     (buffer-string)))
 
 (provide 'ecomplete)
 
-;; arch-tag: 34622935-bb81-4711-a600-57b89c2ece72
 ;;; ecomplete.el ends here