X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fecomplete.el;h=eab8e6cdfb47794944767e7d385008d2d428d485;hp=1c5eb57b6e3fdf3b26567dc8b634f64f03c822a3;hb=55c26cf1a9939dc7b28fcbab35f1d05d56d53242;hpb=3c2f2a7ac63ebf24bb65fd89a76c49d5c2a55146 diff --git a/lisp/ecomplete.el b/lisp/ecomplete.el index 1c5eb57b6..eab8e6cdf 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-2012 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; 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 . ;;; Commentary: @@ -28,8 +27,13 @@ (eval-when-compile (require 'cl)) +(eval-when-compile + (when (featurep 'xemacs) + ;; The `kbd' macro requires that the `read-kbd-macro' macro is available. + (require 'edmacro))) + (defgroup ecomplete nil - "Suppression of duplicate articles." + "Electric completion of email addresses and the like." :group 'mail) (defcustom ecomplete-database-file "~/.ecompleterc" @@ -37,20 +41,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 +77,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 +117,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,18 +125,27 @@ 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))) - (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"))))))) + (let ((local-map (make-sparse-keymap)) + selected) + (define-key local-map (kbd "RET") + (lambda () (setq selected (nth line (split-string matches "\n"))))) + (define-key local-map (kbd "M-n") + (lambda () (setq line (min (1+ line) max-lines)))) + (define-key local-map (kbd "M-p") + (lambda () (setq line (max (1- line) 0)))) + (let ((overriding-local-map local-map)) + (while (and (null selected) + (setq command (read-key-sequence highlight)) + (lookup-key local-map command)) + (apply (key-binding command) nil) + (setq highlight (ecomplete-highlight-match-line matches line)))) + (if selected + (message selected) + (message "Abort")) + selected))))) (defun ecomplete-highlight-match-line (matches line) (with-temp-buffer @@ -127,16 +153,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