2 files changed, 74 insertions, 73 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index effae29fc8f..90b17f7a14f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -72,12 +72,11 @@
         (replace-regexp): Explain `\,', `\#' and `\?'.
         (replace-match-data): New function for thorough reuse/destruction
         of old match-data.
-        (replace-match-maybe-edit): Function for implementing `\?'
-        editing.
+        (replace-match-maybe-edit): Function for implementing `\?' editing.
         (perform-replace): Fix maintaining of the match stack including
         already matched regions, implement `\?', fix various problems
         with regions while editing and other stuff.
-        (replace-highlight): Simplified.
+        (replace-highlight): Simplify.
 
 2004-06-24  Daniel Pfeiffer  <occitan@esperanto.org>
 
@@ -104,8 +103,7 @@
 
 2004-06-21  Juanma Barranquero  <lektu@terra.es>
 
-        * image.el (image-library-alist): Rewrite docstring in active
-        voice.
+        * image.el (image-library-alist): Rewrite docstring in active voice.
 
 2004-06-20  Richard M. Stallman  <rms@gnu.org>
 
@@ -132,8 +130,8 @@
 
 2004-06-18  Luc Teirlinck  <teirllm@auburn.edu>
 
-        * autorevert.el (global-auto-revert-non-file-buffers): Update
-        docstring.
+        * autorevert.el (global-auto-revert-non-file-buffers):
+        Update docstring.
 
 2004-06-19  Daniel Pfeiffer  <occitan@esperanto.org>
 
@@ -154,7 +152,7 @@
         escaped character is n or t.
         (query-replace-regexp): Add \, and \# interpretation to
         interactive call and document it.
-        (query-replace-regexp-eval, replace-match-string-symbols): add \#
+        (query-replace-regexp-eval, replace-match-string-symbols): Add \#
         as shortkey for replace-count.
         (replace-quote): New function for doubling backslashes.
 
@@ -184,8 +182,8 @@
         * dired-aux.el (dired-do-redisplay, dired-maybe-insert-subdir):
         Add hyperlink to emacs-xtra manual to docstring.
 
-        * autorevert.el (global-auto-revert-non-file-buffers): Add
-        hyperlink to emacs-xtra manual to docstring, as well as an
+        * autorevert.el (global-auto-revert-non-file-buffers):
+        Add hyperlink to emacs-xtra manual to docstring, as well as an
         info-link.
 
 2004-06-14  Juanma Barranquero  <lektu@terra.es>
@@ -204,8 +202,7 @@
         * international/code-pages.el (windows-1256, cp1125): Fix tables
         for several characters.
 
-        * international/utf-8.el (ccl-encode-mule-utf-8): Fix previous
-        change.
+        * international/utf-8.el (ccl-encode-mule-utf-8): Fix previous change.
 
 2004-06-13  Richard M. Stallman  <rms@gnu.org>
 
@@ -251,14 +248,13 @@
 
 2004-06-13  Kenichi Handa  <handa@m17n.org>
 
-        * international/utf-8.el (ccl-decode-mule-utf-8): Fix previous
-        change.
+        * international/utf-8.el (ccl-decode-mule-utf-8): Fix previous change.
         (ccl-untranslated-to-ucs): Fix typo.
 
 2004-06-12  Karl Chen  <quarl@hkn.eecs.berkeley.edu>  (tiny change)
 
-        * progmodes/python.el (python-open-block-statement-p): Fix
-        indentation after a block opening that contains a comment.
+        * progmodes/python.el (python-open-block-statement-p):
+        Fix indentation after a block opening that contains a comment.
 
 2004-06-12  J,Ai(Br,At(Bme Marant  <jerome@marant.org>  (tiny change)
 
@@ -274,11 +270,10 @@
 
 2004-06-12  Kenichi Handa  <handa@m17n.org>
 
-        * international/mule-cmds.el (set-language-environment): Load
-        subst tables if necessary.
+        * international/mule-cmds.el (set-language-environment):
+        Load subst tables if necessary.
 
-        * international/mule.el (decode-char): Load subst tables if
-        necessary.
+        * international/mule.el (decode-char): Load subst tables if necessary.
         (encode-char): Likewise.
 
         * international/utf-16.el (utf-16-decode-ucs): Handle a surrogate
@@ -294,18 +289,17 @@
         (utf-16-decode-to-ucs): Handle pre-read character.
         (utf-16le-encode-loop): Handle surrogate pair.
         (utf-16be-encode-loop): Likewise.
-        (ccl-encode-mule-utf-16le-with-signature): Adjusted for the change
+        (ccl-encode-mule-utf-16le-with-signature): Adjust for the change
         of utf-16le-encode-loop.
-        (ccl-encode-mule-utf-16be-with-signature): Adjusted for the change
+        (ccl-encode-mule-utf-16be-with-signature): Adjust for the change
         of utf-16be-encode-loop.
-        (mule-utf-16-post-read-conversion): Call
-        utf-8-post-read-conversion at first.
-        (mule-utf-16[{le|be}], mule-utf-16{le|be}-with-signature): Include
-        CJK charsets in safe-charsets if utf-translate-cjk-mode is on.
+        (mule-utf-16-post-read-conversion):
+        Call utf-8-post-read-conversion at first.
+        (mule-utf-16[{le|be}], mule-utf-16{le|be}-with-signature):
+        Include CJK charsets in safe-charsets if utf-translate-cjk-mode is on.
         Add post-read-conversion and pre-write-conversion.
 
-        * international/utf-8.el (utf-translate-cjk-charsets): New
-        variable.
+        * international/utf-8.el (utf-translate-cjk-charsets): New variable.
         (utf-translate-cjk-unicode-range): New variable.
         (utf-translate-cjk-load-tables): New function.
         (utf-lookup-subst-table-for-decode): New function.
@@ -320,10 +314,10 @@
         (ccl-untranslated-to-ucs): Handle 2-byte encoding.  Set r1 to the
         length of encoding.  Don't return r0.
         (utf-8-compose): New arg hash-table.  Handle 2-byte encoding.
-        (utf-8-post-read-conversion): Narrow to region properly.  If
-        utf-translate-cjk-mode is on, load tables if necessary.  Call
-        utf-8-compose with hash-table arg if necessary.  Call
-        XXX-compose-region instead of XXX-post-read-convesion.
+        (utf-8-post-read-conversion): Narrow to region properly.
+        If utf-translate-cjk-mode is on, load tables if necessary.
+        Call utf-8-compose with hash-table arg if necessary.
+        Call XXX-compose-region instead of XXX-post-read-convesion.
         (utf-8-pre-write-conversion): New function.
         (mule-utf-8): Include CJK charsets in safe-charsets if
         utf-translate-cjk-mode is on.  Add pre-write-conversion.
@@ -331,8 +325,8 @@
         * international/characters.el: Temporarily set
         utf-translate-cjk-mode to nil.
 
-        * language/devan-util.el (devanagari-compose-region): Add
-        autoload cookie.
+        * language/devan-util.el (devanagari-compose-region):
+        Add autoload cookie.
 
         * international/ccl.el (ccl-dump-call): Fix printing the
         subroutine name.
@@ -342,13 +336,12 @@
         * dired.el (dired-revert): If buffer is marked unmodified before
         reverting, keep it marked unmodified.
         Adapt to new conventions for commenting out code.
-        (dired-make-relative): Adapt to new conventions for commenting out
-        code.
+        (dired-make-relative): Adapt to new conventions for commenting out code.
 
 2004-06-10  Miles Bader  <miles@gnu.ai.mit.edu>
 
-        * eshell/esh-module.el (eshell-load-defgroups): Bind
-        `vc-handled-backends' to nil when opening files.
+        * eshell/esh-module.el (eshell-load-defgroups):
+        Bind `vc-handled-backends' to nil when opening files.
 
 2004-06-11  Juanma Barranquero  <lektu@terra.es>
 
@@ -431,15 +424,15 @@
         or incorrect, autoloads.
 
         * dired-aux.el (dired-kill-tree): Do not kill DIRNAME, even if it
-        does not end in a slash.  Add optional argument KILL-ROOT.  Update
-        docstring.
+        does not end in a slash.  Add optional argument KILL-ROOT.
+        Update docstring.
         (dired-do-touch, dired-clean-directory, dired-run-shell-command)
         (dired-query): Add autoloads.
 
 2004-06-08  Daniel Pfeiffer  <occitan@esperanto.org>
 
-        * progmodes/compile.el (compilation-set-window-height): Rearrange
-        the save-* functions because a buffer can have several current
+        * progmodes/compile.el (compilation-set-window-height):
+        Rearrange the save-* functions because a buffer can have several current
         point in different windows.
         (compilation-error-regexp-alist-alist): Recognize {standard input}
         GNU messages (for gcc --pipe) and more kinds of Oracle messages.
@@ -479,8 +472,7 @@
 
         * format.el (format-insert-annotations)
         (format-annotate-location): Doc fixes.
-        (format-subtract-regions): Make arguments match their use in
-        docstring.
+        (format-subtract-regions): Make arguments match their use in docstring.
 
         * simple.el (kill-region): Doc fix.
 
@@ -566,8 +558,7 @@
         Handle `dired-subdir-switches'.
         (dired-hide-subdir, dired-hide-all): Do not mark buffer modified.
 
