]> code.delx.au - gnu-emacs/commitdiff
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-42
authorMiles Bader <miles@gnu.org>
Fri, 10 Mar 2006 23:46:54 +0000 (23:46 +0000)
committerMiles Bader <miles@gnu.org>
Fri, 10 Mar 2006 23:46:54 +0000 (23:46 +0000)
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 144-147)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 56)

   - Update from CVS

1  2 
etc/TODO
lisp/ChangeLog
lisp/gnus/gnus-start.el
src/ChangeLog
src/alloc.c

diff --cc etc/TODO
Simple merge
diff --cc lisp/ChangeLog
index 989f803b7fdd0b42172ac9ed64ba1cce299a671b,96aae2ec1c4a97935407acc4a67fd79013a420d3..bb70c0820a3607655f2dbe22c81f50fdc61f48b3
@@@ -1,3 -1,38 +1,32 @@@
 -2006-03-10  Chong Yidong  <cyd@stupidchicken.com>
 -
 -      * files.el (hack-local-variables-confirm): Don't prompt for ! if
 -      enable-local-variables is set to always query, or there is no
 -      savable variable.
 -
+ 2006-03-10  Bill Wohler  <wohler@newt.com>
+       * image.el (image-load-path-for-library): Merge at least three
+       functions from Gnus and MH-E into this one function that can now
+       be shared.
+ 2006-03-11  Nick Roberts  <nickrob@snap.net.nz>
+       * progmodes/gdb-ui.el (gdb-remove-text-properties): Rename from
+       gdb-remove-mouse-face and remove help-echo too.
+       (gdb-enqueue-input): Correct conditional clause.
+       
+ 2006-03-10  Glenn Morris  <rgm@gnu.org>
+       * calendar/calendar.el (calendar-holidays): Doc fix.
+       * calendar/holidays.el (list-holidays): Doc fix.
+ 2006-03-10  Nick Roberts  <nickrob@snap.net.nz>
+       * progmodes/gdb-ui.el (gdba): Don't call gdb-init-1 explicitly as
+       it gets called in gdb-prompt anyway.
+       (gdb-use-separate-io-buffer): Only restore window arrangement for
+       gdb-many-windows.
+       (gdb-enqueue-input): Make it harder to send GDB input when program
+       is running.
+       (gdb-buffer-list): New variable.
+       (gdb-remove-mouse-face): New function.
+       (gdb-starting): Use it when GDB input won't get sent.
  2006-03-08  Juanma Barranquero  <lekktu@gmail.com>
  
        * help.el (view-lossage): Remove trailing whitespace before
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/alloc.c
Simple merge