From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Richard M. Stallman" Newsgroups: gmane.emacs.devel Subject: compile.el Date: Mon, 22 Aug 2005 15:35:44 -0400 Message-ID: Reply-To: rms@gnu.org NNTP-Posting-Host: main.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: sea.gmane.org 1124739728 8256 80.91.229.2 (22 Aug 2005 19:42:08 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 22 Aug 2005 19:42:08 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 22 21:42:07 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1E7I9P-0004oy-FA for ged-emacs-devel@m.gmane.org; Mon, 22 Aug 2005 21:40:08 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1E7ID9-0001F1-Ez for ged-emacs-devel@m.gmane.org; Mon, 22 Aug 2005 15:43:59 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1E7IBP-0000th-KY for emacs-devel@gnu.org; Mon, 22 Aug 2005 15:42:12 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1E7IBJ-0000s7-Rg for emacs-devel@gnu.org; Mon, 22 Aug 2005 15:42:06 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1E7IBG-0000qG-SG for emacs-devel@gnu.org; Mon, 22 Aug 2005 15:42:05 -0400 Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1E7I68-0001BY-Bm for emacs-devel@gnu.org; Mon, 22 Aug 2005 15:36:44 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.34) id 1E7I5A-0007Nl-Li; Mon, 22 Aug 2005 15:35:44 -0400 Original-To: emacs-devel@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:42320 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:42320 My patch to compile.el has a bug; here's a revised patch. *** compile.el 20 Aug 2005 17:41:24 -0400 1.375 --- compile.el 22 Aug 2005 03:32:32 -0400 *************** *** 1770,1776 **** (defun compilation-get-file-structure (file &optional fmt) "Retrieve FILE's file-structure or create a new one. ! FILE should be (ABSOLUTE-FILENAME) or (RELATIVE-FILENAME . DIRNAME)." (or (gethash file compilation-locs) ;; File was not previously encountered, at least not in the form passed. --- 1773,1780 ---- (defun compilation-get-file-structure (file &optional fmt) "Retrieve FILE's file-structure or create a new one. ! FILE should be (FILENAME) or (RELATIVE-FILENAME . DIRNAME). ! In the former case, FILENAME may be relative or absolute." (or (gethash file compilation-locs) ;; File was not previously encountered, at least not in the form passed. *************** *** 1783,1795 **** ;; Check for a comint-file-name-prefix and prepend it if appropriate. ;; (This is very useful for compilation-minor-mode in an rlogin-mode ;; buffer.) ! (if (boundp 'comint-file-name-prefix) ! (if (file-name-absolute-p filename) ! (setq filename ! (concat (with-no-warnings comint-file-name-prefix) filename)) ! (setq default-directory ! (file-truename ! (concat (with-no-warnings comint-file-name-prefix) default-directory))))) ;; If compilation-parse-errors-filename-function is ;; defined, use it to process the filename. --- 1787,1799 ---- ;; Check for a comint-file-name-prefix and prepend it if appropriate. ;; (This is very useful for compilation-minor-mode in an rlogin-mode ;; buffer.) ! (unless (equal comint-file-name-prefix "") ! (if (file-name-absolute-p filename) ! (setq filename ! (concat comint-file-name-prefix filename)) ! (setq default-directory ! (file-truename ! (concat comint-file-name-prefix default-directory))))) ;; If compilation-parse-errors-filename-function is ;; defined, use it to process the filename. *************** *** 1805,1824 **** ;; name and fix them. (setq filename (command-line-normalize-file-name filename)) - ;; Now eliminate any "..", because find-file would get them wrong. - ;; Make relative and absolute filenames, with or without links, the - ;; same. - (setq filename - (list (abbreviate-file-name - (file-truename (if (cdr file) - (expand-file-name filename) - filename))))) - ;; Store it for the possibly unnormalized name (puthash file ;; Retrieve or create file-structure for normalized name ! (or (gethash filename compilation-locs) ! (puthash filename (list filename fmt) compilation-locs)) compilation-locs)))) (add-to-list 'debug-ignored-errors "^No more [-a-z ]+s yet$") --- 1809,1821 ---- ;; name and fix them. (setq filename (command-line-normalize-file-name filename)) ;; Store it for the possibly unnormalized name (puthash file ;; Retrieve or create file-structure for normalized name ! (or (gethash (list filename) compilation-locs) ! (puthash (list filename) ! (list (list filename) fmt) ! compilation-locs)) compilation-locs)))) (add-to-list 'debug-ignored-errors "^No more [-a-z ]+s yet$")