Merge from emacs-24; up to 2012-12-12T22:29:54Z!yamaoka@jpl.org

diff --cc lisp/ChangeLog
index a0ec02f,41c5c7d..d4a0fe6
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,103 -1,18 +1,117 @@@
 -2013-01-28  Fabián Ezequiel Gallina  <fgallina@cuca>
+ 2013-01-30  Glenn Morris  <rgm@gnu.org>
+ 
+       * imenu.el (imenu-default-create-index-function):
+       Put back a version of the infinite loop test removed 2013-01-23.
+ 
 -2013-01-26  Stefan Monnier  <monnier@iro.umontreal.ca>
++2013-01-30  Fabián Ezequiel Gallina  <fgallina@cuca>
+ 
+       * progmodes/python.el (python-shell-parse-command): Find
+       python-shell-interpreter with modified environment.
+ 
 -2013-01-24  Fabián Ezequiel Gallina  <fgallina@cuca>
++2013-01-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/cl.el (cl-set-getf): Add compatibility alias.
+ 
 +2013-01-29  Alan Mackenzie  <acm@muc.de>
 +
 +      Amend to fontify /regexp/s in actions correctly.
 +      * cc-awk.el (c-awk-harmless-char-re, c-awk-harmless-string*-re):
 +      (c-awk-harmless-string*-here-re): braces, parens and semicolons
 +      are no longer included.
 +      (c-awk-harmless-line-char-re, c-awk-harmless-line-string*-re):
 +      What used to be these variables without "-line" in the name.
 +      (c-awk-neutral-re): { is no longer neutral.  Escaped newlines now
 +      are.
 +      (c-awk-non-arith-op-bra-re): Now also matches {.
 +      (c-awk-pre-exp-alphanum-kwd-re): New regexp to match "print",
 +      "return", and "case".
 +      (c-awk-kwd-regexp-sign-re): New, to match "print", etc., followed
 +      by /.
 +      (c-awk-syntax-tablify-/): Check special cases "print /re/", etc.
 +      (c-awk-set-syntax-table-properties): Extend FSM to handle
 +      {,},(,),;.
 +
 +2013-01-29  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * autorevert.el (auto-revert-use-notify): Use
 +      `custom-initialize-default' for initialization.  (Bug#13583)
 +
 +      * net/ange-ftp.el (ange-ftp-skip-msgs): Add another message.
 +
 +      * net/tramp-sh.el (tramp-sh-handle-start-file-process): Catch
 +      `suppress'.  Otherwise, `tramp-run-real-handler' might be called
 +      in `tramp-file-name-handler'.
 +      (tramp-gw-tunnel-method, tramp-gw-socks-method): Declare for
 +      compatibility.
 +      (tramp-compute-multi-hops): Check, whether
 +      `tramp-gw-tunnel-method' and `tramp-gw-socks-method' are non-nil.
 +
 +2013-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * hi-lock.el (hi-lock-unface-buffer): Don't assume `face' is a symbol
 +      (bug#13297).
 +
 +2013-01-27  Dmitry Gutov  <dgutov@yandex.ru>
 +
 +      * progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove some
 +      checks made superfluous by the \_< operator.
 +      * progmodes/ruby-mode.el (ruby-move-to-block): Work with (maybe
 +      temporarily) broken indentation.
 +      * progmodes/ruby-mode.el (ruby-font-lock-keywords):
 +      Highlight nested constants, too.  \_< broke that.
 +
 +2013-01-27  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 +
 +      * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use "\\_<"
 +      instead of "\\b".
 +
 +2013-01-27  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * autorevert.el (auto-revert-handler): Notifications which result
 +      from a saved file shall not be taken into account.  (Bug#13557)
 +
 +2013-01-26  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * emacs-lisp/lisp-mode.el (lisp-mode-variables): Add optional
 +      parameter BAR-NOT-SYMBOL to control syntax of | for font-lock.
 +      (lisp-mode): Pass t for it.  (Bug#13556)
 +
 +2013-01-25  Alan Mackenzie  <acm@muc.de>
 +
 +      AWK Mode: Fix indentation bug at top level.  Bug #12274.
 +
 +      * progmodes/cc-engine.el (c-guess-basic-syntax): Move CASE 5P to
 +      just before CASE 5D.
 +
 +2013-01-25  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +      * net/socks.el (socks-nslookup-host): Use string-to-number.
 +
 +2013-01-25  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * autorevert.el (auto-revert-remote-files)
 +      (auto-revert-notify-exclude-dir-regexp): New defcustoms.
 +      (auto-revert-notify-enabled, auto-revert-use-notify)
 +      (auto-revert-notify-watch-descriptor-hash-list)
 +      (auto-revert-notify-modified-p, auto-revert-notify-event-p)
 +      (auto-revert-notify-event-descriptor)
 +      (auto-revert-notify-event-action)
 +      (auto-revert-notify-event-file-name): Doc fix.
 +      (global-auto-revert-mode): Reorder checks.
 +      (auto-revert-notify-rm-watch): Respect changed values of
 +      `auto-revert-notify-watch-descriptor-hash-list'.
 +      (auto-revert-notify-add-watch): Check for
 +      `auto-revert-notify-exclude-dir-regexp'.  Adapt filters for
 +      `inotify-add-watch'.  Watch `default-directory' instead of
 +      `buffer-file-name'.  `auto-revert-notify-watch-descriptor-hash-list'
 +      has a changed meaning now.  (Bug#13540)
 +      (auto-revert-notify-handler): Change implementation wrt events
 +      returning from a directory.
 +      (auto-revert-handler): Reorder implementation for checks of remote
 +      files.
 +      (auto-revert-buffers): Fix parentheses error.
 +
 +2013-01-25  Fabián Ezequiel Gallina  <fgallina@cuca>
  
        * progmodes/python.el: Enhancements to header documentation about
        skeletons.  (Bug#5716)

diff --cc lisp/emacs-lisp/cl.el
Simple merge

diff --cc lisp/imenu.el
Simple merge

diff --cc lisp/progmodes/python.el
Simple merge

diff --cc src/ChangeLog
index abbe4ed,0fd8357..bb03ba1
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,30 -1,24 +1,46 @@@
 -2013-01-27  Eli Zaretskii  <eliz@gnu.org>
++2013-01-30  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * w32.c (sys_open): Zero out the flags for the new file descriptor.
+       (sys_close): Zero out the flags for the file descriptor before
+       closing it.  (Bug#13546)
+ 
 -2013-01-26  Eli Zaretskii  <eliz@gnu.org>
 -
+       * w32.c (parse_root, get_volume_info, readdir, read_unc_volume)
+       (logon_network_drive, stat_worker, symlink, chase_symlinks): Use
+       CharNextExA and CharPrevExA to iterate over file names encoded in
+       DBCS.  (Bug#13553)
+ 
 -2013-01-25  Eli Zaretskii  <eliz@gnu.org>
 -
+       * w32.c (w32_get_long_filename, init_environment, readlink):
+       Support file names encoded in DBCS codepages.
+       (readlink): Use the current file-name-coding-system, not the ANSI
+       codepage, to decode and handle targets of symlinks.
+ 
 -2013-01-23  Eli Zaretskii  <eliz@gnu.org>
 +2013-01-28  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * w32.c (opendir): Now accepts a 'const char *'.
 +
 +2013-01-28  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +      Remove obsolete redisplay code.  See the discussion at
 +      http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00576.html.
 +      * dispnew.c (preemption_period, preemption_next_check): Remove.
 +      (Vredisplay_preemption_period): Likewise.
 +      (update_frame, update_single_window, update_window, update_frame_1):
 +      Adjust users.  Always assume that PERIODIC_PREEMPTION_CHECKING is not
 +      used, following the 2012-06-22 change.
 +
 +2013-01-25  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * w32notify.c (Fw32notify_add_watch): Doc fix.  (Bug#13540)
 +
 +2013-01-25  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +      * font.c (num_fonts): Remove the leftover from old
 +      debugging code.  Adjust comment style here and there.
 +      * insdel.c (insert_1): Remove.
 +      * lisp.h (insert_1): Remove prototype.
 +      * xdisp.c (message_dolog): Adjust users to call insert_1_both.
 +
 +2013-01-25  Eli Zaretskii  <eliz@gnu.org>
  
        * w32.c (max_filename_mbslen): New function.
        (normalize_filename, readdir): Use it to detect locales where ANSI

diff --cc src/w32.c
Simple merge