upstream

1 files changed, 51 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fdf25af86ee..0a65a759b7f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,51 @@
+2012-02-07  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-engine.el (c-forward-objc-directive): Prevent
+        looping in "#pragma mark @implementation".
+
+2012-02-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        * notifications.el (notifications-on-closed-signal): Make `reason'
+        optional.  (Bug#10744)
+
+2012-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode):
+        Doc fixes for the macro and the mode it defines.
+
+        * image.el (imagemagick-types-inhibit): Doc fix.
+
+        * cus-start.el (imagemagick-render-type): Add it.
+
+2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * progmodes/cc-mode.el
+        (c-standard-font-lock-fontify-region-function): Set the default at
+        load time, too, so that `font-lock-fontify-buffer' can be called
+        without setting up the entire mode first.  This fixes a bug in
+        `mm-inline-text' with C MIME parts.
+
+2012-02-06  Chong Yidong  <cyd@gnu.org>
+
+        * simple.el (list-processes--refresh): Delete exited processes
+        (Bug#8094).
+
+        * comint.el (comint-next-prompt): next-single-char-property-change
+        and prev-single-char-property-change never return nil (Bug#8657).
+
+        * custom.el (defcustom): Doc fix (Bug#9711).
+
+2012-02-05  Chong Yidong  <cyd@gnu.org>
+
+        * cus-edit.el (custom-variable-reset-backup): Quote the value
+        before storing it in the customized-value property (Bug#6712).
+        (custom-display): Add a customization type tag.
+        (custom-buffer-create-internal): Improve tooltip message.
+
+        * wid-edit.el (widget-field-value-get): New optional arg to
+        suppress trailing whitespace truncation.
+        (character): Use it (Bug#2689).
+
 2012-02-05  Andreas Schwab  <schwab@linux-m68k.org>
 
         * progmodes/gud.el (gud-pv): Use pv instead of pv1.
@@ -5,6 +53,9 @@
 
 2012-02-05  Chong Yidong  <cyd@gnu.org>
 
+        * cus-edit.el (custom-variable-value-create): For mismatched
+        types, show the current value (Bug#7600).
+
         * custom.el (defcustom): Doc fix.
 
 2012-02-05  Glenn Morris  <rgm@gnu.org>