[Emacs-diffs] trunk r114160: * lisp/info.el (Info-display-images-node): When image file doesn't exist

[Juri Linkov]

------------------------------------------------------------
revno: 114160
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15279
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-09-06 23:43:49 +0300
message:
  * lisp/info.el (Info-display-images-node): When image file doesn't exist
  display text version of the image if it's provided in the Info file.
  Otherwise, display the location of missing image from SRC attribute.
  Add help-echo text property from ALT attribute.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/info.el                   info.el-20091113204419-o5vbwnq5f7feedwu-261

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-06 15:37:01 +0000
+++ b/lisp/ChangeLog    2013-09-06 20:43:49 +0000
@@ -1,3 +1,10 @@
+2013-09-06  Juri Linkov  <address@hidden>
+
+       * info.el (Info-display-images-node): When image file doesn't exist
+       display text version of the image if it's provided in the Info file.
+       Otherwise, display the location of missing image from SRC attribute.
+       Add help-echo text property from ALT attribute.  (Bug#15279)
+
 2013-09-06  Stefan Monnier  <address@hidden>
 
        * abbrev.el (edit-abbrevs-mode-map): Rename from edit-abbrevs-map.

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2013-08-05 18:05:46 +0000
+++ b/lisp/info.el      2013-09-06 20:43:49 +0000
@@ -1595,17 +1595,20 @@
                                    ""))
                      (image (if (file-exists-p image-file)
                                 (create-image image-file)
-                              "[broken image]")))
+                              (or (cdr (assoc-string "text" parameter-alist))
+                                 (and src (concat "[broken image:" src "]"))
+                                 "[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)
+                      help-echo ,(cdr (assoc-string "alt" parameter-alist))))))
             ;; 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 "]"))
+                        (and src (concat "[image:" src "]"))
                         "[image]"))))))
     (set-buffer-modified-p nil)))