| 1 |
luigiwalser |
1186819 |
From 9ad0fcc54442a9a01d41be19880250783426db70 Mon Sep 17 00:00:00 2001 |
| 2 |
|
|
From: Lars Ingebrigtsen <larsi@gnus.org> |
| 3 |
|
|
Date: Fri, 8 Sep 2017 20:23:31 -0700 |
| 4 |
|
|
Subject: Remove unsafe enriched mode translations |
| 5 |
|
|
|
| 6 |
|
|
* lisp/gnus/mm-view.el (mm-inline-text): |
| 7 |
|
|
Do not worry about enriched or richtext type. |
| 8 |
|
|
* lisp/textmodes/enriched.el (enriched-translations): |
| 9 |
|
|
Remove translations for FUNCTION, display (Bug#28350). |
| 10 |
|
|
(enriched-handle-display-prop, enriched-decode-display-prop): Remove. |
| 11 |
|
|
--- |
| 12 |
|
|
lisp/gnus/mm-view.el | 4 ---- |
| 13 |
|
|
lisp/textmodes/enriched.el | 32 -------------------------------- |
| 14 |
|
|
2 files changed, 36 deletions(-) |
| 15 |
|
|
|
| 16 |
|
|
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el |
| 17 |
|
|
index e5859d0..77ad271 100644 |
| 18 |
|
|
--- a/lisp/gnus/mm-view.el |
| 19 |
|
|
+++ b/lisp/gnus/mm-view.el |
| 20 |
|
|
@@ -383,10 +383,6 @@ |
| 21 |
|
|
(goto-char (point-max)))) |
| 22 |
|
|
(save-restriction |
| 23 |
|
|
(narrow-to-region b (point)) |
| 24 |
|
|
- (when (member type '("enriched" "richtext")) |
| 25 |
|
|
- (set-text-properties (point-min) (point-max) nil) |
| 26 |
|
|
- (ignore-errors |
| 27 |
|
|
- (enriched-decode (point-min) (point-max)))) |
| 28 |
|
|
(mm-handle-set-undisplayer |
| 29 |
|
|
handle |
| 30 |
|
|
`(lambda () |
| 31 |
|
|
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el |
| 32 |
|
|
index beb6c6d..a8f0d38 100644 |
| 33 |
|
|
--- a/lisp/textmodes/enriched.el |
| 34 |
|
|
+++ b/lisp/textmodes/enriched.el |
| 35 |
|
|
@@ -117,12 +117,7 @@ expression, which is evaluated to get the string to insert.") |
| 36 |
|
|
(full "flushboth") |
| 37 |
|
|
(center "center")) |
| 38 |
|
|
(PARAMETER (t "param")) ; Argument of preceding annotation |
| 39 |
|
|
- ;; The following are not part of the standard: |
| 40 |
|
|
- (FUNCTION (enriched-decode-foreground "x-color") |
| 41 |
|
|
- (enriched-decode-background "x-bg-color") |
| 42 |
|
|
- (enriched-decode-display-prop "x-display")) |
| 43 |
|
|
(read-only (t "x-read-only")) |
| 44 |
|
|
- (display (nil enriched-handle-display-prop)) |
| 45 |
|
|
(unknown (nil format-annotate-value)) |
| 46 |
|
|
; (font-size (2 "bigger") ; unimplemented |
| 47 |
|
|
; (-2 "smaller")) |
| 48 |
|
|
@@ -477,32 +472,5 @@ Return value is \(begin end name positive-p), or nil if none was found." |
| 49 |
|
|
(message "Warning: no color specified for <x-bg-color>") |
| 50 |
|
|
nil)) |
| 51 |
|
|
|
| 52 |
|
|
-;;; Handling the `display' property. |
| 53 |
|
|
- |
| 54 |
|
|
- |
| 55 |
|
|
-(defun enriched-handle-display-prop (old new) |
| 56 |
|
|
- "Return a list of annotations for a change in the `display' property. |
| 57 |
|
|
-OLD is the old value of the property, NEW is the new value. Value |
| 58 |
|
|
-is a list `(CLOSE OPEN)', where CLOSE is a list of annotations to |
| 59 |
|
|
-close and OPEN a list of annotations to open. Each of these lists |
| 60 |
|
|
-has the form `(ANNOTATION PARAM ...)'." |
| 61 |
|
|
- (let ((annotation "x-display") |
| 62 |
|
|
- (param (prin1-to-string (or old new)))) |
| 63 |
|
|
- (if (null old) |
| 64 |
|
|
- (cons nil (list (list annotation param))) |
| 65 |
|
|
- (cons (list (list annotation param)) nil)))) |
| 66 |
|
|
- |
| 67 |
|
|
-(defun enriched-decode-display-prop (start end &optional param) |
| 68 |
|
|
- "Decode a `display' property for text between START and END. |
| 69 |
|
|
-PARAM is a `<param>' found for the property. |
| 70 |
|
|
-Value is a list `(START END SYMBOL VALUE)' with START and END denoting |
| 71 |
|
|
-the range of text to assign text property SYMBOL with value VALUE." |
| 72 |
|
|
- (let ((prop (when (stringp param) |
| 73 |
|
|
- (condition-case () |
| 74 |
|
|
- (car (read-from-string param)) |
| 75 |
|
|
- (error nil))))) |
| 76 |
|
|
- (unless prop |
| 77 |
|
|
- (message "Warning: invalid <x-display> parameter %s" param)) |
| 78 |
|
|
- (list start end 'display prop))) |
| 79 |
|
|
|
| 80 |
|
|
;;; enriched.el ends here |
| 81 |
|
|
-- |
| 82 |
|
|
cgit v1.0-41-gc330 |
| 83 |
|
|
|
Parent Directory
| 
Revision Log