[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/10/09 08:52:58

Index: lisp/progmodes/compile.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/compile.el,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -b -r1.442 -r1.443
--- lisp/progmodes/compile.el   17 Aug 2007 07:17:13 -0000      1.442
+++ lisp/progmodes/compile.el   9 Oct 2007 08:52:44 -0000       1.443
@@ -240,7 +240,7 @@
 \\([0-9]+\\)\\(?:\\([.:]\\)\\([0-9]+\\)\\)?\
 \\(?:-\\([0-9]+\\)?\\(?:\\3\\([0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
- *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\)\\|\
+ *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\
 \[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
      1 (2 . 5) (4 . 6) (7 . 8))
 
@@ -1932,8 +1932,7 @@
 In the former case, FILENAME may be relative or absolute.
 
 The file-structure looks like this:
-  (list (list FILENAME [DIR-FROM-PREV-MSG]) FMT LINE-STRUCT...)
-"
+  (list (list FILENAME [DIR-FROM-PREV-MSG]) FMT LINE-STRUCT...)"
   (or (gethash file compilation-locs)
       ;; File was not previously encountered, at least not in the form passed.
       ;; Let's normalize it and look again.
@@ -1977,9 +1976,7 @@
                 ;; directories have the same name:
                 ;; 
http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00463.html
                 (or (gethash (cons filename spec-directory) compilation-locs)
-                    ;; TODO should this, without spec-directory, be
-                    ;; done at all?
-                    (puthash (list filename)
+                    (puthash (cons filename spec-directory)
                              (list (list filename spec-directory) fmt)
                              compilation-locs))
                 compilation-locs))))