From 856997723b8fb75e10aafebfb2c170b291bfe881 Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Wed, 28 Jan 2009 20:33:44 +0000 Subject: [PATCH] (doc-view-mode): Don't use string-match and file extension to choose fallback mode on empty/non-existing files but let-bind auto-mode-alist and call normal-mode. --- lisp/ChangeLog | 6 ++++++ lisp/doc-view.el | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 47aaa51deb6..049e10dbe7e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-01-28 Tassilo Horn + + * doc-view.el (doc-view-mode): Don't use string-match and file + extension to choose fallback mode on empty/non-existing files but + let-bind auto-mode-alist and call normal-mode. + 2009-01-28 Eli Zaretskii * ls-lisp.el (ls-lisp-classify): Propertize file name before diff --git a/lisp/doc-view.el b/lisp/doc-view.el index 8817db739e1..6d8ad649b94 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -1093,11 +1093,11 @@ toggle between displaying the document or editing it as text. (if (or (not (file-exists-p buffer-file-name)) (= (point-min) (point-max))) - ;; The doc is empty or doesn't exist at all, so fallback to an - ;; editing mode. - (if (string-match "[eE]?[pP][sS]" (file-name-extension buffer-file-name)) - (ps-mode) - (fundamental-mode)) ;;Should we activate d-v-minor-mode here? + ;; The doc is empty or doesn't exist at all, so fallback to + ;; another mode. + (let ((auto-mode-alist (remq (rassq 'doc-view-mode auto-mode-alist) + auto-mode-alist))) + (normal-mode)) (let* ((prev-major-mode (if (eq major-mode 'doc-view-mode) doc-view-previous-major-mode -- 2.39.5