(ecomplete-database-file-coding-system): New

[gnus] / lisp / ecomplete.el

diff --git a/lisp/ecomplete.el b/lisp/ecomplete.el
index 1be9d66..1a851e9 100644 (file)
--- a/lisp/ecomplete.el
+++ b/lisp/ecomplete.el
@@ -29,7 +29,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,19 +37,22 @@
   :group 'ecomplete
   :type 'file)
 
+(defcustom ecomplete-database-file-coding-system 'iso-2022-7bit
+  "Coding system used for writing the ecomplete database file."
+  :type '(repeat (symbol :tag "Coding system"))
+  :group 'ecomplete)
+
 ;;; Internal variables.
 
 (defvar ecomplete-database nil)
-(defvar ecomplete-current-matches nil)
-(defvar ecomplete-match-length nil)
-(defvar ecomplete-current-line nil)
-(defvar ecomplete-current-match 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))
@@ -67,19 +70,20 @@
 
 (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)
-  (setq ecomplete-current-match match)
   (let* ((elems (cdr (assq type ecomplete-database)))
         (match (regexp-quote match))
         (candidates
@@ -102,20 +106,30 @@
                             'face 'isearch))
        (buffer-string)))))
 
-(defun ecomplete-display-matches (type word)
+(defun ecomplete-display-matches (type word &optional choose)
   (let* ((matches (ecomplete-get-matches type word))
         (line 0)
-        (max-lines (length (split-string matches "\n")))
-        command)
-    (while (not (memq (setq command (read-char)) '(?  ?\r)))
-      (cond
-       ((eq command ?n)
-       (setq line (min (1+ line) max-lines)))
-       ((eq command ?p)
-       (setq line (max (1- line) 0))))
-      (ecomplete-highlight-match-line matches line))
-    (when (eq command ?\r)
-      (nth line (split-string ecomplete-current-matches "\n")))))
+        (max-lines (when matches (- (length (split-string matches "\n")) 2)))
+        (message-log-max nil)
+        command highlight)
+    (if (not matches)
+       (progn
+         (message "No ecomplete matches")
+         nil)
+      (if (not choose)
+         (progn
+           (message matches)
+           nil)
+       (setq highlight (ecomplete-highlight-match-line matches line))
+       (while (not (memq (setq command (read-event highlight)) '(? return)))
+         (cond
+          ((eq command ?\M-n)
+           (setq line (min (1+ line) max-lines)))
+          ((eq command ?\M-p)
+           (setq line (max (1- line) 0))))
+         (setq highlight (ecomplete-highlight-match-line matches line)))
+       (when (eq command 'return)
+         (nth line (split-string matches "\n")))))))
 
 (defun ecomplete-highlight-match-line (matches line)
   (with-temp-buffer
@@ -130,8 +144,9 @@
        (unless (get-text-property (point) 'face)
          (put-text-property (point) (1+ (point)) 'face 'region))
        (forward-char 1)))
-    (message "%s" (buffer-string))))
+    (buffer-string)))
 
 (provide 'ecomplete)
 
+;; arch-tag: 34622935-bb81-4711-a600-57b89c2ece72
 ;;; ecomplete.el ends here