[Emacs-diffs] Changes to emacs/lisp/info.el,v

[Nick Roberts]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Nick Roberts <nickrob>  07/03/27 22:21:03

Index: info.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/info.el,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -b -r1.497 -r1.498
--- info.el     10 Feb 2007 11:10:49 -0000      1.497
+++ info.el     27 Mar 2007 22:21:02 -0000      1.498
@@ -1315,8 +1315,9 @@
              nil t)
        (let* ((start (match-beginning 1))
               (parameter-alist (Info-split-parameter-string (match-string 2)))
-              (src (cdr (assoc-string "src" parameter-alist)))
-              (image-file (if src (if (file-name-absolute-p src) src
+               (src (cdr (assoc-string "src" parameter-alist))))
+          (if (display-images-p)
+              (let* ((image-file (if src (if (file-name-absolute-p src) src
                                     (concat default-directory src))
                             ""))
               (image (if (file-exists-p image-file)
@@ -1324,7 +1325,15 @@
                        "[broken image]")))
          (if (not (get-text-property start 'display))
              (add-text-properties
-              start (point) `(display ,image rear-nonsticky (display)))))))
+                     start (point) `(display ,image rear-nonsticky 
(display)))))
+            ;; text-only display, show alternative text if provided, or
+            ;; otherwise a clue that there's meant to be a picture
+            (delete-region start (point))
+            (insert (or (cdr (assoc-string "text" parameter-alist))
+                        (cdr (assoc-string "alt" parameter-alist))
+                        (and src
+                             (concat "[image:" src "]"))
+                        "[image]"))))))
     (set-buffer-modified-p nil)))
 
 ;; Texinfo 4.7 adds cookies of the form address@hidden CONTENTS address@hidden