diff options
| author | Lars Ingebrigtsen | 2016-02-13 16:49:09 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-13 16:49:09 +1100 |
| commit | 6dc084079cb6c89fb533455e8569058cf01b350b (patch) | |
| tree | 025379b3f3401da4bb06f6db12da70207a8f85cc | |
| parent | c87f4a54742d86b34969b77756385d3c9abf8b2f (diff) | |
| download | emacs-6dc084079cb6c89fb533455e8569058cf01b350b.tar.gz emacs-6dc084079cb6c89fb533455e8569058cf01b350b.zip | |
Remove compat code from gnus-art.el
* lisp/gnus/gnus-art.el (gnus-article-prepare)
(gnus-mime-copy-part, gnus-output-to-file)
(gnus-article-reply-with-original)
(gnus-button-handle-apropos-variable)
(gnus-button-handle-apropos-documentation):
| -rw-r--r-- | lisp/gnus/gnus-art.el | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 0ac475d7941..e22d422c548 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el | |||
| @@ -4603,8 +4603,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." | |||
| 4603 | (gnus-article-setup-buffer) | 4603 | (gnus-article-setup-buffer) |
| 4604 | (set-buffer gnus-article-buffer) | 4604 | (set-buffer gnus-article-buffer) |
| 4605 | ;; Deactivate active regions. | 4605 | ;; Deactivate active regions. |
| 4606 | (when (and (boundp 'transient-mark-mode) | 4606 | (when transient-mark-mode |
| 4607 | transient-mark-mode) | ||
| 4608 | (setq mark-active nil)) | 4607 | (setq mark-active nil)) |
| 4609 | (if (not (setq result (let ((inhibit-read-only t)) | 4608 | (if (not (setq result (let ((inhibit-read-only t)) |
| 4610 | (gnus-request-article-this-buffer | 4609 | (gnus-request-article-this-buffer |
| @@ -5261,10 +5260,7 @@ are decompressed." | |||
| 5261 | (progn | 5260 | (progn |
| 5262 | (mm-enable-multibyte) | 5261 | (mm-enable-multibyte) |
| 5263 | (insert (decode-coding-string contents coding-system)) | 5262 | (insert (decode-coding-string contents coding-system)) |
| 5264 | (setq buffer-file-coding-system | 5263 | (setq buffer-file-coding-system last-coding-system-used)) |
| 5265 | (if (boundp 'last-coding-system-used) | ||
| 5266 | (symbol-value 'last-coding-system-used) | ||
| 5267 | coding-system))) | ||
| 5268 | (mm-disable-multibyte) | 5264 | (mm-disable-multibyte) |
| 5269 | (insert contents) | 5265 | (insert contents) |
| 5270 | (setq buffer-file-coding-system mm-binary-coding-system)) | 5266 | (setq buffer-file-coding-system mm-binary-coding-system)) |
| @@ -6457,14 +6453,13 @@ the coding cookie." | |||
| 6457 | (when coding | 6453 | (when coding |
| 6458 | ;; If the coding system is not suitable to encode the text, | 6454 | ;; If the coding system is not suitable to encode the text, |
| 6459 | ;; ask a user for a proper one. | 6455 | ;; ask a user for a proper one. |
| 6460 | (when (fboundp 'select-safe-coding-system) | 6456 | (setq coding (coding-system-base |
| 6461 | (setq coding (coding-system-base | 6457 | (save-window-excursion |
| 6462 | (save-window-excursion | 6458 | (select-safe-coding-system (point-min) (point-max) |
| 6463 | (select-safe-coding-system (point-min) (point-max) | 6459 | coding)))) |
| 6464 | coding)))) | 6460 | (setq coding-system-for-write |
| 6465 | (setq coding-system-for-write | 6461 | (or (cdr (assq coding '((mule-utf-8 . utf-8)))) |
| 6466 | (or (cdr (assq coding '((mule-utf-8 . utf-8)))) | 6462 | coding)) |
| 6467 | coding))) | ||
| 6468 | (goto-char (point-min)) | 6463 | (goto-char (point-min)) |
| 6469 | ;; Add the coding cookie. | 6464 | ;; Add the coding cookie. |
| 6470 | (insert (format "X-Gnus-Coding-System: -*- coding: %s; -*-\n\n" | 6465 | (insert (format "X-Gnus-Coding-System: -*- coding: %s; -*-\n\n" |
| @@ -6930,8 +6925,7 @@ the entire article will be yanked." | |||
| 6930 | (gnus-summary-reply (list (list article)) wide)) | 6925 | (gnus-summary-reply (list (list article)) wide)) |
| 6931 | (setq contents (buffer-substring (point) (mark t))) | 6926 | (setq contents (buffer-substring (point) (mark t))) |
| 6932 | ;; Deactivate active regions. | 6927 | ;; Deactivate active regions. |
| 6933 | (when (and (boundp 'transient-mark-mode) | 6928 | (when transient-mark-mode |
| 6934 | transient-mark-mode) | ||
| 6935 | (setq mark-active nil)) | 6929 | (setq mark-active nil)) |
| 6936 | (with-current-buffer gnus-summary-buffer | 6930 | (with-current-buffer gnus-summary-buffer |
| 6937 | (gnus-summary-reply | 6931 | (gnus-summary-reply |
| @@ -6956,8 +6950,7 @@ the entire article will be yanked." | |||
| 6956 | (gnus-summary-followup (list (list article)))) | 6950 | (gnus-summary-followup (list (list article)))) |
| 6957 | (setq contents (buffer-substring (point) (mark t))) | 6951 | (setq contents (buffer-substring (point) (mark t))) |
| 6958 | ;; Deactivate active regions. | 6952 | ;; Deactivate active regions. |
| 6959 | (when (and (boundp 'transient-mark-mode) | 6953 | (when transient-mark-mode |
| 6960 | transient-mark-mode) | ||
| 6961 | (setq mark-active nil)) | 6954 | (setq mark-active nil)) |
| 6962 | (with-current-buffer gnus-summary-buffer | 6955 | (with-current-buffer gnus-summary-buffer |
| 6963 | (gnus-summary-followup | 6956 | (gnus-summary-followup |
| @@ -7661,14 +7654,12 @@ Calls `describe-variable' or `describe-function'." | |||
| 7661 | 7654 | ||
| 7662 | (defun gnus-button-handle-apropos-variable (url) | 7655 | (defun gnus-button-handle-apropos-variable (url) |
| 7663 | "Call `apropos' when pushing the corresponding URL button." | 7656 | "Call `apropos' when pushing the corresponding URL button." |
| 7664 | (funcall | 7657 | (apropos-variable |
| 7665 | (if (fboundp 'apropos-variable) 'apropos-variable 'apropos) | ||
| 7666 | (replace-regexp-in-string gnus-button-handle-describe-prefix "" url))) | 7658 | (replace-regexp-in-string gnus-button-handle-describe-prefix "" url))) |
| 7667 | 7659 | ||
| 7668 | (defun gnus-button-handle-apropos-documentation (url) | 7660 | (defun gnus-button-handle-apropos-documentation (url) |
| 7669 | "Call `apropos' when pushing the corresponding URL button." | 7661 | "Call `apropos' when pushing the corresponding URL button." |
| 7670 | (funcall | 7662 | (apropos-documentation |
| 7671 | (if (fboundp 'apropos-documentation) 'apropos-documentation 'apropos) | ||
| 7672 | (replace-regexp-in-string gnus-button-handle-describe-prefix "" url))) | 7663 | (replace-regexp-in-string gnus-button-handle-describe-prefix "" url))) |
| 7673 | 7664 | ||
| 7674 | (defun gnus-button-handle-library (url) | 7665 | (defun gnus-button-handle-library (url) |