Remove Emacs 21 stuff.
mm-util.el (mm-codepage-iso-8859-list, mm-charset-eval-alist, mm-mime-charset): Comment fix. rfc2047.el (rfc2047-syntax-table): Comment fix. utf7.el (utf7-utf-16-coding-system): Comment fix. nnrss.el (nnrss-read-server-data, nnrss-read-group-data): Use `load' rather than `insert-file-contents' and `eval-region'. pgg.el (pgg-run-at-time-1): Define it for XEmacs only; fix if/else construction. time-date.el: No need to require cl for Emacs 21.
This commit is contained in:
Katsumi Yamaoka
parent
a6f3211f10
commit
0c43b6f8d5
8 changed files with 57 additions and 57 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2010-09-29 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
* pgg.el (pgg-run-at-time-1): Define it for XEmacs only; fix if/else
|
||||
construction.
|
||||
|
||||
* calendar/time-date.el: No need to require cl for Emacs 21.
|
||||
|
||||
2010-09-28 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* calendar/appt.el (appt-check): Minor simplification.
|
||||
|
|
|
|||
|
|
@ -39,9 +39,6 @@
|
|||
|
||||
;;; Code:
|
||||
|
||||
;; Only necessary for `declare' when compiling Gnus with Emacs 21.
|
||||
(eval-when-compile (require 'cl))
|
||||
|
||||
(defmacro with-decoded-time-value (varlist &rest body)
|
||||
"Decode a time value and bind it according to VARLIST, then eval BODY.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
2010-09-29 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
* mm-util.el (mm-codepage-iso-8859-list, mm-charset-eval-alist)
|
||||
(mm-mime-charset)
|
||||
* rfc2047.el (rfc2047-syntax-table)
|
||||
* utf7.el (utf7-utf-16-coding-system): Comment fix.
|
||||
|
||||
* nnrss.el (nnrss-read-server-data, nnrss-read-group-data): Use `load'
|
||||
rather than `insert-file-contents' and `eval-region'.
|
||||
|
||||
2010-09-28 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
* mail-source.el (mail-source-report-new-mail)
|
||||
|
|
|
|||
|
|
@ -383,8 +383,7 @@ See `mm-codepage-iso-8859-list' and `mm-codepage-ibm-list'.")
|
|||
(defcustom mm-codepage-iso-8859-list
|
||||
(list 1250 ;; Windows-1250 is a variant of Latin-2 heavily used by Microsoft
|
||||
;; Outlook users in Czech republic. Use this to allow reading of
|
||||
;; their e-mails. cp1250 should be defined by M-x codepage-setup
|
||||
;; (Emacs 21).
|
||||
;; their e-mails.
|
||||
'(1252 . 1) ;; Windows-1252 is a superset of iso-8859-1 (West
|
||||
;; Europe). See also `gnus-article-dumbquotes-map'.
|
||||
'(1254 . 9) ;; Windows-1254 is a superset of iso-8859-9 (Turkish).
|
||||
|
|
@ -494,8 +493,8 @@ Unless LIST is given, `mm-codepage-ibm-list' is used."
|
|||
(defcustom mm-charset-eval-alist
|
||||
(if (featurep 'xemacs)
|
||||
nil ;; I don't know what would be useful for XEmacs.
|
||||
'(;; Emacs 21 offers 1250 1251 1253 1257. Emacs 22 provides autoloads for
|
||||
;; 1250-1258 (i.e. `mm-codepage-setup' does nothing).
|
||||
'(;; Emacs 22 provides autoloads for 1250-1258
|
||||
;; (i.e. `mm-codepage-setup' does nothing).
|
||||
(windows-1250 . (mm-codepage-setup 1250 t))
|
||||
(windows-1251 . (mm-codepage-setup 1251 t))
|
||||
(windows-1253 . (mm-codepage-setup 1253 t))
|
||||
|
|
@ -966,7 +965,6 @@ If the charset is `composition', return the actual one."
|
|||
(if (eq charset 'unknown)
|
||||
(error "The message contains non-printable characters, please use attachment"))
|
||||
(if (and (fboundp 'coding-system-get) (fboundp 'get-charset-property))
|
||||
;; This exists in Emacs 20.
|
||||
(or
|
||||
(and (mm-preferred-coding-system charset)
|
||||
(or (coding-system-get
|
||||
|
|
|
|||
|
|
@ -561,12 +561,7 @@ which RSS 2.0 allows."
|
|||
(let ((file (nnrss-make-filename "nnrss" server))
|
||||
(file-name-coding-system nnmail-pathname-coding-system))
|
||||
(when (file-exists-p file)
|
||||
;; In Emacs 21.3 and earlier, `load' doesn't support non-ASCII
|
||||
;; file names. So, we use `insert-file-contents' instead.
|
||||
(mm-with-multibyte-buffer
|
||||
(let ((coding-system-for-read nnrss-file-coding-system))
|
||||
(insert-file-contents file)
|
||||
(eval-region (point-min) (point-max)))))))
|
||||
(load file nil t t))))
|
||||
|
||||
(defun nnrss-save-server-data (server)
|
||||
(gnus-make-directory nnrss-directory)
|
||||
|
|
@ -590,12 +585,7 @@ which RSS 2.0 allows."
|
|||
(let ((file (nnrss-make-filename group server))
|
||||
(file-name-coding-system nnmail-pathname-coding-system))
|
||||
(when (file-exists-p file)
|
||||
;; In Emacs 21.3 and earlier, `load' doesn't support non-ASCII
|
||||
;; file names. So, we use `insert-file-contents' instead.
|
||||
(mm-with-multibyte-buffer
|
||||
(let ((coding-system-for-read nnrss-file-coding-system))
|
||||
(insert-file-contents file)
|
||||
(eval-region (point-min) (point-max))))
|
||||
(load file nil t t)
|
||||
(dolist (e nnrss-group-data)
|
||||
(puthash (nth 9 e) t nnrss-group-hashtb)
|
||||
(when (and (car e) (> nnrss-group-min (car e)))
|
||||
|
|
|
|||
|
|
@ -342,8 +342,8 @@ The buffer may be narrowed."
|
|||
(defconst rfc2047-syntax-table
|
||||
;; (make-char-table 'syntax-table '(2)) only works in Emacs.
|
||||
(let ((table (make-syntax-table)))
|
||||
;; The following is done to work for setting all elements of the table
|
||||
;; in Emacs 21-23 and XEmacs; it appears to be the cleanest way.
|
||||
;; The following is done to work for setting all elements of the table;
|
||||
;; it appears to be the cleanest way.
|
||||
;; Play safe and don't assume the form of the word syntax entry --
|
||||
;; copy it from ?a.
|
||||
(if (fboundp 'set-char-table-range) ; Emacs
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
(defconst utf7-utf-16-coding-system
|
||||
(cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS
|
||||
'utf-16-be-no-signature)
|
||||
((and (mm-coding-system-p 'utf-16-be) ; Emacs 21.3, Emacs 22
|
||||
((and (mm-coding-system-p 'utf-16-be) ; Emacs
|
||||
;; Avoid versions with BOM.
|
||||
(= 2 (length (encode-coding-string "a" 'utf-16-be))))
|
||||
'utf-16-be)
|
||||
|
|
|
|||
66
lisp/pgg.el
66
lisp/pgg.el
|
|
@ -43,10 +43,8 @@
|
|||
;;;
|
||||
|
||||
(eval-when-compile
|
||||
;; Define it as a null macro for Emacs in order to suppress a byte
|
||||
;; compile warning that Emacs 21 issues.
|
||||
(defmacro pgg-run-at-time-1 (time repeat function args)
|
||||
(when (featurep 'xemacs)
|
||||
(when (featurep 'xemacs)
|
||||
(defmacro pgg-run-at-time-1 (time repeat function args)
|
||||
(if (condition-case nil
|
||||
(let ((delete-itimer 'delete-itimer)
|
||||
(itimer-driver-start 'itimer-driver-start)
|
||||
|
|
@ -75,36 +73,36 @@
|
|||
`(let ((time ,time))
|
||||
(apply #'start-itimer "pgg-run-at-time"
|
||||
,function (if time (max time 1e-9) 1e-9)
|
||||
,repeat nil t ,args)))
|
||||
`(let ((time ,time)
|
||||
(itimers (list nil)))
|
||||
(setcar
|
||||
itimers
|
||||
(apply #'start-itimer "pgg-run-at-time"
|
||||
(lambda (itimers repeat function &rest args)
|
||||
(let ((itimer (car itimers)))
|
||||
(if repeat
|
||||
(progn
|
||||
(set-itimer-function
|
||||
itimer
|
||||
(lambda (itimer repeat function &rest args)
|
||||
(set-itimer-restart itimer repeat)
|
||||
(set-itimer-function itimer function)
|
||||
(set-itimer-function-arguments itimer args)
|
||||
(apply function args)))
|
||||
(set-itimer-function-arguments
|
||||
itimer
|
||||
(append (list itimer repeat function) args)))
|
||||
(set-itimer-function
|
||||
itimer
|
||||
(lambda (itimer function &rest args)
|
||||
(delete-itimer itimer)
|
||||
(apply function args)))
|
||||
(set-itimer-function-arguments
|
||||
itimer
|
||||
(append (list itimer function) args)))))
|
||||
1e-9 (if time (max time 1e-9) 1e-9)
|
||||
nil t itimers ,repeat ,function ,args))))))
|
||||
,repeat nil t ,args))
|
||||
`(let ((time ,time)
|
||||
(itimers (list nil)))
|
||||
(setcar
|
||||
itimers
|
||||
(apply #'start-itimer "pgg-run-at-time"
|
||||
(lambda (itimers repeat function &rest args)
|
||||
(let ((itimer (car itimers)))
|
||||
(if repeat
|
||||
(progn
|
||||
(set-itimer-function
|
||||
itimer
|
||||
(lambda (itimer repeat function &rest args)
|
||||
(set-itimer-restart itimer repeat)
|
||||
(set-itimer-function itimer function)
|
||||
(set-itimer-function-arguments itimer args)
|
||||
(apply function args)))
|
||||
(set-itimer-function-arguments
|
||||
itimer
|
||||
(append (list itimer repeat function) args)))
|
||||
(set-itimer-function
|
||||
itimer
|
||||
(lambda (itimer function &rest args)
|
||||
(delete-itimer itimer)
|
||||
(apply function args)))
|
||||
(set-itimer-function-arguments
|
||||
itimer
|
||||
(append (list itimer function) args)))))
|
||||
1e-9 (if time (max time 1e-9) 1e-9)
|
||||
nil t itimers ,repeat ,function ,args)))))))
|
||||
|
||||
(eval-and-compile
|
||||
(if (featurep 'xemacs)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue