;;; ecomplete.el --- electric completion of addresses and the like
-;; Copyright (C) 2006 Free Software Foundation, Inc.
+
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010 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:
(eval-when-compile
(require 'cl))
+(eval-when-compile
+ (unless (fboundp 'with-no-warnings)
+ (defmacro with-no-warnings (&rest body)
+ `(progn ,@body))))
+
(defgroup ecomplete nil
- "Suppression of duplicate articles."
+ "Electric completion of email addresses and the like."
:group 'mail)
(defcustom ecomplete-database-file "~/.ecompleterc"
: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)
-(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))
(now (string-to-number
- (format "%.0f" (time-to-seconds (current-time)))))
+ (format "%.0f" (if (and (fboundp 'float-time)
+ (subrp (symbol-function 'float-time)))
+ (float-time)
+ (with-no-warnings
+ (time-to-seconds (current-time)))))))
entry)
(unless elems
(push (setq elems (list type)) ecomplete-database))
(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
- (sort
+ (sort
(loop for (key count time text) in elems
when (string-match match text)
collect (list count time text))
(while (re-search-forward match nil t)
(put-text-property (match-beginning 0) (match-end 0)
'face 'isearch))
- (setq ecomplete-current-matches (buffer-string)
- ecomplete-current-line -1
- ecomplete-match-length (count-lines (point-min) (point-max)))))))
-
-(defun ecomplete-prev-match (type match)
- "Go up the list of matches."
- (interactive)
- (unless (equal match ecomplete-current-match)
- (ecomplete-get-matches type match))
- (when (and ecomplete-current-matches
- (> ecomplete-current-line 0))
- (decf ecomplete-current-line)
- (ecomplete-highlight-match-line)))
-
-(defun ecomplete-next-match (type match)
- "Go down the list of matches."
- (interactive)
- (unless (equal match ecomplete-current-match)
- (ecomplete-get-matches type match))
- (when (and ecomplete-current-matches
- (< ecomplete-current-line ecomplete-match-length))
- (incf ecomplete-current-line)
- (ecomplete-highlight-match-line)))
-
-(defun ecomplete-highlight-match-line ()
+ (buffer-string)))))
+
+(defun ecomplete-display-matches (type word &optional choose)
+ (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
+ (message "No ecomplete matches")
+ nil)
+ (if (not choose)
+ (progn
+ (message "%s" 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
- (insert ecomplete-current-matches)
+ (insert matches)
(goto-char (point-min))
- (forward-line ecomplete-current-line)
+ (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
;; 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)))
- (message "%s" (buffer-string))))
-
-(defun ecomplete-return-current-match ()
- (nth ecomplete-current-line (split-string ecomplete-current-matches "\n")))
+ (buffer-string)))
(provide 'ecomplete)
projects / gnus / blobdiff