mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-26 00:01:47 -07:00
Code Issues Projects Releases Wiki Activity

* lisp/gnus/message.el: Use completion-at-point.

Browse source 
(message-completion-function): New fun, extracted from message-tab.
(message-mode): Use it for completion-at-point-functions.
(message-tab): Use it and completion-at-point.
This commit is contained in:
Stefan Monnier 2010-12-06 21:01:00 -05:00
parent 6568edea53
commit 674c5ccf39
2 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/gnus/ChangeLog
View file

@ -1,3 +1,10 @@
2010-12-07 Stefan Monnier <monnier@iro.umontreal.ca>
* message.el: Use completion-at-point.
(message-completion-function): New fun, extracted from message-tab.
(message-mode): Use it for completion-at-point-functions.
(message-tab): Use it and completion-at-point.
2010-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
* shr.el (shr-find-fill-point): Don't break a line after a kinsoku-bol

23
lisp/gnus/message.el
View file

@ -277,7 +277,7 @@ This is a list of regexps and regexp matches."
regexp))
(defcustom message-ignored-mail-headers
"^[GF]cc:\\|^Resent-Fcc:\\|^Xref:\\|^X-Draft-From:\\|^X-Gnus-Agent-Meta-Information:"
"^\\([GF]cc\\|Resent-Fcc\\|Xref\\|X-Draft-From\\|X-Gnus-Agent-Meta-Information\\):"
"*Regexp of headers to be removed unconditionally before mailing."
:group 'message-mail
:group 'message-headers
@ -2914,6 +2914,7 @@ M-RET `message-newline-and-reformat' (break the line and reformat)."
(mail-aliases-setup))))
((message-mail-alias-type-p 'ecomplete)
(ecomplete-setup)))
(add-hook 'completion-at-point-functions 'message-completion-function nil t)
(unless buffer-file-name
(message-set-auto-save-file-name))
(unless (buffer-base-buffer)
@ -7743,7 +7744,7 @@ When FORCE, rebuild the tool bar."
:type '(alist :key-type regexp :value-type function))
(defcustom message-expand-name-databases
(list 'bbdb 'eudc)
'(bbdb eudc)
"List of databases to try for name completion (`message-expand-name').
Each element is a symbol and can be `bbdb' or `eudc'."
:group 'message
@ -7765,15 +7766,25 @@ If nil, the function bound in `text-mode-map' or `global-map' is executed."
Execute function specified by `message-tab-body-function' when not in
those headers."
(interactive)
(cond
((if (and (boundp 'completion-fail-discreetly)
(fboundp 'completion-at-point))
(let ((completion-fail-discreetly t)) (completion-at-point))
(funcall (or (message-completion-function) #'ignore)))
;; Completion was performed; nothing else to do.
nil)
(message-tab-body-function (funcall message-tab-body-function))
(t (funcall (or (lookup-key text-mode-map "\t")
(lookup-key global-map "\t")
'indent-relative)))))
(defun message-completion-function ()
(let ((alist message-completion-alist))
(while (and alist
(let ((mail-abbrev-mode-regexp (caar alist)))
(not (mail-abbrev-in-expansion-header-p))))
(setq alist (cdr alist)))
(funcall (or (cdar alist) message-tab-body-function
(lookup-key text-mode-map "\t")
(lookup-key global-map "\t")
'indent-relative))))
(cdar alist)))
(eval-and-compile
(condition-case nil