Merge branch 'emacs-24'.

1 files changed, 13 insertions, 13 deletions

diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 9c793ff4615..7589061c70b 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -628,7 +628,7 @@
 	(global-auto-revert-ignore-buffer): Remove leading "*" from docs.
 
 2011-02-19  Dmitry Bolshakov  <dmitry.bolshakov@bridge-quest.com>
-            Dima Kogan  <dkogan@cds.caltech.edu>  (tiny change)
+	    Dima Kogan  <dkogan@cds.caltech.edu>  (tiny change)
 
 	* progmodes/hideshow.el (hs-find-block-beginning)
 	(hs-hide-level-recursive): Ignore comments when parsing braces
@@ -2970,7 +2970,7 @@
 	* loadup.el (symbol-file-load-history-loaded): Remove; unused.
 
 2010-12-15  Jari Aalto  <jari.aalto@cante.net>
-            Scott Evans  <gse@antisleep.com>
+	    Scott Evans  <gse@antisleep.com>
 
 	* rect.el (rectange--default-line-number-format)
 	(rectangle-number-line-callback): New functions.
@@ -7986,7 +7986,7 @@
 	* iswitchb.el (iswitchb-kill-buffer): Re-make the list.
 
 2010-08-22  Kirk Kelsey  <kirk.kelsey@0x4b.net>
-            Stefan Monnier  <monnier@iro.umontreal.ca>
+	    Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/make-mode.el (makefile-fill-paragraph): Account for the
 	extra backslash added to each line (bug#6890).
@@ -9002,7 +9002,7 @@
 	another buffer (e.g gnus-art).
 
 2010-07-13  Karl Fogel  <kfogel@red-bean.com>
-            Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+	    Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
 	Preparation for setting bookmarks in Gnus article buffers (Bug#5975).
 
@@ -10301,7 +10301,7 @@
 	(rcirc-user-name-history): Add variable.
 
 2010-05-25  Ryan Yeske  <rcyeske@gmail.com>
-            Jonathan Rockway  <jon@jrock.us>
+	    Jonathan Rockway  <jon@jrock.us>
 
 	* net/rcirc.el (rcirc-server-alist): Add :pass.
 	(rcirc): When prompting for connection parameters, also prompt for
@@ -10969,7 +10969,7 @@
 	* Version 23.2 released.
 
 2010-05-07  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
-            Stefan Monnier  <monnier@iro.umontreal.ca>
+	    Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Highlight vendor specific properties.
 	* textmodes/css-mode.el (css-proprietary-nmstart-re): New var.
@@ -11162,7 +11162,7 @@
 	(filter-buffer-substring): Use it.  Remove unused arg `noprops'.
 
 2010-05-01  Toru TSUNEYOSHI  <t_tuneyosi@hotmail.com>
-            Michael Albinus  <michael.albinus@gmx.de>
+	    Michael Albinus  <michael.albinus@gmx.de>
 
 	Implement compression for inline methods.
 
@@ -12209,7 +12209,7 @@
 	values.
 
 2010-03-29  Phil Hagelberg  <phil@evri.com>
-            Chong Yidong  <cyd@stupidchicken.com>
+	    Chong Yidong  <cyd@stupidchicken.com>
 
 	* subr.el: Extend progress reporters to perform "spinning".
 	(progress-reporter-update, progress-reporter-do-update):
@@ -15603,7 +15603,7 @@
 	* Makefile.in (ELCFILES): Adapt to subword.el move.
 
 2009-11-21  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
-            Stefan Monnier  <monnier@iro.umontreal.ca>
+	    Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* bookmark.el (bookmark-bmenu-bookmark-column): Remove var.
 	(bookmark-bmenu-list): Save name on `bookmark-name-prop' text-prop.
@@ -19070,7 +19070,7 @@
 	indent buffer only if called interactively (Bug#4452).
 
 2009-09-19  Juanma Barranquero  <lekktu@gmail.com>
-            Eli Zaretskii  <eliz@gnu.org>
+	    Eli Zaretskii  <eliz@gnu.org>
 
 	This fixes bug#4197 (merged to bug#865, though not identical).
 	* server.el (server-auth-dir): Add docstring note about FAT32.
@@ -19887,7 +19887,7 @@
 	Don't call substitute-in-file-name on diary-file.
 
 2009-09-03  Eduard Wiebe  <usenet@pusto.de>
-            Stefan Monnier  <monnier@iro.umontreal.ca>
+	    Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* mail/footnote.el (footnote-prefix): Make it a defcustom.
 	(footnote-mode-map): Move initialization into the declaration.
@@ -20998,7 +20998,7 @@
 	* progmodes/hideshow.el (hs-special-modes-alist): Add js-mode entry.
 
 2009-08-14  Daniel Colascione  <dan.colascione@gmail.com>
-            Karl Landstrom  <karl.landstrom@brgeight.se>
+	    Karl Landstrom  <karl.landstrom@brgeight.se>
 
 	* progmodes/js.el: New file.
 
@@ -22765,7 +22765,7 @@
 	XZ is the successor to LZMA: <http://tukaani.org/xz/>
 
 2009-06-22  Dmitry Dzhus  <dima@sphinx.net.ru>
-            Nick Roberts  <nickrob@snap.net.nz>
+	    Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-mi.el: Pull further modified changes from Dmitry's
 	repository (http://sphinx.net.ru/hg/gdb-mi/).