From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.bugs Subject: bug#3865: Patch for #3865: Would somebody please commit on HEAD and branch? Date: Fri, 17 Jul 2009 20:51:58 +0200 Message-ID: <87vdlr2ldd.fsf__30596.3632221848$1247857077$gmane$org@thinkpad.tsdh.de> Reply-To: Tassilo Horn , 3865@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1247857077 3244 80.91.229.12 (17 Jul 2009 18:57:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 17 Jul 2009 18:57:57 +0000 (UTC) Cc: 3865@emacsbugs.donarmstrong.com To: emacs-devel@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jul 17 20:57:50 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MRsct-0003v2-1C for geb-bug-gnu-emacs@m.gmane.org; Fri, 17 Jul 2009 20:57:47 +0200 Original-Received: from localhost ([127.0.0.1]:38490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MRscn-000298-Fh for geb-bug-gnu-emacs@m.gmane.org; Fri, 17 Jul 2009 14:57:41 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MRsci-000291-15 for bug-gnu-emacs@gnu.org; Fri, 17 Jul 2009 14:57:36 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MRscd-00028l-Cd for bug-gnu-emacs@gnu.org; Fri, 17 Jul 2009 14:57:35 -0400 Original-Received: from [199.232.76.173] (port=46285 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MRscd-00028i-70 for bug-gnu-emacs@gnu.org; Fri, 17 Jul 2009 14:57:31 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:60475) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MRscc-0008Rg-KL for bug-gnu-emacs@gnu.org; Fri, 17 Jul 2009 14:57:30 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n6HIvSAH017573; Fri, 17 Jul 2009 11:57:28 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n6HIt5Qm016893; Fri, 17 Jul 2009 11:55:05 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Tassilo Horn Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Fri, 17 Jul 2009 18:55:05 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 3865 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 3865-submit@emacsbugs.donarmstrong.com id=B3865.124785672116637 (code B ref 3865); Fri, 17 Jul 2009 18:55:05 +0000 Original-Received: (at 3865) by emacsbugs.donarmstrong.com; 17 Jul 2009 18:52:01 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from out1.smtp.messagingengine.com (out1.smtp.messagingengine.com [66.111.4.25]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n6HIpvOI016632 for <3865@emacsbugs.donarmstrong.com>; Fri, 17 Jul 2009 11:51:58 -0700 Original-Received: from compute1.internal (compute1.internal [10.202.2.41]) by out1.messagingengine.com (Postfix) with ESMTP id C77CA3BBBE7; Fri, 17 Jul 2009 14:51:56 -0400 (EDT) Original-Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute1.internal (MEProxy); Fri, 17 Jul 2009 14:51:56 -0400 X-Sasl-enc: D0QtOoP4VOkANXyr7kovUbmVETmhQFvLIuE+ifFnrp4z 1247856716 Original-Received: from thinkpad.tsdh.de (p54AF1FA5.dip0.t-ipconnect.de [84.175.31.165]) by mail.messagingengine.com (Postfix) with ESMTPA id A164B8C3F; Fri, 17 Jul 2009 14:51:55 -0400 (EDT) Mail-Copies-To: never User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Fri, 17 Jul 2009 14:57:35 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:29497 Archived-At: Hi all, this patch fixes the inconveniences Reiner pointed out in #3865. Could somebody please commit it for me on branch and head? I'm to busy to read up how to merge between branches with CVS -- I'm going to marry tomorrow! :-) --8<---------------cut here---------------start------------->8--- 2009-07-16 Tassilo Horn * doc-view.el (doc-view-initiate-display): Add yes-or-no-p if rendering of pngs is not possible instead of messaging a long description. --8<---------------cut here---------------end--------------->8--- --8<---------------cut here---------------start------------->8--- Index: lisp/doc-view.el =================================================================== RCS file: /sources/emacs/emacs/lisp/doc-view.el,v retrieving revision 1.87 diff -u -r1.87 doc-view.el --- lisp/doc-view.el 2 Apr 2009 21:12:56 -0000 1.87 +++ lisp/doc-view.el 17 Jul 2009 18:44:18 -0000 @@ -1078,15 +1078,12 @@ "editing or viewing the document.")))) (message "%s" - (substitute-command-keys - (concat "No PNG support available or some conversion utility for " - (file-name-extension doc-view-buffer-file-name)" files is missing. " - "Type \\[doc-view-toggle-display] to switch to " - (if (eq doc-view-doc-type 'ps) - "ps-mode" - "fundamental-mode") - ", \\[doc-view-open-text] to show the doc as text in a separate buffer " - " or \\[doc-view-kill-proc-and-buffer] to kill this buffer."))))) + (concat "No PNG support available or some conversion utility for " + (file-name-extension doc-view-buffer-file-name) " files is missing.")) + (if (and (executable-find doc-view-pdftotext-program) + (yes-or-no-p "Cannot render file. View extracted text instead? ")) + (doc-view-open-text) + (doc-view-toggle-display)))) (defvar bookmark-make-record-function) --8<---------------cut here---------------end--------------->8--- Bye, Tassilo