[Emacs-diffs] Changes to emacs/lisp/mh-e/mh-gnus.el [lexbind]

[Miles Bader]

Index: emacs/lisp/mh-e/mh-gnus.el
diff -c emacs/lisp/mh-e/mh-gnus.el:1.2.4.1 emacs/lisp/mh-e/mh-gnus.el:1.2.4.2
*** emacs/lisp/mh-e/mh-gnus.el:1.2.4.1  Sat Jul 17 02:51:48 2004
--- emacs/lisp/mh-e/mh-gnus.el  Sat Sep  4 09:22:56 2004
***************
*** 1,6 ****
  ;;; mh-gnus.el --- Make MH-E compatible with installed version of Gnus.
  
! ;; Copyright (C) 2003 Free Software Foundation, Inc.
  
  ;; Author: Satyaki Das <address@hidden>
  ;; Maintainer: Bill Wohler <address@hidden>
--- 1,6 ----
  ;;; mh-gnus.el --- Make MH-E compatible with installed version of Gnus.
  
! ;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
  
  ;; Author: Satyaki Das <address@hidden>
  ;; Maintainer: Bill Wohler <address@hidden>
***************
*** 34,39 ****
--- 34,40 ----
  (load "mm-uu" t t)                      ; Non-fatal dependency
  (load "mailcap" t t)                    ; Non-fatal dependency
  (load "smiley" t t)                     ; Non-fatal dependency
+ (load "mailabbrev" t t)
  
  (defmacro mh-defun-compat (function arg-list &rest body)
    "This is a macro to define functions which are not defined.
***************
*** 74,85 ****
        (put-text-property 0 (length (car handle)) parameter value
                           (car handle))))
  
  ;; Copy of original macro is in mm-decode.el
  (mh-defmacro-compat mm-handle-multipart-ctl-parameter (handle parameter)
    `(get-text-property 0 ,parameter (car ,handle)))
  
- (mh-do-in-xemacs (defvar default-enable-multibyte-characters))
- 
  ;; Copy of original function in mm-decode.el
  (mh-defun-compat mm-readable-p (handle)
    "Say whether the content of HANDLE is readable."
--- 75,102 ----
        (put-text-property 0 (length (car handle)) parameter value
                           (car handle))))
  
+ ;; Copy of function from mm-view.el
+ (mh-defun-compat mm-inline-text-vcard (handle)
+   (let (buffer-read-only)
+     (mm-insert-inline
+      handle
+      (concat "\n-- \n"
+            (ignore-errors
+              (if (fboundp 'vcard-pretty-print)
+                  (vcard-pretty-print (mm-get-part handle))
+                (vcard-format-string
+                 (vcard-parse-string (mm-get-part handle)
+                                     'vcard-standard-filter))))))))
+ 
+ ;; Function from mm-decode.el used in PGP messages. Just define it with older
+ ;; gnus to avoid compiler warning.
+ (mh-defun-compat mm-possibly-verify-or-decrypt (parts ctl)
+   nil)
+ 
  ;; Copy of original macro is in mm-decode.el
  (mh-defmacro-compat mm-handle-multipart-ctl-parameter (handle parameter)
    `(get-text-property 0 ,parameter (car ,handle)))
  
  ;; Copy of original function in mm-decode.el
  (mh-defun-compat mm-readable-p (handle)
    "Say whether the content of HANDLE is readable."
***************
*** 134,143 ****
--- 151,173 ----
                                    file)))
           (mm-save-part-to-file handle file))))
  
+ (defun mh-mm-text-html-renderer ()
+   "Find the renderer gnus is using to display text/html MIME parts."
+   (or (and (boundp 'mm-inline-text-html-renderer) 
mm-inline-text-html-renderer)
+       (and (boundp 'mm-text-html-renderer) mm-text-html-renderer)))
+ 
+ (defun mh-mail-abbrev-make-syntax-table ()
+   "Call `mail-abbrev-make-syntax-table' if available."
+   (when (fboundp 'mail-abbrev-make-syntax-table)
+     (mail-abbrev-make-syntax-table)))
+ 
  (provide 'mh-gnus)
+ 
  ;;; Local Variables:
  ;;; no-byte-compile: t
  ;;; no-update-autoloads: t
+ ;;; indent-tabs-mode: nil
+ ;;; sentence-end-double-space: nil
  ;;; End:
  
  ;; arch-tag: 1e3638af-cad3-4c69-8427-bc8eb6e5e4fa