Merge from emacs-24; up to 2012-12-05T00:13:56Z!yamaoka@jpl.org

diff --cc ChangeLog
index 9623763,7f66aaf..c26d160
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,10 +1,16 @@@
 -2012-12-29  Andreas Schwab  <schwab@linux-m68k.org>
++2012-12-30  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * configure.ac (TEMACS_LDFLAGS2): Don't define.
+       (LIBS_GNUSTEP): Set for GNUstep and substitute.
+       (LD_SWITCH_SYSTEM_TEMACS): Don't set for GNUstep.
+ 
 -2012-12-24  Andreas Schwab  <schwab@linux-m68k.org>
 +2012-12-27  Glenn Morris  <rgm@gnu.org>
 +
 +      * configure.ac (emacs_config_options): New.
 +      Use $@ rather than undocumented $ac_configure_args.
 +      Replace any embedded double quotes.  (Bug#13274)
 +
 +2012-12-27  Andreas Schwab  <schwab@linux-m68k.org>
  
        * configure.ac (SIGNALS_VIA_CHARACTERS): Also define for darwin.
        (Bug#13222)

diff --cc configure.ac
Simple merge

diff --cc doc/lispref/ChangeLog
index b2f8902,a52268f..2036831
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,8 -1,11 +1,16 @@@
 -2012-12-29  Wolfgang Jenkner  <wjenkner@inode.at>
++2012-12-30  Wolfgang Jenkner  <wjenkner@inode.at>
+ 
+       * functions.texi (Declare Form):
+       * intro.texi (A Sample Function Description):
+       * syntax.texi (Syntax Table Internals, Syntax Table Functions):
+       * variables.texi (Using Lexical Binding): Don't use @var or CAPS
+       in @def.. commands.  (Bug#13292)
+ 
 +2012-12-29  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * files.texi (Changing Files): Document the return values of
 +      set-file-selinux-context and set-file-acl.
 +
  2012-12-27  Glenn Morris  <rgm@gnu.org>
  
        * files.texi (File Names): Mention Cygwin conversion functions.

diff --cc etc/NEWS
Simple merge

diff --cc lisp/ChangeLog
index 6dd5005,84e0ec4..c895bce
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,101 -1,31 +1,126 @@@
 -2012-12-29  Chong Yidong  <cyd@gnu.org>
+ 2012-12-30  Glenn Morris  <rgm@gnu.org>
+ 
+       * net/mairix.el (rmail, rmail-summary-displayed, rmail-summary):
+       Remove unnecessary/buggy autoloads (missing interactive).  (Bug#13294)
+       (rmail-summary-displayed, rmail-summary): Declare.
+       (mairix-rmail-display): Just require rmail.
+ 
 -2012-12-29  Matt Fidler  <matt.fidler@alcon.com>  (tiny change)
++2012-12-30  Chong Yidong  <cyd@gnu.org>
+ 
+       * emacs-lisp/package.el (package-untar-buffer): Improve integrity
+       check for the tarball contents.
+ 
 -2012-12-29  Mark Lillibridge  <mark.lillibridge@hp.com>
++2012-12-30  Matt Fidler  <matt.fidler@alcon.com>  (tiny change)
+ 
+       * emacs-lisp/package.el (package-untar-buffer): Handle problematic
+       tarfile content listings (Bug#13136).
+ 
 -2012-12-28  Michael Albinus  <michael.albinus@gmx.de>
++2012-12-30  Mark Lillibridge  <mark.lillibridge@hp.com>
+ 
+       * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Insert
+       the undecoded text of the message being forwarded.  (Bug#9521)
+ 
 +2012-12-30  Michael Albinus  <michael.albinus@gmx.de>
  
 -2012-12-26  Dmitry Gutov  <dgutov@yandex.ru>
+       * net/tramp-sh.el (tramp-set-file-uid-gid): Convert UID and GID to
+       integers, if they are real numbers.  (Bug#13282)
+ 
 +      * net/tramp-sh.el (tramp-sh-handle-set-file-selinux-context):
 +      Return `t' on success.
 +
 +      * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
 +      handler for `set-file-selinux-context'.
 +
 +2012-12-29  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * net/tramp-sh.el (tramp-sh-handle-file-acl): Suppress basic attributes.
 +      (tramp-sh-handle-set-file-acl): Return `t' on success.
 +
 +2012-12-29  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * files.el (backup-buffer-copy, basic-save-buffer-2): If
 +      set-file-extended-attributes fails, fall back on set-file-modes
 +      instead of signaling an error.  (Bug#13298)
 +      (basic-save-buffer): Likewise.
 +
 +2012-12-29  Fabián Ezequiel Gallina  <fgallina@cuca>
 +
 +      * progmodes/python.el: Support other commands triggering
 +      python-indent-line so indentation cycling continues to work.
 +      (python-indent-trigger-commands): New defcustom.
 +      (python-indent-line): Use it.
 +
 +2012-12-29  Fabián Ezequiel Gallina  <fgallina@cuca>
 +
 +      * progmodes/python.el (python-shell-send-region): Add blank lines
 +      for non sent code so backtraces remain correct.
 +
 +2012-12-29  Fabián Ezequiel Gallina  <fgallina@cuca>
 +
 +      * progmodes/python.el: Remove cl dependency.
 +      (python-syntax-count-quotes): Replace incf call.
 +      (python-fill-string): Replace setf call.
 +
 +2012-12-29  Damien Cassou  <damien.cassou@gmail.com>
 +
 +      * info.el (info-other-window): New arg, for consistency with info.
 +
 +2012-12-28  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * mail/rmail.el (rmail-maybe-display-summary): Rewrite
 +      (Bug#13066).
 +
 +2012-12-28  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * epg.el (epg--start): Modify process-environment locally.
 +
 +2012-12-28  Daiki Ueno  <ueno@gnu.org>
 +
 +      * epg.el: Support pinentry-curses.
 +      Suggested by Werner Koch in
 +      <http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00755.html>.
 +      (epg-agent-file, epg-agent-mtime): New variable.
 +      (epg--start): Record the modified time of gpg-agent socket file,
 +      to restore Emacs frame after pinentry-curses termination.
 +      (epg-wait-for-completion): Restore Emacs frame here.
 +
 +2012-12-27  Juri Linkov  <juri@jurta.org>
 +
 +      * info.el (Info-file-completions): New variable.
 +      (Info-read-node-name-1): Complete node names in the Info file
 +      when a file name is given.  Call `Info-build-node-completions'
 +      with a file name.
 +      (Info-build-node-completions): Add new arg `file'.  When it is
 +      non-nil, visit it in a temporary buffer and cache its completions in
 +      `Info-current-file-completions'.  Move most of the function body to
 +      `Info-build-node-completions-1'.
 +      (Info-build-node-completions-1): New function with the body from
 +      `Info-build-node-completions'.  (Bug#12456)
 +
 +2012-12-27  Juri Linkov  <juri@jurta.org>
 +
 +      * frame.el (frame-maximization-style): Remove user option.
 +      (cycle-frame-maximized): Remove function.
 +      (toggle-frame-maximized): Rewrite and bind to M-<f10>.
 +      (toggle-frame-fullscreen): New command bound to <f11> instead of
 +      `toggle-frame-maximized'.
 +      http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00703.html
 +
 +2012-12-27  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * net/tramp.el (tramp-handle-file-accessible-directory-p): New defun.
 +
 +      * net/tramp-adb.el (tramp-adb-file-name-handler-alist):
 +      * net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
 +      * net/tramp-sh.el (tramp-sh-file-name-handler-alist): Add handler
 +      for `file-accessible-directory-p'.  (Bug#13275)
 +
 +2012-12-27  Sam Steingold  <sds@gnu.org>
 +
 +      * progmodes/cperl-mode.el (cperl-calculate-indent): Do not stagger
 +      continuations, see <http://stackoverflow.com/questions/3582436>.
 +
 +2012-12-27  Dmitry Gutov  <dgutov@yandex.ru>
  
        * progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class",
        "module" and "def" to have indentation before them.  Regression

diff --cc lisp/net/tramp-sh.el
Simple merge

diff --cc lisp/org/ChangeLog
Simple merge

diff --cc msdos/ChangeLog
index 1fdd931,5ec8f67..c530dff
--- 1/msdos/ChangeLog
--- 2/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@@ -1,4 -1,9 +1,9 @@@
 -2012-12-01  Eli Zaretskii  <eliz@gnu.org>
+ 2012-12-30  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * sed1v2.inp (TEMACS_LDFLAGS2): Remove editing.
+       (LIBS_GNUSTEP): Edit to empty.
+ 
 +2012-12-03  Eli Zaretskii  <eliz@gnu.org>
  
        * sed1v2.inp: Dump emacs.exe and copy to b-emacs.exe before
        generating leim-list.el.

diff --cc src/ChangeLog
index e95df2b,427e0e3..983ff10
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,19 -1,16 +1,32 @@@
 -2012-12-29  Andreas Schwab  <schwab@linux-m68k.org>
++2012-12-30  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * src/Makefile.in (TEMACS_LDFLAGS2): Remove.
+       (LIBS_GNUSTEP): Define.
+       (LIBES): Add $(LIBS_GNUSTEP).
+       (temacs$(EXEEXT)): Use $(LDFLAGS) instead of $(TEMACS_LDFLAGS2).
+ 
 -2012-12-27  Eli Zaretskii  <eliz@gnu.org>
++2012-12-30  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * xdisp.c (set_cursor_from_row): Don't confuse a truncation or
+       continuation glyph on a TTY with an indication of an empty line.
+       (Bug#13277)
+ 
 +2012-12-29  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * fileio.c (Fset_file_selinux_context, Fset_file_acl): Return t if
 +      file's SELinux context or ACLs successfully set, nil otherwise.
 +      (Bug#13298)
 +      (Fcopy_file) [WINDOWSNT]: Improve diagnostics when CopyFile fails.
 +
 +      * w32proc.c (reader_thread): Avoid passing NULL handles to
 +      SetEvent and WaitForSingleObject.
 +
 +2012-12-28  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Port EXTERNALLY_VISIBLE to Clang 3.2.
 +      * conf_post.h (__has_attribute): New macro.
 +      (EXTERNALLY_VISIBLE): Use it.  This ports to Clang 3.2.
 +
  2012-12-27  Glenn Morris  <rgm@gnu.org>
  
        * cygw32.c (Fcygwin_convert_file_name_to_windows)

diff --cc src/Makefile.in
index 0e91eae,b446a03..045c6df
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -400,10 -389,10 +400,10 @@@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OB
  ## Note that SunOS needs -lm to come before -lc; otherwise, you get
  ## duplicated symbols.  If the standard libraries were compiled
  ## with GCC, we might need LIB_GCC again after them.
- LIBES = $(LIBS) $(W32_LIBS) $(LIBX_BASE) $(LIBIMAGE) \
+ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
     $(LIBX_OTHER) $(LIBSOUND) \
     $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
 -   $(LIB_TIMER_TIME) $(DBUS_LIBS) \
 +   $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
     $(LIB_EXECINFO) \
     $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
     $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
@@@ -473,11 -462,9 +473,11 @@@ $(obj) $(otherobj): globals.
  $(lib)/libgnu.a: $(config_h)
        cd $(lib) && $(MAKE) libgnu.a
  
 -temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) $(lib)/libgnu.a
 +temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) \
 +               $(lib)/libgnu.a $(W32_RES)
-       $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \
+       $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \
 -        -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES)
 +        -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES) \
 +        $(W32_RES_LINK)
        test "$(CANNOT_DUMP)" = "yes" || \
          test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)
  

diff --cc src/dispextern.h
Simple merge

diff --cc src/xdisp.c
Simple merge