Merge from trunk.

diff --cc lisp/ChangeLog
index ba05002,18605c2..6441628
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,11 -1,134 +1,143 @@@
- 2011-12-29  Paul Eggert  <eggert@cs.ucla.edu>
++2012-01-07  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * epg.el (epg--make-temp-file): Avoid permission race conditions
 +      when creating temporary directories and files on older Emacs.
 +
 +      * files.el (move-file-to-trash): Preserve default file modes on error.
 +      (Bug#10401)
 +
+ 2012-01-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+       * faces.el (set-face-attribute): Clarify the meaning of the nil
+       frame (bug#10294).
+ 
+       * subr.el (with-selected-frame): Mention that the selected frame
+       is restored (bug#9980).
+ 
+       * ibuffer.el (ibuffer-mode): List the bindings in the corrent map
+       (bug#9759).
+ 
+       * mail/smtpmail.el (password-cache-add): Removed unused declaration.
+       (password-read): Don't autoload unused function.
+ 
+ 2012-01-07  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * progmodes/which-func.el (which-func-mode): Turn into a
+       non-interactive function and mark as obsolete (bug#10428).
+ 
+ 2012-01-06  Chong Yidong  <cyd@gnu.org>
+ 
+       * files.el (hack-dir-local-variables-non-file-buffer): Add doc.
+       (hack-one-local-variable-eval-safep): Allow 0 arg for minor mode
+       functions, along with 1 and -1.
+ 
+ 2012-01-06  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * time.el (display-time-load-average)
+       (display-time-default-load-average): Doc fixes.  See the thread
+       starting at
+       http://lists.gnu.org/archive/html/help-gnu-emacs/2012-01/msg00059.html
+       for the details.
+ 
+ 2012-01-06  Glenn Morris  <rgm@gnu.org>
+ 
+       * mail/unrmail.el (unrmail): Give an explicit error if the input file
+       has no messages.  (Bug#10377)
+ 
+       * info.el (Info-mode-map): Bind e to end-of-buffer, rather
+       than Info-edit.  (Bug#10385)
+ 
+       * time.el (display-time-load-average, display-time-next-load-average):
+       Doc fixes.
+ 
+       * emacs-lisp/bytecomp.el (byte-compile-file): Do not propagate a file
+       local setting of buffer-read-only to the input buffer.  (Bug#10419)
+ 
+       * calendar/calendar.el (calendar-mode):
+       Locally set scroll-margin to 0.  (Bug#10379)
+ 
+ 2012-01-06  Ulrich Mueller  <ulm@gentoo.org>
+ 
+       * play/doctor.el (doctor-death): Escape "," characters.  (Bug#10370)
+ 
+ 2012-01-05  Glenn Morris  <rgm@gnu.org>
+ 
+       * eshell/em-unix.el (diff-no-select): Autoload it.
+       (eshell/diff): Use diff-no-select.  (Bug#10420)
+ 
+ 2012-01-05  Chong Yidong  <cyd@gnu.org>
+ 
+       * shell.el (shell-dynamic-complete-functions): Revert last change.
+       (shell-command-completion-function): New function.
+       (shell-completion-vars): Use it to implement
+       shell-completion-execonly (Bug#10417).
+ 
+       * custom.el (enable-theme): Don't set custom-safe-themes.
+ 
+       * cus-theme.el (custom-theme-merge-theme): Ignore
+       custom-enabled-themes and custom-safe-themes.
+ 
+ 2012-01-05  Michael R. Mauger  <mmaug@yahoo.com>
+ 
+       * progmodes/sql.el (sql-login-hook): Add hook to respond to the
+       first prompt in `sql-interacive-mode'.
+       (sql-mode-oracle-font-lock-keywords): Add CONNECT_BY_* builtin
+       keywords.
+       (sql-mode-mysql-font-lock-keywords):  Add ELSEIF keyword.
+       (sql-product-interactive): Bug fix: Set `sql-buffer' in
+       context of original buffer.  Invoke `sql-login-hook'.
+ 
+ 2012-01-04  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * mail/rmail.el (rmail-font-lock-keywords): Accept non-ASCII
+       letters in cite-prefix.
+ 
+ 2012-01-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+       * mail/smtpmail.el (smtpmail-stream-type): Mention the `ssl' value.
+ 
+ 2012-01-03  Chong Yidong  <cyd@gnu.org>
+ 
+       * shell.el (shell-dynamic-complete-functions): Put
+       pcomplete-completions-at-point, so as to try
+       comint-filename-completion first (Bug#10417).
+ 
+ 2012-01-02  Richard Stallman  <rms@gnu.org>
+ 
+       * battery.el (battery-status-function):
+       Detect when to use battery-yeeloong-sysfs.
+       (battery-echo-area-format): Add string for Yeeloong.
+       (battery-linux-proc-apm, battery-linux-proc-acpi): Doc fixes.
+       (battery-yeeloong-sysfs): New function.
+ 
+ 2012-01-02  Chong Yidong  <cyd@gnu.org>
+ 
+       * dirtrack.el (dirtrack-list): Eliminate unused third element.
+       (dirtrack): Merge code for handling relative filenames in prompt
+       from shell-dir-cookie-watcher.
+       (dirtrack-debug-message): New arg to avoid excess format calls.
+ 
+       * shell.el (shell-dir-cookie-re): Variable deleted.
+       (shell-dir-cookie-watcher): Function deleted.
+       (shell-mode): Don't use shell-dir-cookie-re, since it is redundant
+       with dirtrack-mode.
+ 
+ 2012-01-01  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * term/w32-win.el (dynamic-library-alist) <gnutls>: Load
+       libgnutls-28.dll, from GnuTLS version 3.x, in preference to
+       libgnutls-26.dll.
+ 
+ 2011-12-31  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * emacs-lisp/bytecomp.el (byte-compile-file): Fix indentation.
+ 
+ 2011-12-31  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * mail/rmail.el (rmail-show-message-1): Decode any RFC2047 encoded
+       headers of non-MIME messages, when rmail-enable-mime is non-nil.
++>>>>>>> MERGE-SOURCE
+ 
  2011-12-29  Michael Albinus  <michael.albinus@gmx.de>
  
        * net/tramp-sh.el (tramp-find-shell): Set "remote-shell" property

diff --cc lisp/epg.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc src/ChangeLog
index 4c62a9d,f7acc82..6ef11fa
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,15 -1,39 +1,51 @@@
- 2011-12-29  Paul Eggert  <eggert@cs.ucla.edu>
++2012-01-07  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      emacs: fix an auto-save permissions race condition (Bug#10400)
 +      * fileio.c (auto_saving_dir_umask): New static var.
 +      (Fmake_directory_internal): Use it.
 +      (do_auto_save_make_dir): Set it, instead of invoking chmod after
 +      creating the directory.  The old code temporarily assigns
 +      too-generous permissions to the directory.
 +      (do_auto_save_eh): Clear it.
 +      (Fdo_auto_save): Catch all errors, not just file errors, so
 +      that the var is always cleared.
 +
+ 2012-01-07  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * search.c (scan_buffer): Pass character positions to
+       know_region_cache, not byte positions.  (Bug#6540)
+ 
+ 2012-01-07  LynX  <_LynX@bk.ru>  (tiny change)
+ 
+       * w32.c (sys_rename): Report EXDEV when rename of a directory
+       fails because the target is on another logical disk.  (Bug#10284)
+ 
+ 2012-01-07  David Benjamin  <davidben@mit.edu>  (tiny change)
+ 
+       * xterm.c (x_embed_request_focus): New function.
+ 
+       * xterm.h: Add prototype.
+ 
+       * xfns.c (Fx_focus_frame): Use it for embedded frames (Bug#9977).
+ 
+ 2012-01-05  Glenn Morris  <rgm@gnu.org>
+ 
+       * emacs.c (emacs_copyright): Update short copyright year to 2012.
+ 
+ 2012-01-01  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * gnutls.c (init_gnutls_functions): Load gnutls_check_version.
+       Load gnutls_transport_set_lowat only if GnuTLS version is below
+       2.11.1.
+       (emacs_gnutls_handshake): Call gnutls_transport_set_lowat only for
+       GnuTLS versions below 2.11.1.
+ 
+ 2011-12-31  Antoine Levitt  <antoine.levitt@gmail.com>
+ 
+       * xdisp.c (syms_of_xdisp) <window-scroll-functions>: Add warning
+       to the doc string advising against its use for altering the way
+       windows are scrolled.
+ 
  2011-12-28  Kenichi Handa  <handa@m17n.org>
  
        * coding.c (Fdefine_coding_system_internal): Make an utf-8 base

diff --cc src/fileio.c
Simple merge