From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thien-Thi Nguyen Newsgroups: gmane.emacs.devel Subject: info handling dir.gz Date: Thu, 01 Mar 2012 10:25:34 +0100 Message-ID: <87fwdsoepd.fsf@gnuvola.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: dough.gmane.org 1330594013 4965 80.91.229.3 (1 Mar 2012 09:26:53 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 1 Mar 2012 09:26:53 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 01 10:26:52 2012 Return-path: Envelope-to: ged-emacs-devel@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 1S32Hh-0000pg-PO for ged-emacs-devel@m.gmane.org; Thu, 01 Mar 2012 10:26:49 +0100 Original-Received: from localhost ([::1]:59860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S32Hh-0002yI-2k for ged-emacs-devel@m.gmane.org; Thu, 01 Mar 2012 04:26:49 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:34254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S32He-0002yC-F9 for emacs-devel@gnu.org; Thu, 01 Mar 2012 04:26:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S32HX-0007nf-Mt for emacs-devel@gnu.org; Thu, 01 Mar 2012 04:26:46 -0500 Original-Received: from smtp205.alice.it ([82.57.200.101]:46500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S32HX-0007n4-BL for emacs-devel@gnu.org; Thu, 01 Mar 2012 04:26:39 -0500 Original-Received: from ambire (79.21.201.180) by smtp205.alice.it (8.6.023.02) id 4F421F7B01388E91 for emacs-devel@gnu.org; Thu, 1 Mar 2012 10:26:37 +0100 Original-Received: from ttn by ambire with local (Exim 4.72) (envelope-from ) id 1S32GV-0002ky-G7 for emacs-devel@gnu.org; Thu, 01 Mar 2012 10:25:35 +0100 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 82.57.200.101 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:148853 Archived-At: --=-=-= Content-Type: text/plain This patch is required for GNU Emacs to read /usr/share/info/dir.gz (et al). I hope it can make it into the next release. [Insert excuse for not having installed Bazarre, here (flames => /dev/null).] ______________________________________________________________ --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=info.diff lisp/info.el | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lisp/info.el b/lisp/info.el index a8cb141..49d0953 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1158,6 +1158,11 @@ a case-insensitive match is tried." (let* (file (attrs (or + ;; As of 2011 or thereabouts, some weirdness in the + ;; transition from Debian to GNU install-info results + ;; in the directory file being gzipped. Sigh. + (progn (setq file (expand-file-name "dir.gz" truename)) + (file-attributes file)) (progn (setq file (expand-file-name "dir" truename)) (file-attributes file)) (progn (setq file (expand-file-name "DIR" truename)) --=-=-=--