procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(doc-view-initiate-display): Use `doc-view-mode-p'.

Browse source 
(doc-view-current-overlay, doc-view-pending-cache-flush): Add doc
string.
This commit is contained in:
Reiner Steib 2007-12-03 07:24:34 +00:00
parent 868641ccd0
commit d99abf1ba0
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2007-12-03 Tassilo Horn <tassilo@member.fsf.org>
* doc-view.el (doc-view-initiate-display): Use `doc-view-mode-p'.
(doc-view-current-overlay, doc-view-pending-cache-flush): Add doc
string.
2007-12-03 Richard Stallman <rms@gnu.org>
* subr.el (declare-function): Moved from byte-run.el.

16
lisp/doc-view.el
View file

@ -234,8 +234,12 @@ has finished."
(defvar doc-view-current-image nil
"Only used internally.")
(defvar doc-view-current-overlay)
(defvar doc-view-pending-cache-flush nil)
(defvar doc-view-current-overlay nil
"Only used internally.")
(defvar doc-view-pending-cache-flush nil
"Only used internally.")
(defvar doc-view-current-info nil
"Only used internally.")
@ -887,8 +891,7 @@ If BACKWARD is non-nil, jump to the previous match."
(defun doc-view-initiate-display ()
;; Switch to image display if possible
(if (and (display-images-p)
(image-type-available-p 'png))
(if (doc-view-mode-p (intern (file-name-extension buffer-file-name)))
(progn
(doc-view-buffer-message)
(setq doc-view-current-page (or doc-view-current-page 1))
@ -905,8 +908,9 @@ If BACKWARD is non-nil, jump to the previous match."
(message
"%s"
(substitute-command-keys
(concat "No image (png) support available. Type \\[doc-view-toggle-display] "
"to switch to an editing mode.")))))
(concat "No image (png) support available or some conversion utility for "
(file-name-extension buffer-file-name)" files is missing. "
"Type \\[doc-view-toggle-display] to switch to an editing mode.")))))
;;;###autoload
(defun doc-view-mode ()