X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-view.el;h=33dc314c761d9d0ccfdbde117045f6e36030a267;hb=1060d04a99580afcfad148ae1e527ac80e428467;hp=75383b20c63cab829dff226d6a4d1a6fbc31050a;hpb=5796299cd6ddea48345ac57a9020e04804144cdd;p=elisp%2Fsemi.git diff --git a/mime-view.el b/mime-view.el index 75383b2..33dc314 100644 --- a/mime-view.el +++ b/mime-view.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: @@ -402,7 +402,8 @@ mother-buffer." (defun mime-save-situation-examples () (if (or mime-preview-situation-example-list mime-acting-situation-example-list) - (let ((file mime-situation-examples-file)) + (let ((file mime-situation-examples-file) + print-length print-level) (with-temp-buffer (insert ";;; " (file-name-nondirectory file) "\n") (insert "\n;; This file is generated automatically by " @@ -419,7 +420,7 @@ mother-buffer." (insert "\n;;; " (file-name-nondirectory file) " ends here.\n") - (static-cond + (static-cond ((boundp 'buffer-file-coding-system) (setq buffer-file-coding-system mime-situation-examples-file-coding-system)) @@ -427,7 +428,7 @@ mother-buffer." (setq file-coding-system mime-situation-examples-file-coding-system))) ;; (setq buffer-file-coding-system - ;; mime-situation-examples-file-coding-system) + ;; mime-situation-examples-file-coding-system) (setq buffer-file-name file) (save-buffer))))) @@ -904,10 +905,11 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." (car (mime-entity-children entity)))) (original-major-mode-cell (assq 'major-mode situation)) (default-situation (cdr (assq 'childrens-situation situation)))) - (if original-major-mode-cell - (setq default-situation - (cons original-major-mode-cell default-situation))) - (mime-display-entity start nil default-situation))) + (when start + (if original-major-mode-cell + (setq default-situation + (cons original-major-mode-cell default-situation))) + (mime-display-entity start nil default-situation)))) (defun mime-view-entity-content (entity situation) (mime-decode-string @@ -918,6 +920,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." (let (compression-info) (cond ((and (mime-entity-filename entity) + (featurep 'jka-compr) (jka-compr-installed-p) (setq compression-info (jka-compr-get-compression-info (mime-entity-filename entity)))) @@ -974,17 +977,23 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." (buffer-disable-undo) (kill-all-local-variables) (mime-view-insert-text-content entity situation) - (if mode - (funcall mode) - (if (setq filename (mime-entity-filename entity)) - (unwind-protect - (progn - (setq buffer-file-name filename) - (set-auto-mode)) - (setq buffer-file-name nil)))) - (let ((font-lock-verbose nil)) - ;; I find font-lock a bit too verbose. - (font-lock-fontify-buffer)) + (require 'font-lock) + (let ((font-lock-maximum-size nil) + ;; Disable support modes, e.g., jit-lock, lazy-lock, etc. + (font-lock-mode-hook nil) + (font-lock-support-mode nil) + ;; I find font-lock a bit too verbose. + (font-lock-verbose nil)) + (cond (mode + (funcall mode)) + ((setq filename (mime-entity-filename entity)) + (let ((buffer-file-name + (expand-file-name (file-name-nondirectory filename) + temporary-file-directory))) + (set-auto-mode)))) + ;; The mode function might have already turned on font-lock. + (unless (symbol-value 'font-lock-mode) + (font-lock-fontify-buffer))) ;; By default, XEmacs font-lock uses non-duplicable text ;; properties. This code forces all the text properties ;; to be copied along with the text. @@ -1220,7 +1229,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." (when (boundp 'widget-keymap) (set-keymap-parent (current-local-map) widget-keymap))) -(add-hook 'mime-view-define-keymap-hook 'mime-view-maybe-inherit-widget-keymap) +(add-hook 'mime-view-mode-hook 'mime-view-maybe-inherit-widget-keymap) (defun mime-view-define-keymap (&optional default) (let ((mime-view-mode-map (if (keymapp default) @@ -1462,15 +1471,19 @@ button-2 Move to point under the mouse cursor ;;; @@ utility ;;; -(defun mime-preview-find-boundary-info (&optional get-mother) +(defun mime-preview-find-boundary-info (&optional with-children) + "Return boundary information of current part. +If WITH-CHILDREN, refer boundary surrounding current part and its branches." (let (entity p-beg p-end entity-node-id len) - (while (null (setq entity - (get-text-property (point) 'mime-view-entity))) + (while (and + (null (setq entity + (get-text-property (point) 'mime-view-entity))) + (> (point) (point-min))) (backward-char)) (setq p-beg (previous-single-property-change (point) 'mime-view-entity)) - (setq entity-node-id (mime-entity-node-id entity)) + (setq entity-node-id (and entity (mime-entity-node-id entity))) (setq len (length entity-node-id)) (cond ((null p-beg) (setq p-beg @@ -1487,9 +1500,8 @@ button-2 Move to point under the mouse cursor (setq p-end (point-max))) ((null entity-node-id) (setq p-end (point-max))) - (get-mother + (with-children (save-excursion - (goto-char p-end) (catch 'tag (let (e i) (while (setq e @@ -1497,12 +1509,14 @@ button-2 Move to point under the mouse cursor (point) 'mime-view-entity)) (goto-char e) (let ((rc (mime-entity-node-id - (get-text-property (1- (point)) + (get-text-property (point) 'mime-view-entity)))) (or (and (>= (setq i (- (length rc) len)) 0) (equal entity-node-id (nthcdr i rc))) (throw 'tag nil))) - (setq p-end e))) + (setq p-end (or (next-single-property-change + (point) 'mime-view-entity) + (point-max))))) (setq p-end (point-max)))))) (vector p-beg p-end entity))) @@ -1538,13 +1552,13 @@ It decodes current entity to call internal or external method as It calls following-method selected from variable `mime-preview-following-method-alist'." (interactive) - (let ((entity (mime-preview-find-boundary-info t)) - p-beg p-end - pb-beg) - (setq p-beg (aref entity 0) - p-end (aref entity 1) - entity (aref entity 2)) - (if (get-text-property p-beg 'mime-view-entity-body) + (let* ((boundary-info (mime-preview-find-boundary-info t)) + (p-beg (aref boundary-info 0)) + (p-end (aref boundary-info 1)) + (entity (aref boundary-info 2)) + pb-beg) + (if (or (get-text-property p-beg 'mime-view-entity-body) + (null entity)) (setq pb-beg p-beg) (setq pb-beg (next-single-property-change @@ -1552,7 +1566,7 @@ It calls following-method selected from variable (or (next-single-property-change p-beg 'mime-view-entity) p-end)))) (let* ((mode (mime-preview-original-major-mode 'recursive)) - (entity-node-id (mime-entity-node-id entity)) + (entity-node-id (and entity (mime-entity-node-id entity))) (new-name (format "%s-%s" (buffer-name) (reverse entity-node-id))) new-buf @@ -1565,7 +1579,8 @@ It calls following-method selected from variable (insert-buffer-substring the-buf pb-beg p-end) (goto-char (point-min)) (let ((current-entity - (if (and (eq (mime-entity-media-type entity) 'message) + (if (and entity + (eq (mime-entity-media-type entity) 'message) (eq (mime-entity-media-subtype entity) 'rfc822)) (car (mime-entity-children entity)) entity))) @@ -1602,9 +1617,8 @@ It calls following-method selected from variable (if (functionp f) (funcall f new-buf) (message - (format - "Sorry, following method for %s is not implemented yet." - mode))))))) + "Sorry, following method for %s is not implemented yet." + mode)))))) ;;; @@ moving @@ -1799,14 +1813,14 @@ If LINES is negative, scroll up LINES lines." (lambda (sym) (list (symbol-name sym))) (mime-charset-list)) - #'mime-charset-p t + nil t (symbol-name default-charset))))) (unless (eq charset default-charset) charset)) default-charset)) (defun mime-preview-toggle-display (type &optional display) - (let ((situation (mime-preview-find-boundary-info)) + (let ((situation (mime-preview-find-boundary-info t)) (sym (intern (concat "*" (symbol-name type)))) entity p-beg p-end encoding charset) (setq p-beg (aref situation 0)