Merge from mainline.

3 files changed, 33 insertions, 12 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index b9e409e8783..24f44b9d0e8 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-22  Noah Friedman  <friedman@splode.com>
+
+        * emacs-buffer.gdb: Add trailing underscores to appropriate member
+        names, per change tromey@redhat.com-20110214153919-bxkckrdmmg4qhyyj
+        of src/lisp.h.
+
+2011-04-08  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * NEWS: Document new function `vc-ediff'.
+
 2011-04-06  Juanma Barranquero  <lekktu@gmail.com>
 
         * NEWS: New variable `revert-buffer-in-progress-p'.
diff --git a/etc/NEWS b/etc/NEWS
index 69540fa1f54..09d54c41d69 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -134,7 +134,7 @@ image formats in Emacs.  By default, Emacs links with the ImageMagick
 libraries if they are present at build time.  This needs ImageMagick
 6.2.8 or newer (versions newer than 6.0.7 _may_ work but have not been
 tested).  To disable ImageMagick support, use the configure option
-`--without-imagemagick'.  
+`--without-imagemagick'.
 
 The new function `imagemagick-types' returns a list of image file
 extensions that your installation of ImageMagick supports.  The
@@ -370,6 +370,8 @@ $ESHELL nor variable `explicit-shell-file-name' is set.
 
 * Changes in Specialized Modes and Packages in Emacs 24.1
 
+** comint and modes derived from it use the generic completion code.
+
 ** The compile.el mode can be used without font-lock-mode.
 `compilation-parse-errors-function' is now obsolete.
 
@@ -672,6 +674,9 @@ use this to display the full log entry for the revision at point.
 **** Packages using Log View mode can enable this functionality by
 binding `log-view-expanded-log-entry-function' to a suitable function.
 
+*** New command `vc-ediff' allows visual comparison of two revisions
+of a file similar to `vc-diff', but using ediff backend.
+
 ** Miscellaneous
 
 ---
@@ -715,6 +720,13 @@ soap-inspect.el is an interactive inspector for SOAP WSDL structures.
 
 * Incompatible Lisp Changes in Emacs 24.1
 
+---
+** `char-direction-table' and the associated function `char-direction'
+were deleted.  They were buggy and inferior to the new support of
+bidirectional editing introduced in Emacs 24.  If you need the
+bidirectional properties of a character, use `get-char-code-property'
+with the last argument `bidi-class'.
+
 ** `copy-directory' now copies the source directory as a subdirectory
 of the target directory, if the latter is an existing directory.  The
 new optional arg COPY-CONTENTS, if non-nil, makes the function copy
diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb
index 14a7615801c..d4eecc9f8ef 100644
--- a/etc/emacs-buffer.gdb
+++ b/etc/emacs-buffer.gdb
@@ -3,10 +3,6 @@
 # Copyright (C) 2005-2011 Free Software Foundation, Inc.
 
 # Maintainer: Noah Friedman <friedman@splode.com>
-# Status: Works with Emacs 22.0.51.1 (prerelease) as of 2006-01-12.
-#         Older cvs snapshots, and released versions, will not work due to
-#         changes in lisp data structures.  But there are older versions of
-#         this gdb script which work with those versions.
 # Created: 2005-04-28
 
 # This file is part of GNU Emacs.
@@ -37,6 +33,10 @@
 # `ysave-buffer', and `ybuffer-contents'.  The `y' prefix avoids any
 # namespace collisions with emacs/src/.gdbinit.
 
+# Since the internal data structures in Emacs occasionally from time to
+# time, you should use the version of this file that came with your
+# particular Emacs version; older versions might not work anymore.
+
 # Example usage:
 #
 #     $ gdb /export/src/emacs/2005-05-02--03-17/src/emacs core.emacs.6.9845
@@ -107,16 +107,16 @@ define ybuffer-list
     ygetptr $buf
     set $buf = (struct buffer *) $ptr
 
-    if ! ($files_only && $buf->filename == Qnil)
-      ygetptr $buf->name
+    if ! ($files_only && $buf->filename_ == Qnil)
+      ygetptr $buf->name_
       set $name = ((struct Lisp_String *) $ptr)->data
       set $modp = ($buf->text->modiff > $buf->text->save_modiff) ? '*' : ' '
 
-      ygetptr $buf->mode_name
+      ygetptr $buf->mode_name_
       set $mode = ((struct Lisp_String *) $ptr)->data
 
-      if $buf->filename != Qnil
-        ygetptr $buf->filename
+      if $buf->filename_ != Qnil
+        ygetptr $buf->filename_
         printf "%2d %c  %9d %-20s %-10s %s\n", \
                $i, $modp, ($buf->text->z_byte - 1), $name, $mode, \
                ((struct Lisp_String *) $ptr)->data
@@ -193,7 +193,7 @@ document yget-buffer-pointers
 end
 
 define yget-current-buffer-name
-  set $this = $ycurrent_buffer->name
+  set $this = $ycurrent_buffer->name_
   ygetptr $this
   set $ycurrent_buffer_name = ((struct Lisp_String *) $ptr)->data
 end
@@ -267,4 +267,3 @@ end
 # local variables:
 # mode: gdb-script
 # end:
-