-        * dired.el (dired-subdir-switches, dired-switches-alist):
-        New vars.
+        * dired.el (dired-subdir-switches, dired-switches-alist): New vars.
         (dired-insert-old-subdirs): Do not repeatedly delete and reinsert
         subdirs if -R switch is used for a subdir.
         (dired-mode): Set `dired-switches-alist'.
@@ -600,7 +591,7 @@
 
 2004-06-04  Mario Lang  <mlang@delysid.org>
 
-        * battery.el (battery-linux-proc-acpi): mA was hardcored, but some
+        * battery.el (battery-linux-proc-acpi): `mA' was hardcored, but some
         systems appear to use mW, make the code handle this.  Fix a
         division-by-zero bug while at it, and handle kernels with
         a slightly different layout in /proc/acpi.
@@ -610,7 +601,7 @@
         * vc-svn.el (vc-svn-checkin): Use 'nconc' instead of 'list*',
         because the latter is a CL-ism.  This fixes the bug reported by
         Shawn Boyette <mdxi@collapsar.net> in
-        http://lists.gnu.org/archive/html/emacs-devel/2004-05/msg00442.html.
+        http://lists.gnu.org/archive/html/emacs-devel/2004-05/msg00442.html.
 
 2004-06-04  Miles Bader  <miles@gnu.org>
 
