mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-17 10:27:41 +00:00
Fix comments; remove Emacs 21 stuff.
mail-source.el (mail-source-report-new-mail) message.el (message-default-mail-headers) mm-decode.el (mm-valid-image-format-p): Comment fix. mml2015.el (mml2015-use): Don't bind recursive-load-depth-limit.
This commit is contained in:
parent
b6fda8fc58
commit
5b5dafd2cb
5 changed files with 13 additions and 9 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2010-09-28 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
* mail-source.el (mail-source-report-new-mail)
|
||||
* message.el (message-default-mail-headers)
|
||||
* mm-decode.el (mm-valid-image-format-p): Comment fix.
|
||||
|
||||
* mml2015.el (mml2015-use): Don't bind recursive-load-depth-limit.
|
||||
|
||||
2010-09-28 Julien Danjou <julien@danjou.info>
|
||||
|
||||
* gnus-gravatar.el (gnus-gravatar-insert): Fix search in case
|
||||
|
|
|
|||
|
|
@ -993,7 +993,7 @@ This only works when `display-time' is enabled."
|
|||
(if on
|
||||
(progn
|
||||
(require 'time)
|
||||
;; display-time-mail-function is an Emacs 21 feature.
|
||||
;; display-time-mail-function is an Emacs feature.
|
||||
(setq display-time-mail-function #'mail-source-new-mail-p)
|
||||
;; Set up the main timer.
|
||||
(setq mail-source-report-new-mail-timer
|
||||
|
|
|
|||
|
|
@ -1158,8 +1158,8 @@ these lines."
|
|||
(stringp mail-archive-file-name))
|
||||
(format "FCC: %s\n" mail-archive-file-name))
|
||||
;; Use the value of `mail-default-headers' if available.
|
||||
;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is
|
||||
;; unavailable unless sendmail.el is loaded.
|
||||
;; Note: as for XEmacs 21.4 and 21.5, it is unavailable
|
||||
;; unless sendmail.el is loaded.
|
||||
(if (boundp 'mail-default-headers)
|
||||
mail-default-headers))
|
||||
"*A string of header lines to be inserted in outgoing mails."
|
||||
|
|
|
|||
|
|
@ -1479,7 +1479,7 @@ be determined."
|
|||
;; Handle XEmacs
|
||||
((fboundp 'valid-image-instantiator-format-p)
|
||||
(valid-image-instantiator-format-p format))
|
||||
;; Handle Emacs 21
|
||||
;; Handle Emacs
|
||||
((fboundp 'image-type-available-p)
|
||||
(and (display-graphic-p)
|
||||
(image-type-available-p format)))
|
||||
|
|
|
|||
|
|
@ -56,11 +56,7 @@
|
|||
'epg)
|
||||
(error))
|
||||
(progn
|
||||
(ignore-errors
|
||||
;; Avoid the "Recursive load suspected" error
|
||||
;; in Emacs 21.1.
|
||||
(let ((recursive-load-depth-limit 100))
|
||||
(require 'pgg)))
|
||||
(ignore-errors (require 'pgg))
|
||||
(and (fboundp 'pgg-sign-region)
|
||||
'pgg))
|
||||
(progn (ignore-errors
|
||||
|
|
|
|||
Loading…
Reference in a new issue