HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnus-topic.el (gnus-topic-read-group): If after the last group, select the last group.
[bpt/emacs.git]
/
lisp
/
gnus
/
ecomplete.el
diff --git
a/lisp/gnus/ecomplete.el
b/lisp/gnus/ecomplete.el
index
285aca4
..
1e9769f
100644
(file)
--- a/
lisp/gnus/ecomplete.el
+++ b/
lisp/gnus/ecomplete.el
@@
-1,26
+1,24
@@
;;; ecomplete.el --- electric completion of addresses and the like
;;; ecomplete.el --- electric completion of addresses and the like
-;; Copyright (C) 2006, 2007 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.
;; 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
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, 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
;; 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
;; 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:
;;; Commentary:
@@
-29,6
+27,11
@@
(eval-when-compile
(require 'cl))
(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)
(defgroup ecomplete nil
"Electric completion of email addresses and the like."
:group 'mail)
@@
-58,7
+61,11
@@
(defun ecomplete-add-item (type key text)
(let ((elems (assq type ecomplete-database))
(now (string-to-number
(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))
entry)
(unless elems
(push (setq elems (list type)) ecomplete-database))
@@
-88,7
+95,7
@@
(let* ((elems (cdr (assq type ecomplete-database)))
(match (regexp-quote match))
(candidates
(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))
(loop for (key count time text) in elems
when (string-match match text)
collect (list count time text))
@@
-149,5
+156,4
@@
(provide 'ecomplete)
(provide 'ecomplete)
-;; arch-tag: 34622935-bb81-4711-a600-57b89c2ece72
;;; ecomplete.el ends here
;;; ecomplete.el ends here