From: Gerd Moellmann <gerd@gnu.org>
Date: Sat, 1 Jan 2000 17:25:11 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~5561
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=27189709c1442468297e1814943e5df77212995f;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 032ede03339..4edf9b8b164 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,14 @@
 2000-01-01  Gerd Moellmann  <gerd@gnu.org>
 
+	* image.el (create-image, defimage): Don't assume image data is a
+	string.
+
 	* image.el (defimage): Handle specifications containing :data
 	instead of :file.
 	(image-type-from-data): New function.
 	(image-type-from-file-header): Use it.
 	(create-image): Add parameter DATA-P.
-
+	
 1999-12-31  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
 
 	* echistory.el (electric-command-history): Call Command-history-setup
diff --git a/src/ChangeLog b/src/ChangeLog
index 93127f9b505..6bf58257216 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,22 @@
 2000-01-01  Gerd Moellmann  <gerd@gnu.org>
 
+	* syntax.c (Fforward_word): Undo previous change.
+
+	* editfns.c (Fconstrain_to_field): Don't constrain if
+	inhibit-field-text-motion is non-nil.
+	(Fline_beginning_position): Undo previous change.
+	(Fline_end_position): Ditto.
+
+	* syntax.c (Fforward_word): Notice field boundaries only if
+	inhibit-field-text-motion is nil.
+
+	* lisp.h: Add extern declaration for Vinhibit_field_text_motion.
+
+	* editfns.c (Vinhibit_field_text_motion): New variable.
+	(inhibit-field-text-motion): New DEFVAR_LISP.
+	(Fline_beginning_position, Fline_end_position): Notice field
+	boundaries only if inhibit-field-text-motion is nil.
+
 	* xfns.c (x_create_x_image_and_pixmap): Remove parameter FILE.
 	All calls adjusted.
 	(x_build_heuristic_mask): Likewise.