*** empty log message ***

2 files changed, 17 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee4f2e764a..ee7bef7850 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2000-02-20  Gerd Moellmann  <[email protected]>
+
+	* dired.el (dired-mode): Call propertized-buffer-identification
+	to set mode-line-buffer-identification to something having
+	the right text properties.
+
+	* bindings.el (propertized-buffer-identification): New function.
+
 2000-02-20  Dave Love  <[email protected]>
 
 	* frame.el (display-mouse-p): Use variable xterm-mouse-mode and
@@ -201,11 +209,9 @@
 	bibtex.el directly.  Instead the hideshow package can be used.
 	Added a special bibtex entry to hs-special-modes-alist.
 	(bibtex-hs-forward-sexp): Added for hideshow.el.
->>>>>>> 1.389
 
 2000-02-15  Dirk Herrmann  <[email protected]>
 
-<<<<<<< ChangeLog
         * textmodes/bibtex.el (bibtex-mode): Replaced manual splitting of path
         at ':' characters by call to split-string.
 
@@ -338,10 +344,7 @@
 
 2000-02-15  Dirk Herrmann  <[email protected]>
 
-        * bibtex.el (bibtex-entry-field-alist): Added booktitle field to
-=======
 	* bibtex.el (bibtex-entry-field-alist): Added booktitle field to
->>>>>>> 1.389
 	proceedings entry type (for cross referencing). Thanks to Wagner
 	Toledo Correa for the suggestion.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 50d9730beb..e7ba55229b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2000-02-19  Gerd Moellmann  <[email protected]>
+
+	* eval.c (funcall_lambda): Don't bind Qmocklisp_arguments unless
+	Vmocklisp_arguments is nil.  Inline Fcar and Fcdr.
+	(specbind, unbind_to): Handle most common case of non-constant
+	symbol with trivial value specially.
+
+	* bytecode.c (Fbyte_code) <Bvarset>: Inline most common case.
+
 2000-02-20  Richard M. Stallman  <[email protected]>
 
 	* data.c (Fmake_variable_buffer_local): Doc fix.