comparison lisp/doc-view.el @ 101623:0974e3e4aca7

(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.

101622:0476d5672e52

\\{doc-view-mode-map}"
  (interactive)

  (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?

    (let* ((prev-major-mode (if (eq major-mode 'doc-view-mode)
				doc-view-previous-major-mode
			      major-mode)))
      (kill-all-local-variables)

101623:0974e3e4aca7

\\{doc-view-mode-map}"
  (interactive)

  (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
      ;; 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
			      major-mode)))
      (kill-all-local-variables)