diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
| commit | 2fcb85c3e780f1f2871ce0f300cfaffce9836eb0 (patch) | |
| tree | a8857ccad8bff12080062a3edaad1a55a3eb8171 /lisp/gnus/mm-util.el | |
| parent | 1f626e9662d8120acd5a937f847123cc2b8c6e31 (diff) | |
| parent | 6bfdfeed36fab4680c8db90c22da8f6611694186 (diff) | |
| download | emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.gz emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.bz2 emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/gnus/mm-util.el')
| -rw-r--r-- | lisp/gnus/mm-util.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index db42bfa4b10..92e04f9d2ee 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -144,9 +144,9 @@ is not available." ;; on there being some coding system matching each `mime-charset' ;; property defined, as there should be.) ((and (mm-coding-system-p charset) -;;; Doing this would potentially weed out incorrect charsets. -;;; charset -;;; (eq charset (coding-system-get charset 'mime-charset)) + ;; Doing this would potentially weed out incorrect charsets. + ;; charset + ;; (eq charset (coding-system-get charset 'mime-charset)) ) charset) ;; Use coding system Emacs knows. @@ -160,7 +160,7 @@ is not available." form (prog2 ;; Avoid errors... - (condition-case nil (eval form) (error nil)) + (condition-case nil (eval form t) (error nil)) ;; (message "Failed to eval `%s'" form)) (mm-coding-system-p cs) (message "Added charset `%s' via `mm-charset-eval-alist'" cs)) @@ -380,7 +380,7 @@ like \"€\" to the euro sign, mainly in html messages." "Return the MIME charset corresponding to the given Mule CHARSET." (let ((css (sort (sort-coding-systems (find-coding-systems-for-charsets (list charset))) - 'mm-sort-coding-systems-predicate)) + #'mm-sort-coding-systems-predicate)) cs mime) (while (and (not mime) css) @@ -501,7 +501,7 @@ charset, and a longer list means no appropriate charset." (let ((systems (find-coding-systems-region b e))) (when mm-coding-system-priorities (setq systems - (sort systems 'mm-sort-coding-systems-predicate))) + (sort systems #'mm-sort-coding-systems-predicate))) (setq systems (delq 'compound-text systems)) (unless (equal systems '(undecided)) (while systems @@ -751,7 +751,7 @@ decompressed data. The buffer's multibyteness must be turned off." (insert-buffer-substring cur) (condition-case err (progn - (unless (memq (apply 'call-process-region + (unless (memq (apply #'call-process-region (point-min) (point-max) prog t (list t err-file) nil args) jka-compr-acceptable-retval-list) |