diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/obsolete/metamail.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/obsolete/metamail.el')
-rw-r--r-- | lisp/obsolete/metamail.el | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/obsolete/metamail.el b/lisp/obsolete/metamail.el index ef97e8aa55c..72237239ddb 100644 --- a/lisp/obsolete/metamail.el +++ b/lisp/obsolete/metamail.el @@ -1,4 +1,4 @@ -;;; metamail.el --- Metamail interface for GNU Emacs +;;; metamail.el --- Metamail interface for GNU Emacs -*- lexical-binding: t; -*- ;; Copyright (C) 1993, 1996, 2001-2021 Free Software Foundation, Inc. @@ -44,13 +44,11 @@ (defcustom metamail-program-name "metamail" "Metamail program name." - :type 'string - :group 'metamail) + :type 'string) (defcustom metamail-mailer-name "emacs" "Mailer name set to MM_MAILER environment variable." - :type 'string - :group 'metamail) + :type 'string) (defvar metamail-environment '("KEYHEADS=*" "MM_QUIET=1") "Environment variables passed to `metamail'. @@ -65,8 +63,7 @@ It is not expected to be altered globally by `set' or `setq'. Instead, change its value temporary using `let' or `let*' form. `-m MAILER' argument is automatically generated from the `metamail-mailer-name' variable." - :type '(repeat (string :tag "Switch")) - :group 'metamail) + :type '(repeat (string :tag "Switch"))) ;;;###autoload (defun metamail-interpret-header () @@ -193,7 +190,7 @@ redisplayed as output is inserted." (list "-m" (or metamail-mailer-name "emacs")) (list metafile)))) ;; `metamail' may not delete the temporary file! - (condition-case error + (condition-case nil (delete-file metafile) (error nil)) ))) |