@@ -647,8 +638,8 @@
 
         * subr.el (read-number): Use canonical format for default in prompt.
 
-        * minibuf-eldef.el (minibuffer-default-in-prompt-regexps): Add
-        regexp for " [...]" style defaults.
+        * minibuf-eldef.el (minibuffer-default-in-prompt-regexps):
+        Add regexp for " [...]" style defaults.
 
 2004-06-02  Romain Francoise  <romain@orebokech.com>
 
@@ -671,14 +662,28 @@
         empty docstring.
 
         * international/mule.el (register-char-codings): Make alias for
-        `ignore'.  Move docstring to obsolescence info and remove
-        redundancy.
+        `ignore'.  Move docstring to obsolescence info and remove redundancy.
 
 2004-06-02  Kim F. Storm  <storm@cua.dk>
 
         * frame.el (blink-cursor-start): Turn cursor off initially so blink
         starts after blink-cursor-delay rather than 2*blink-cursor-delay.
 
+2004-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * comint.el (comint-replace-by-expanded-history-before-point):
+        Obey `start' as the docstring says.
+        (comint-send-input, comint-snapshot-last-prompt, comint-output-filter)
+        (comint-update-fence): Prevent font-lock from running unnecessarily.
+        (comint-dynamic-list-completions): Use with-current-buffer.
+
+2004-06-01  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
+
+        * textmodes/bibtex.el (bibtex-format-entry): Fix regexps.
+        (bibtex-parse-strings): Bugfix, use assoc instead of assoc-string.
+        (bibtex-entry-update): Handle alternatives and optional fields.
+        (bibtex-parse-entry): Bugfix, handle empty key.
+
 2004-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * vc-arch.el (vc-arch-state): Don't assume the file exists.
diff --git a/src/ChangeLog b/src/ChangeLog
index 4cf1625ebcb..9419cd23073 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -9,7 +9,7 @@
         * lisp.h: Declare Finit_image_library.
 
 2004-06-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
-        
+
         * macterm.c (do_window_activate, do_window_deactivate): Remove.
         (XTread_socket): Send mouse button events to the toolbox
         dispatcher even when the mouse is grabbed.  Don't process window
@@ -70,8 +70,7 @@
         a buffer, add the buffer as last element to the match data.
         (Fset_match_data): If an additional element of the match-data is a
         buffer, restore it to last_thing_searched.
-        (save_search_regs): Save last_thing_searched as part of the match
-        data.
+        (save_search_regs): Save last_thing_searched as part of the match data.
         (restore_match_data): Restore it again.
 
 2004-06-23  Luc Teirlinck  <teirllm@auburn.edu>
@@ -197,7 +196,7 @@
 2004-06-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (xg_get_image_for_pixmap): New function.
-        (xg_get_gdk_pixmap_and_mask): Removed.
+        (xg_get_gdk_pixmap_and_mask): Remove.
         (update_frame_tool_bar): Call xg_get_image_for_pixmap instead of
         xg_get_gdk_pixmap_and_mask.
 
@@ -218,8 +217,7 @@
         list of possible filenames.
         (init_xpm_functions, init_png_functions, init_jpeg_functions)
         (init_tiff_functions, init_gif_functions): Use `w32_delayed_load'.
