*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 36238c243d161da0c83eee765e3e8d053487c4a1..892022d3177ac1e191b427f624aab892bc7542b3 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3464,6 +3464,25 @@ display tables.
 * Lisp Changes in Emacs 22.1
 
 ** General Lisp changes:
+*** New syntax: \s now stands for the SPACE character.
+
+`?\s' is a new way to write the space character.  You must make sure
+it is not followed by a dash, since `?\s-...' indicates the "super"
+modifier.  However, it would be strange to write a character constant
+and a following symbol (beginning with `-') with no space between
+them.
+
+`\s' stands for space in strings, too, but it is not really meant for
+strings; it is easier and nicer just to write a space.
+
+*** New syntax: \uXXXX and \UXXXXXXXX specify Unicode code points in hex.
+
+For instance, you can use "\u0428" to specify a string consisting of
+CYRILLIC CAPITAL LETTER SHA, or `"U0001D6E2" to specify one consisting
+of MATHEMATICAL ITALIC CAPITAL ALPHA (the latter is greater than
+#xFFFF and thus needs the longer syntax).
+
+This syntax works for both character constants and strings.
 
 *** The function `expt' handles negative exponents differently.
 The value for `(expt A B)', if both A and B are integers and B is
@@ -3674,12 +3693,6 @@ variable `customize-package-emacs-version-alist'.
 
 ** String changes:
 
-*** The escape sequence \s is now interpreted as a SPACE character.
-
-Exception: In a character constant, if it is followed by a `-' in a
-character constant (e.g. ?\s-A), it is still interpreted as the super
-modifier.  In strings, \s is always interpreted as a space.
-
 *** A hex escape in a string constant forces the string to be multibyte.
 
 *** An octal escape in a string constant forces the string to be unibyte.
@@ -3700,12 +3713,6 @@ text properties.
 `assoc-ignore-representation', which are still available, but have
 been declared obsolete.
 
-*** New syntax: \uXXXX and \UXXXXXXXX specify Unicode code points in hex.
-Use "\u0428" to specify a string consisting of CYRILLIC CAPITAL LETTER SHA,
-or "\U0001D6E2" to specify one consisting of MATHEMATICAL ITALIC CAPITAL
-ALPHA (the latter is greater than #xFFFF and thus needs the longer
-syntax).  Also available for characters.
-
 ** Displaying warnings to the user.
 
 See the functions `warn' and `display-warning', or the Lisp Manual.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7659611611ee0630363f2067c5540dc3de6fa272..f4ad45615bb5a6253dd703f2c17409d5a5c271af 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-28  Richard Stallman  <rms@gnu.org>
+
+       * progmodes/sh-script.el (sh-mode): Recognize .profile as sh style.
+
 2007-04-28  Nick Roberts  <nickrob@snap.net.nz>
 
        * progmodes/gud.el (gud-menu-map): Pdb can't handle SIGINT so

diff --git a/src/ChangeLog b/src/ChangeLog
index 22055a99973079a9b2490934704184175525a6c1..25f3236bf7065f51e3384e18b1852ace1f378968 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-28  Richard Stallman  <rms@gnu.org>
+
+       * lread.c (read_escape): In a string, \s is always space.
+
 2007-04-27  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xmenu.c (xdialog_show): Call Fredisplay before showing the dialog.