From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#15279: Info broken image Date: Fri, 06 Sep 2013 00:35:17 +0300 Organization: JURTA Message-ID: <8738pjymsq.fsf@mail.jurta.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1378417105 1655 80.91.229.3 (5 Sep 2013 21:38:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 5 Sep 2013 21:38:25 +0000 (UTC) To: 15279@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Sep 05 23:38:27 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VHhFw-0001El-TB for geb-bug-gnu-emacs@m.gmane.org; Thu, 05 Sep 2013 23:38:25 +0200 Original-Received: from localhost ([::1]:33867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHhFw-0002HZ-Hr for geb-bug-gnu-emacs@m.gmane.org; Thu, 05 Sep 2013 17:38:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHhFl-00028V-71 for bug-gnu-emacs@gnu.org; Thu, 05 Sep 2013 17:38:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHhFb-0006yi-Ho for bug-gnu-emacs@gnu.org; Thu, 05 Sep 2013 17:38:13 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHhFb-0006ye-EC for bug-gnu-emacs@gnu.org; Thu, 05 Sep 2013 17:38:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VHhFa-0004vT-RZ for bug-gnu-emacs@gnu.org; Thu, 05 Sep 2013 17:38:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 05 Sep 2013 21:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 15279 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.137841705418897 (code B ref -1); Thu, 05 Sep 2013 21:38:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 5 Sep 2013 21:37:34 +0000 Original-Received: from localhost ([127.0.0.1]:42355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VHhF7-0004uj-Ty for submit@debbugs.gnu.org; Thu, 05 Sep 2013 17:37:34 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:39350) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VHhF6-0004uS-3y for submit@debbugs.gnu.org; Thu, 05 Sep 2013 17:37:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHhEs-0006Kk-Cb for submit@debbugs.gnu.org; Thu, 05 Sep 2013 17:37:26 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:55570) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHhEs-0006Kg-9K for submit@debbugs.gnu.org; Thu, 05 Sep 2013 17:37:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHhEm-00024n-5j for bug-gnu-emacs@gnu.org; Thu, 05 Sep 2013 17:37:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHhEg-0006JV-6a for bug-gnu-emacs@gnu.org; Thu, 05 Sep 2013 17:37:12 -0400 Original-Received: from ps18281.dreamhost.com ([69.163.218.105]:56139 helo=ps18281.dreamhostps.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHhEg-0006JR-0Q for bug-gnu-emacs@gnu.org; Thu, 05 Sep 2013 17:37:06 -0400 Original-Received: from localhost.jurta.org (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id 74F1E258B9E936 for ; Thu, 5 Sep 2013 14:37:03 -0700 (PDT) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:78018 Archived-At: When Info can't find an image file it replaces the image with the placeholder "[broken image]" even when there is ASCII variant of the image. It would be more user-friendly to display ASCII variant if it is provided in the Info file. Additionally this patch also displays the ALT attribute in the tooltip like web browsers do. === modified file 'lisp/info.el' --- lisp/info.el 2013-07-03 20:47:56 +0000 +++ lisp/info.el 2013-09-05 21:33:39 +0000 @@ -1611,11 +1611,15 @@ (defun Info-display-images-node () "")) (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))