unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* compile.el
@ 2005-08-22 19:35 Richard M. Stallman
  2005-08-23 19:33 ` compile.el Juri Linkov
  0 siblings, 1 reply; 9+ messages in thread
From: Richard M. Stallman @ 2005-08-22 19:35 UTC (permalink / raw)


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$")

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2005-09-10  9:15 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-22 19:35 compile.el Richard M. Stallman
2005-08-23 19:33 ` compile.el Juri Linkov
2005-09-09  2:24   ` compile.el Richard M. Stallman
2005-09-09  6:28     ` compile.el Juri Linkov
2005-09-09 12:50       ` compile.el Richard M. Stallman
2005-09-09 14:57         ` compile.el Juri Linkov
2005-09-10  8:14       ` compile.el Richard M. Stallman
2005-09-10  9:15         ` compile.el Juri Linkov
2005-09-09  2:24   ` compile.el Richard M. Stallman

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).