# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1265667206 0
# Node ID d049b1b866d454b0c783e235cebe54c673dfea5a
# Parent  019a6c1574b4fbe41e1e28d25b4cf04497a07356# Parent  759400918e76f4e0dfd02de5f502c3861dcf50df
Merge from mainline.

diff -r 019a6c1574b4 -r d049b1b866d4 doc/emacs/ChangeLog
--- a/doc/emacs/ChangeLog	Sun Feb 07 22:11:48 2010 +0000
+++ b/doc/emacs/ChangeLog	Mon Feb 08 22:13:26 2010 +0000
@@ -1,3 +1,7 @@
+2010-02-08  Glenn Morris  <rgm@gnu.org>
+
+	* buffers.texi (Uniquify): Must explicitly load library.  (Bug#5529)
+
 2010-02-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* display.texi (Useless Whitespace, Text Display):
diff -r 019a6c1574b4 -r d049b1b866d4 doc/emacs/buffers.texi
--- a/doc/emacs/buffers.texi	Sun Feb 07 22:11:48 2010 +0000
+++ b/doc/emacs/buffers.texi	Mon Feb 08 22:13:26 2010 +0000
@@ -583,7 +583,8 @@
 
 @vindex uniquify-buffer-name-style
   Other methods work by adding parts of each file's directory to the
-buffer name.  To select one, customize the variable
+buffer name.  To select one, load the library @file{uniquify} (e.g.
+using @code{(require 'uniquify)}), and customize the variable
 @code{uniquify-buffer-name-style} (@pxref{Easy Customization}).
 
   To begin with, the @code{forward} naming method includes part of the
diff -r 019a6c1574b4 -r d049b1b866d4 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Feb 07 22:11:48 2010 +0000
+++ b/lisp/ChangeLog	Mon Feb 08 22:13:26 2010 +0000
@@ -1,3 +1,8 @@
+2010-02-08  Kenichi Handa  <handa@m17n.org>
+
+	* international/mule-util.el (with-coding-priority): Add autoload
+	cookie for putting `lisp-indent-funciton'.
+
 2010-02-07  Glenn Morris  <rgm@gnu.org>
 
 	* progmodes/f90.el (f90-font-lock-keywords-1, f90-font-lock-keywords-2):
diff -r 019a6c1574b4 -r d049b1b866d4 lisp/international/mule-util.el
--- a/lisp/international/mule-util.el	Sun Feb 07 22:11:48 2010 +0000
+++ b/lisp/international/mule-util.el	Mon Feb 08 22:13:26 2010 +0000
@@ -323,7 +323,7 @@
      (unwind-protect
 	 (progn ,@body)
        (apply #'set-coding-system-priority ,current)))))
-(put 'with-coding-priority 'lisp-indent-function 1)
+;;;###autoload(put 'with-coding-priority 'lisp-indent-function 1)
 (put 'with-coding-priority 'edebug-form-spec t)
 
 ;;;###autoload