2 files changed, 69 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e5aca3d061..56f6fa3d0a4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,54 @@
         adding messages when there are already markers for their file.
         (compilation-fake-loc): New function.
 
+2004-04-16  Dave Love  <fx@gnu.org>
+
+        * progmodes/python.el (python-compilation-line-number): Fix braindamage.
+        (python-load-file): Fix python-orig-start setting.
+
+        * progmodes/compile.el: Doc fixes.
+        (compilation-error-regexp-alist-alist)
+        (compilation-mode-font-lock-keywords): Allow non-ASCII where possible.
+        (compilation-assq): Wrap in eval-when-compile.
+        (compilation-mode-font-lock-keywords): Don't use list*.
+        (compilation-start): Avoid warning.
+        (compilation-compat-error-properties)
+        (compilation-directory-properties): Add keymap property.
+        (compilation-parsing-end): Make it a marker for better compatibility.
+
+        * progmodes/python.el (python-after-info-look): Use with-no-warnings.
+
+2004-04-16  Mark A. Hershberger  <mah@everybody.org>
+
+        * xml.el: Doc fixes.
+        (xml-get-children): Only looks at sub-tags and ignore strings.
+
+        * xml.el (xml-parse-tag): Avoid overwriting node-name.
+
+2004-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url/url-util.el (url-debug): Use with-current-buffer.
+
+        * url/url-nfs.el (url-nfs-file-attributes): Add id-format parameter.
+        (url-nfs-create-wrapper): Use new backquote syntax.
+
+        * url/url-https.el (url-https-file-attributes): Add id-format param.
+
+        * url/url-http.el (url-http-head-file-attributes)
+        (url-http-file-attributes): Add id-format parameter.
+
+        * url/url-handlers.el: Use new find-file-hook.
+        (url-file-attributes): Add id-format parameter.
+
+        * url/url-file.el (url-file-create-wrapper): Use new backquote syntax.
+        (url-file-file-attributes): Add id-format parameter.
+
+        * url/url-dav.el: Use with-current-buffer.
+        (url-dav-process-response): Fix regexps and spurious quote.
+        (url-dav-file-attributes): Add id-format param.
+
+        * diff-mode.el (diff-end-of-hunk): Be more careful with unified hunks.
+
 2004-04-16  Andre Spiegel  <spiegel@gnu.org>
 
         * vc-hooks.el (vc-default-workfile-unchanged-p): Quote signal.
@@ -15,8 +63,7 @@
         * simple.el (completion-setup-function): Set an initial value
         to `element-common-end' before entering loop. Set a value
         to `element-common-end' at the end of loop.
-        The bug is reported by Juri Linkov <juri@jurta.org> in emacs-devel
-        list.
+        The bug is reported by Juri Linkov <juri@jurta.org> in emacs-devel list.
         (completions-common-part): Rename from completion-de-emphasis.
         (completions-first-difference): Rename from completion-emphasis.
         Suggested by RMS.
@@ -26,6 +73,12 @@
         * bookmark.el (bookmark-send-edited-annotation): Fix docstring.
         (bookmark-edit-annotation-mode): Add mode name.
 
+2004-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * smerge-mode.el (smerge-match-conflict): Try to do something sensible
+        for nested conflict markers.
+        (smerge-find-conflict): Better handle errors in smerge-match-conflict.
+
 2004-04-15  Nick Roberts  <nick@nick.uklinux.net>
 
         * progmodes/gdb-ui.el (gdb-goto-info): New function.
@@ -125,7 +178,7 @@
         in addition it also disables menu-bar, tool-bar, scroll-bars,
         tool-tips, and the blinking cursor.
         (command-line-1): Skip startup screen if -Q.
-        (fancy-splash-head): Use :align-to center prop to center splash image.
+        (fancy-splash-head): Use ":align-to center" prop to center splash image.
 
         * emulation/cua-base.el (cua-read-only-cursor-color)
         (cua-overwrite-cursor-color, cua-global-mark-cursor-color): Doc fix.
@@ -160,6 +213,10 @@
         * progmodes/python.el (run-python): Use compilation-shell-minor-mode.
         Set compilation-error-regexp-alist earlier.
 
+        * progmodes/compile.el (compilation-minor-mode-map)
+        (compilation-shell-minor-mode-map, compile-mouse-goto-error)
+        (compile-goto-error): Re-merge the mouse and non-mouse commands.
+
 2004-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/compile.el (compile-goto-error): Select the buffer/window
diff --git a/src/ChangeLog b/src/ChangeLog
index d2c53d913f3..ae4aa212bda 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -26,6 +26,10 @@
         * xdisp.c (try_scrolling): Make sure `scroll-conservatively' is
         not too large before computing how much to scroll.
 
+2004-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dired.c (Ffile_attributes): Don't pass extra nil arg to file-handler.
+
 2004-04-14  Luc Teirlinck  <teirllm@auburn.edu>
 
         * fileio.c (Fverify_visited_file_modtime, Fvisited_file_modtime):
@@ -58,6 +62,11 @@
         centering_position = 0.
         Clear desired matrix before retrying with centering_position = 0.
 
+2004-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * syntax.c (scan_lists): Simplify backward string scan.
+        Fix off-by-one boundary check for string and comment fences.
+
 2004-04-13  Joe Buehler  <jbuehler@hekimian.com>
 
         * sheap.c, unexcw.c: New files.