-        (CHECK_LIB_AVAILABLE): Call `define_image_library' with new
-        argument.
+        (CHECK_LIB_AVAILABLE): Call `define_image_library' with new argument.
         (Finit_image_library): New function, extracted from `init_image'.
         Try to initialize an image library on demand and cache whether we
         were successful or not.
@@ -343,7 +341,7 @@
         (merge_face_ref, face_at_buffer_position, face_at_string_position):
         Use `merge_named_face'.
         (merge_face_inheritance): Function removed.
-        (merge_face_ref): Renamed from `merge_face_vector_with_property'.
+        (merge_face_ref): Rename from `merge_face_vector_with_property'.
         Add new `err_msgs' and `named_merge_points' args.  Return error
         status.  Only print error messages if ERR_MSGS is true.  Don't try to
         do :inherit attribute validation.
@@ -403,8 +401,8 @@
 
         * xfaces.c (x_supports_face_attributes_p): Make this function
         conditional on HAVE_WINDOW_SYSTEM.
-        (Fdisplay_supports_face_attributes_p) [HAVE_WINDOW_SYSTEM]: Don't
-        call x_supports_face_attributes_p if it was not compiled in.
+        (Fdisplay_supports_face_attributes_p) [HAVE_WINDOW_SYSTEM]:
+        Don't call x_supports_face_attributes_p if it was not compiled in.
 
 2004-06-04  Miles Bader  <miles@gnu.org>
 
@@ -435,6 +433,8 @@
 
 2004-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * eval.c (Fcondition_case): Fix usage.  Simplify.
+
         * mem-limits.h (EXCEEDS_LISP_PTR) [USE_LSB_TAG]: Never true.
 
 2004-05-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
@@ -443,8 +443,7 @@
         [MAC_OSX]: Don't include QuickTime/QuickTime.h.
         [!MAC_OSX]: Don't include alloca.h, Windows.h, Gestalt.h, or
         TextUtils.h.
-        (Fx_create_frame): Sync with xfns.c.  Initialize cursor
-        descriptors.
+        (Fx_create_frame): Sync with xfns.c.  Initialize cursor descriptors.
         (Fx_display_mm_height, Fx_display_mm_width): Calculate length from
         display height/width.
         (compute_tip_xy, Vx_max_tooltip_size): Declare.
@@ -455,8 +454,7 @@
 
         * macgui.h [!MAC_OSX]: Include Gestalt.h.
         (Cursor, No_Cursor): New defines.
-        [!TARGET_API_MAC_CARBON] (SetPortWindowPort): New compatibility
-        macro.
+        [!TARGET_API_MAC_CARBON] (SetPortWindowPort): New compatibility macro.
         [!TARGET_API_MAC_CARBON] (arrow_cursor): Declare.
 
         * macmenu.c (mac_menu_show, mac_dialog): Use SetPortWindowPort.
@@ -484,11 +482,9 @@
         (x_scroll_bar_handle_click): Set `(PORTION . WHOLE)' part in a
         scroll-bar click event.
         (mac_define_frame_cursor): Change the pointer shape.
-        (x_free_frame_resources): Reset tip_window to NULL when it is
-        disposed.
+        (x_free_frame_resources): Reset tip_window to NULL when it is disposed.
         [!TARGET_API_MAC_CARBON] (arrow_cursor): New variable.
-        [!TARGET_API_MAC_CARBON] (do_init_managers): Initialize
-        arrow_cursor.
+        [!TARGET_API_MAC_CARBON] (do_init_managers): Initialize arrow_cursor.
         (do_window_update): Don't do anything if the updated window is the
         tooltip window.
         (do_mouse_moved): Handle mouse movement events here (previously in
@@ -496,8 +492,8 @@
         dpyinfo->mouse_face_hidden is set.
         (do_os_event, do_events): Remove (now in XTread_socket).
         (XTread_socket): Immediately return if interrupt_input_blocked.
-        Loop until all the events in the queue are processed.  Rearrange
-        codes for mouse grabbing.  Add tooltip support.  Include the
+        Loop until all the events in the queue are processed.
+        Rearrange codes for mouse grabbing.  Add tooltip support.  Include the
         contents of do_os_event and do_events.  Remove mouse movement
         handling (now in do_mouse_moved).  Add the case where
         Vmouse_highlight has an integer value.
@@ -506,8 +502,8 @@
         excess initializations.
         (make_mac_terminal_frame): Previous initializations in
         make_mac_frame are moved here.
-        (mac_initialize_display_info): Initialize
-        dpyinfo->mouse_face_overlay and dpyinfo->mouse_face_hidden.
+        (mac_initialize_display_info):
+        Initialize dpyinfo->mouse_face_overlay and dpyinfo->mouse_face_hidden.
 
         * xdisp.c [MAC_OS] (No_Cursor): Remove variable.
         (define_frame_cursor1): Don't treat HAVE_CARBON as a special case.