;;; ecomplete.el --- electric completion of addresses and the like
-;; Copyright (C) 2006 Free Software Foundation, Inc.
+
+;; Copyright (C) 2006, 2007, 2008, 2009 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
"Electric completion of email addresses and the like."
:group 'mail)
(defcustom ecomplete-database-file-coding-system 'iso-2022-7bit
"Coding system used for writing the ecomplete database file."
- :type '(repeat (symbol :tag "Coding system"))
+ :type '(symbol :tag "Coding system")
:group 'ecomplete)
;;; Internal variables.
(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))
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)))
(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
;; 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)))