*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 790b98543b9ff6ae6caaa174be36041901abcf31..1164c941619517760b22dee4d3699b3e1bf59e75 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/compile.el (compilation-error-regexp-alist-alist) <gnu>:
+       Use shy regexp.  Fix incorrect backref to potentially unmatched group.
+
        * dirtrack.el (dirtrack-default-directory-function): Remove.
        (dirtrack-directory-function): Use file-name-as-directory.
        (dirtrack-windows-directory-function): Simplify.

diff --git a/man/programs.texi b/man/programs.texi
index 2e189bc1f1323576b7f8b521911348ba1f992bd8..70198ad1e991357f03d6ab4f023c54def65ef2fd 100644 (file)
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -949,13 +949,14 @@ comment delimiters to add or how many to delete.
 comments in certain contexts.  For example, in Lisp code, comments which
 start with two semicolons are indented as if they were lines of code,
 instead of at the comment column.  Comments which start with three
-semicolons are supposed to start at the left margin.  Emacs understands
+semicolons are supposed to start at the left margin and are often used
+for sectioning purposes.  Emacs understands
 these conventions by indenting a double-semicolon comment using @key{TAB},
 and by not changing the indentation of a triple-semicolon comment at all.
 
 @example
 ;; This function is just an example.
-;; Here either two or three semicolons are appropriate.
+;;; Here either two or three semicolons are appropriate.
 (defun foo (x)
 ;;;  And now, the first part of the function:
   ;; The following line adds one.