comparison lisp/info.el @ 54752:4aa6485ff6e3

(Info-hide-cookies-node): New function. (Info-select-node): Use it. (Info-display-images-node): Remove message with image file name.

54751:6d670cd12119

				     (concat default-directory src))
			     ""))
	       (image (if (file-exists-p image-file)
			  (create-image image-file)
			"[broken image]")))
	  (message "Found image: %S" image-file)
	  (if (not (get-text-property start 'display))
	      (add-text-properties
	       start (point) `(display ,image rear-nonsticky (display)))))))
    (set-buffer-modified-p nil)))

(defun Info-select-node ()
  "Select the info node that point is in."
  ;; Bind this in case the user sets it to nil.

					    (read (current-buffer))))))
			    (point-max)))
	(if Info-enable-active-nodes (eval active-expression))
	(Info-fontify-node)
	(Info-display-images-node)
	(run-hooks 'Info-selection-hook)))))

(defun Info-set-mode-line ()
  (setq mode-line-buffer-identification
	(nconc (propertized-buffer-identification "%b")

54752:4aa6485ff6e3

				     (concat default-directory src))
			     ""))
	       (image (if (file-exists-p image-file)
			  (create-image image-file)
			"[broken image]")))
	  (if (not (get-text-property start 'display))
	      (add-text-properties
	       start (point) `(display ,image rear-nonsticky (display)))))))
    (set-buffer-modified-p nil)))

;; Texinfo 4.7 adds cookies of the form ^@^H[NAME CONTENTS ^@^H].
;; Hide any construct of the general form ^@[^@-^_][ ...  ^@[^@-^_]],
;; including one optional trailing newline.
(defun Info-hide-cookies-node ()
  "Hide unrecognised cookies in current node."
  (save-excursion
    (let ((inhibit-read-only t)
	  (case-fold-search t))
      (goto-char (point-min))
      (while (re-search-forward
	      "\\(\0[\0-\37][[][^\0]*\0[\0-\37][]]\n?\\)"
	      nil t)
	(let* ((start (match-beginning 1)))
	  (if (not (get-text-property start 'invisible))
	      (put-text-property start (point) 'invisible t)))))
    (set-buffer-modified-p nil)))

(defun Info-select-node ()
  "Select the info node that point is in."
  ;; Bind this in case the user sets it to nil.

					    (read (current-buffer))))))
			    (point-max)))
	(if Info-enable-active-nodes (eval active-expression))
	(Info-fontify-node)
	(Info-display-images-node)
	(Info-hide-cookies-node)
	(run-hooks 'Info-selection-hook)))))

(defun Info-set-mode-line ()
  (setq mode-line-buffer-identification
	(nconc (propertized-buffer-identification "%b")