merge trunk

1 files changed, 34 insertions, 16 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 1a7eb82967d..2b934741c2c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -23,18 +23,36 @@ so we will look at it and add it to the manual.
 
 * Installation Changes in Emacs 24.3
 
+---
+** The default toolkit has been changed to Gtk+ version 3.
+If you don't pass --with-x-toolkit to configure or if you pass
+--with-x-toolkit=gtk or --with-x-toolkit=yes, configure will try to build
+with Gtk+ version 3, and if that fails, try Gtk+ version 2.
+You can explicitly require a specific version by passing
+--with-x-toolkit=gtk2 or --with-x-toolkit=gtk3 to configure.
+
+---
 ** New configure option '--without-all' to disable additional features.
 This disables most of the features that are normally enabled by default.
 
+---
 ** New configure option '--enable-link-time-optimization' to utilize
 an appropriate feature provided by GCC since version 4.5.0.
 
+---
 ** New configure option '--enable-gcc-warnings', intended for developers.
 If building with GCC, this enables compile-time checks that warn about
 possibly-questionable C code.  On a recent GNU system there should be
 no warnings; on older and on non-GNU systems the generated warnings
 may be useful.
 
+---
+** The configuration option '--enable-use-lisp-union-type' has been
+renamed to '--enable-check-lisp-object-type', as the resulting
+Lisp_Object type no longer uses a union to implement the compile time
+check that this option enables.
+
+---
 ** The configure option '--disable-maintainer-mode' has been removed,
 as it was confusingly-named and rarely useful.
 
@@ -60,18 +78,10 @@ directories to the search path.  You must add them yourself if you want them.
 (from the bin and libexec directories, respectively).  The former is
 no longer relevant, the latter is replaced by lisp (in vc-sccs.el).
 
-** The configuration option '--enable-use-lisp-union-type' has been
-renamed to '--enable-check-lisp-object-type', as the resulting
-Lisp_Object type no longer uses a union to implement the compile time
-check that this option enables.
-
 ---
-** The default toolkit has been changed to Gtk+ version 3.
-If you don't pass --with-x-toolkit to configure or if you pass
---with-x-toolkit=gtk or --with-x-toolkit=yes, configure will try to build
-with Gtk+ version 3, and if that fails, try Gtk+ version 2.
-You can explicitly require a specific version by passing
---with-x-toolkit=gtk2 or --with-x-toolkit=gtk3 to configure.
+** The native Windows user interface is available for Cygwin.  Passing
+--with-w32 will configure a Cygwin emacs to use the Windows user
+interface instead of the default, X11.
 
 
 * Startup Changes in Emacs 24.3
@@ -160,8 +170,6 @@ On encountering a fatal error, Emacs now outputs a textual description
 of the fatal signal, and a short backtrace on platforms like glibc
 that support backtraces.
 
-** `message-log-max' now defaults to 1000, not 100.
-
 ---
 ** If your Emacs was built from a bzr checkout, the new variable
 `emacs-bzr-version' contains information about the bzr revision used.
@@ -280,14 +288,16 @@ Use `Buffer-menu-name-width' and `Buffer-menu-size-width' instead.
 
 ** Calendar
 
++++
 *** You can customize the header text that appears above each calendar month.
 See the variable `calendar-month-header'.
 
 +++
 *** New LaTeX calendar style, produced by `cal-tex-cursor-week2-summary'.
 
++++
 *** The calendars produced by cal-html include holidays.
-Customize cal-html-holidays to change this.
+Customize `cal-html-holidays' to change this.
 
 ** CL
 
@@ -421,6 +431,9 @@ The option `follow-intercept-processes' has been removed.
 specifying URL types which should be converted to remote file names at
 the FFAP prompt.  The default is now '("ftp").
 
+** Generic-x
+`javascript-generic-mode' is now an obsolete alias for `js-mode'.
+
 ** Ibuffer
 
 *** New `derived-mode' filter, bound to `/ M'.
@@ -703,7 +716,7 @@ are deprecated and will be removed eventually.
 *** `compile-internal'
 *** `mode-line-inverse-video'
 *** `cvs-commit-buffer-require-final-newline'
-(use `'log-edit-require-final-newline'instead)
+(use `log-edit-require-final-newline' instead)
 *** `cvs-changelog-full-paragraphs'
 (use `log-edit-changelog-full-paragraphs' instead)
 *** `cvs-diff-ignore-marks', `cvs-diff-buffer-name'
@@ -832,7 +845,7 @@ macro-calls to be left for later expansion (as before), but will also
 result in a warning ("Eager macro-expansion skipped due to cycle")
 describing the cycle.
 
-** Misc new functions:
+** Miscellaneous new functions:
 
 *** `autoloadp'
 *** `autoload-do-load'.
@@ -877,6 +890,11 @@ is detected.
 Emacs now supports mouse highlight, help-echo (in the echo area), and
 mouse-autoselect-window.
 
+** Two new functions are available in Cygwin builds of Emacs:
+cygwin-convert-path-from-windows and cygwin-convert-path-to-windows.
+These functions allow Lisp code to access the Cygwin file-name mapping
+machinery to convert between Cygwin and Windows-native file names.
+
 ** On MS-Windows Vista and later Emacs now supports symbolic links.
 
 * Changes in Emacs 24.2