diff options
| author | Gnus developers <ding@gnus.org> | 2010-09-26 14:35:50 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-26 14:35:50 +0000 |
| commit | 2696d88f195c0888432f03fb455fdcf273c295c2 (patch) | |
| tree | 34fc731d72e77f3ab9247315c3ee6a1af7b54d24 /lisp/gnus/message.el | |
| parent | 1821a7b49194ddf558746de5cf67bdc9217e9ebd (diff) | |
| download | emacs-2696d88f195c0888432f03fb455fdcf273c295c2.tar.gz | |
Merge changes made in Gnus trunk.
gnus-picon.el (gnus-picon-create-glyph): Set the background XPM colour explicitly.
message.el (message-cite-prefix-regexp): Remove } from the cite prefix.
gnus-win.el (gnus-window-to-buffer-helper, gnus-all-windows-visible-p): Function needn't be a symbol.
mail-source.el (mail-source-value): Function needn't be a symbol.
tls.el (open-tls-stream): Don't query killing process.
gnus-win.el: Revert previous patch, since it made Gnus backtrace.
nnimap.el: Look up IMAP credentials based on both the virtual and physical server names.
mail-source.el (mail-source-value): Revert previous patch.
Diffstat (limited to 'lisp/gnus/message.el')
| -rw-r--r-- | lisp/gnus/message.el | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 243e0ddadff..2f4e6b8ef4c 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -626,29 +626,23 @@ Done before generating the new subject of a forward." :type 'regexp) (defcustom message-cite-prefix-regexp - ;; Default to the value of `mail-citation-prefix-regexp' if available. - ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is unavailable - ;; unless sendmail.el is loaded. - (cond ((boundp 'mail-citation-prefix-regexp) - mail-citation-prefix-regexp) - ((string-match "[[:digit:]]" "1") - ;; Support POSIX? XEmacs 21.5.27 doesn't. - "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|}]\\)+") - (t - ;; ?-, ?_ or ?. MUST NOT be in syntax entry w. - (let (non-word-constituents) - (with-syntax-table text-mode-syntax-table - (setq non-word-constituents - (concat - (if (string-match "\\w" "_") "" "_") - (if (string-match "\\w" ".") "" ".")))) - (if (equal non-word-constituents "") - "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|}]\\)+" - (concat "\\([ \t]*\\(\\w\\|[" - non-word-constituents - "]\\)+>+\\|[ \t]*[]>|}]\\)+"))))) + (if (string-match "[[:digit:]]" "1") + ;; Support POSIX? XEmacs 21.5.27 doesn't. + "\\([ \t]*[_.[:word:]]+>+\\|[ \t]*[]>|]\\)+" + ;; ?-, ?_ or ?. MUST NOT be in syntax entry w. + (let (non-word-constituents) + (with-syntax-table text-mode-syntax-table + (setq non-word-constituents + (concat + (if (string-match "\\w" "_") "" "_") + (if (string-match "\\w" ".") "" ".")))) + (if (equal non-word-constituents "") + "\\([ \t]*\\(\\w\\)+>+\\|[ \t]*[]>|]\\)+" + (concat "\\([ \t]*\\(\\w\\|[" + non-word-constituents + "]\\)+>+\\|[ \t]*[]>|]\\)+")))) "*Regexp matching the longest possible citation prefix on a line." - :version "23.2" + :version "24.1" :group 'message-insertion :link '(custom-manual "(message)Insertion Variables") :type 'regexp |