From: Glenn Morris <rgm@gnu.org>
Date: Thu, 3 Jul 2014 06:00:53 +0000 (-0700)
Subject: Merge from emacs-24; up to 2014-06-15T04:52:34Z!eli@barzilay.org
X-Git-Tag: emacs-25.0.90~2636^2~73^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d3c9015c70fd05ac1bec42cc59d57c3fb6b82b5;p=emacs.git

Merge from emacs-24; up to 2014-06-15T04:52:34Z!eli@barzilay.org
---

2d3c9015c70fd05ac1bec42cc59d57c3fb6b82b5
diff --cc doc/emacs/ChangeLog
index a85b56c3af7,5457f2d1f42..76d692ae9a6
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,24 -1,9 +1,30 @@@
 -2014-06-29  Glenn Morris  <rgm@gnu.org>
++2014-07-03  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* help.texi (Misc Help):
+ 	* trouble.texi (Checklist): "Online" help doesn't mean what it
+ 	used to any more.
+ 
 +2014-06-23  Glenn Morris  <rgm@gnu.org>
 +
 +	* Makefile.in (%.texi): Disable implicit rules.
 +	(mkinfodir): Remove.
 +	(.dvi.ps): Replace with pattern rule.
 +	(${buildinfodir}): New rule.
 +	($(buildinfodir)/emacs.info): Use order-only prereq for output dir.
 +	Use $<.
 +	(emacs.dvi, emacs.pdf, emacs.html, emacs-xtra.dvi, emacs-xtra.pdf):
 +	Use $<.
 +	(%.ps): New rule.
 +
 +2014-06-15  Glenn Morris  <rgm@gnu.org>
 +
 +	* Makefile.in (bootstrap-clean): New.
 +
 +2014-06-10  Glenn Morris  <rgm@gnu.org>
 +
 +	* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
 +	(INFO_OPTS): Set directly rather than with configure.
 +
  2014-06-08  Glenn Morris  <rgm@gnu.org>
  
  	* entering.texi (Entering Emacs): Small fix re initial-buffer-choice.
diff --cc doc/lispintro/ChangeLog
index 13bc65eef4a,ee3af3ff3d1..1ac7258e85a
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@@ -1,32 -1,8 +1,37 @@@
 -2014-06-29  Glenn Morris  <rgm@gnu.org>
++2014-07-03  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* emacs-lisp-intro.texi (Note for Novices, Finding More, Conclusion):
+ 	"Online" help doesn't mean what it used to any more.
+ 
 +2014-06-23  Glenn Morris  <rgm@gnu.org>
 +
 +	* Makefile.in (%.texi): Disable implicit rules.
 +	(mkinfodir): Remove.
 +	(.dvi.ps): Replace with explicit rule.
 +	(${buildinfodir}): New rule.
 +	(${buildinfodir}/eintr.info): Use order-only prereq for output dir.
 +	Use $<.
 +	(emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html):
 +	Use $<.
 +	(emacs-lisp-intro.ps): New rule.
 +
 +2014-06-15  Glenn Morris  <rgm@gnu.org>
 +
 +	* Makefile.in (bootstrap-clean): New.
 +
 +2014-06-10  Glenn Morris  <rgm@gnu.org>
 +
 +	* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
 +	(INFO_OPTS): Set directly rather than with configure.
 +
 +2014-06-02  Glenn Morris  <rgm@gnu.org>
 +
 +	* emacs-lisp-intro.texi (Autoload): Update loaddefs.el details.
 +
 +2014-04-17  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* Makefile.in (infoclean): Be consistent about reporting failures.
 +
  2014-02-25  Glenn Morris  <rgm@gnu.org>
  
  	* emacs-lisp-intro.texi (X11 Colors): Don't use setq with hooks.
diff --cc doc/lispref/ChangeLog
index 93372203009,2464eda28cb..cc372b006ed
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,9 -1,9 +1,14 @@@
 -2014-06-29  Glenn Morris  <rgm@gnu.org>
++2014-07-03  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* help.texi (Help Functions): "Online" help doesn't mean what it
+ 	used to any more.
+ 
 -2014-06-26  Glenn Morris  <rgm@gnu.org>
 +2014-07-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +	* keymaps.texi (Key Lookup): Remove mention of indirect entries.
 +	(Scanning Keymaps): Reword the `noindirect' argument.
 +
 +2014-06-28  Glenn Morris  <rgm@gnu.org>
  
  	* minibuf.texi (Intro to Minibuffers): Batch mode is basic.
  	(Reading a Password): Mention batch mode.  (Bug#17839)
diff --cc doc/misc/ChangeLog
index d7b030fb1aa,8547299aafc..6f448d22ff6
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,21 -1,19 +1,28 @@@
 -2014-06-29  Glenn Morris  <rgm@gnu.org>
++2014-07-03  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* info.texi, mh-e.texi: "Online help" doesn't mean what it
+ 	used to any more.
+ 
+ 	* idlwave.texi (Introduction): Comment out dead http screenshot links.
+ 
 -2014-06-23  Leo Liu  <sdl.web@gmail.com>
 +2014-06-24  Leo Liu  <sdl.web@gmail.com>
  
 -	* dired-x.texi (Omitting Files in Dired, Omitting Variables): Fix
 -	key binding to dired-omit-mode.  (Bug#16354)
 +	* dired-x.texi (Omitting Files in Dired, Omitting Variables):
 +	Fix key binding to dired-omit-mode.  (Bug#16354)
  
 -2014-06-22  Eli Zaretskii  <eliz@gnu.org>
 +2014-06-24  Eli Zaretskii  <eliz@gnu.org>
  
 -	* autotype.texi (Skeleton Language): Document the \n feature
 -	better.
 +	* autotype.texi (Skeleton Language): Document the \n feature better.
 +
 +2014-06-23  Glenn Morris  <rgm@gnu.org>
 +
 +	* Makefile.in (%.texi): Disable implicit rules.
 +
 +2014-06-22  Mario Lang  <mlang@delysid.org>
 +
 +	* srecode.texi (Base Arguments): The the -> to the.
 +
 +	* org.texi (Images in ODT export): The the -> the.
  
  2014-06-21  Eli Zaretskii  <eliz@gnu.org>
  
diff --cc etc/ChangeLog
index ae44fc45c3c,9493fc0a64f..5dfb205dce4
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@@ -1,4 -1,9 +1,9 @@@
 -2014-06-29  Glenn Morris  <rgm@gnu.org>
++2014-07-03  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* refcards/calccard.tex (section{Getting Help}):
+ 	Meaning of "on-line" has changed.
+ 
 -2014-06-27  Glenn Morris  <rgm@gnu.org>
 +2014-06-28  Glenn Morris  <rgm@gnu.org>
  
  	* publicsuffix.txt: Update from source.
  
diff --cc lisp/ChangeLog
index 107f95f352c,73f1f286c43..3c71395f8b9
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,93 -1,57 +1,146 @@@
 -2014-07-02  Juri Linkov  <juri@jurta.org>
++2014-07-03  Juri Linkov  <juri@jurta.org>
+ 
+ 	* desktop.el (desktop-save): Rename arg `auto-save' to
+ 	`only-if-changed'.  Doc fix.  (Bug#17873)
+ 
 -2014-07-02  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-07-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* mouse.el (mouse-yank-primary, mouse-yank-secondary):
+ 	Use insert-for-yank (bug#17271).
+ 
 -2014-07-02  Leo Liu  <sdl.web@gmail.com>
++2014-07-03  Leo Liu  <sdl.web@gmail.com>
+ 
+ 	* emacs-lisp/pp.el (pp-eval-expression, pp-eval-last-sexp):
+ 	Support lexical-binding.
+ 
 -2014-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-07-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* vc/log-edit.el (log-edit-goto-eoh): New function.
+ 	(log-edit--match-first-line): Use it (bug#17861).
+ 
 -2014-07-01  Glenn Morris  <rgm@gnu.org>
++2014-07-03  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* vc/log-edit.el (log-edit-hook): Add missing :version.
+ 
 -2014-07-01  Fabián Ezequiel Gallina  <fgallina@gnu.org>
++2014-07-03  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+ 
+ 	* progmodes/python.el (python-indent-post-self-insert-function):
+ 	Enhancements to electric indentation behavior inside
+ 	parens. (Bug#17658)
+ 
 -2014-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-07-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* ps-def.el (ps-generate-postscript-with-faces1): Don't mess with
+ 	buffer-invisibility-spec (bug#17867).
+ 
 -2014-06-29  Andreas Schwab  <schwab@linux-m68k.org>
++2014-07-03  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+ 	* vc/vc-git.el (vc-git-checkin): When operating on the whole tree
+ 	pass "-a".
+ 
 -2014-06-29  Glenn Morris  <rgm@gnu.org>
++2014-07-03  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* cus-edit.el (help):
+ 	* finder.el (finder-known-keywords):
+ 	* help.el (help-for-help-internal):
+ 	* vc/ediff-mult.el (ediff-meta-buffer-verbose-message)
+ 	(ediff-redraw-registry-buffer):
+ 	* vc/ediff-ptch.el (ediff-patch-file-internal):
+ 	Doc fixes re "online" help.  (Bug#17803)
+ 
+ 	* progmodes/idlwave.el (idlwave): Update url-link for custom group.
+ 	(idlwave-mode): Doc URL update.
+ 
 -2014-06-27  Stephen Berman  <stephen.berman@gmx.net>
 +2014-07-01  Juri Linkov  <juri@jurta.org>
 +
 +	* man.el: Display man pages immediately and use process-filter
 +	to format them asynchronously.
 +	(Man-width): Doc fix.
 +	(man): Doc fix.
 +	(Man-start-calling): Use `with-selected-window' to get
 +	`frame-width' and `window-width'.
 +	(Man-getpage-in-background): Call `Man-notify-when-ready'
 +	immediately after creating a new buffer.  Call `Man-mode' and set
 +	`mode-line-process' in the created buffer.  Set process-filter to
 +	`Man-bgproc-filter' in start-process branch.  In call-process branch
 +	call either `Man-fontify-manpage' or `Man-cleanup-manpage'.
 +	Use `Man-start-calling' inside `with-current-buffer'.
 +	(Man-fontify-manpage): Don't print messages.  Fix boundary condition.
 +	(Man-cleanup-manpage): Don't print messages.
 +	(Man-bgproc-filter): New function.
 +	(Man-bgproc-sentinel): Add `save-excursion' to keep point when
 +	user moved it during asynchronous formatting.  Move calls of
 +	`Man-fontify-manpage' and `Man-cleanup-manpage' to
 +	`Man-bgproc-filter'.  Move the call of `Man-mode' to
 +	`Man-getpage-in-background'.  Use `quit-restore-window'
 +	instead of `kill-buffer'.  Use `message' instead of `error'
 +	because errors are caught by process sentinel.
 +	(Man-mode): Move calls of `Man-build-page-list',
 +	`Man-strip-page-headers', `Man-unindent', `Man-goto-page' to
 +	`Man-bgproc-sentinel'.  Doc fix.  (Bug#2588, bug#5054, bug#9084, bug#17831)
 +
 +	* man.el (Man-bgproc-sentinel): Use `Man-page-from-arguments'
 +	for the message about the man page cleaned up.
 +
 +2014-07-01  Mario Lang  <mlang@delysid.org>
 +
 +	* net/gnutls.el (gnutls-negotiate): Prevent destructive modification of
 +	cosutomization option `gnutls-verify-error'.
 +
 +2014-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +	* simple.el (deactivate-mark, set-mark-command, handle-shift-selection):
 +	Don't keep transient-mark-mode buffer-local when not needed (bug#6316).
 +
 +	* xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
 +	(turn-off-xterm-mouse-tracking-on-terminal): Don't burp if the terminal
 +	is suspended (bug#17857).
 +
 +2014-07-01  Michael Albinus  <michael.albinus@gmx.de>
 +
 +	* net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
 +	Prefer utf-8 coding.  (Bug#17859)
 +
 +2014-06-30  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 +
 +	* emacs-lisp/subr-x.el (string-reverse): Define as obsolete alias
 +	for `reverse'.
 +
 +2014-06-30  Glenn Morris  <rgm@gnu.org>
 +
 +	* emacs-lisp/autoload.el (autoload-ensure-writable): New variable.
 +	(autoload-ensure-default-file): Maybe make existing output writable.
 +	* Makefile.in (AUTOGEN_VCS): Remove.
 +	(autoloads): Use autoload-ensure-writable rather than AUTOGEN_VCS.
 +
 +2014-06-30  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 +
 +	* emacs-lisp/subr-x.el (string-reverse): Use `reverse'.
 +
 +2014-06-30  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 +
 +	New if-let, when-let, thread-first and thread-last macros.
 +
 +	* emacs-lisp/subr-x.el
 +	(internal--listify, internal--check-binding)
 +	(internal--build-binding-value-form, internal--build-binding)
 +	(internal--build-bindings): New functions.
 +	(internal--thread-argument, thread-first, thread-last)
 +	(if-let, when-let): New macros.
 +
 +2014-06-30  Grégoire Jadi  <daimrod@gmail.com>
 +
 +	* net/rcirc.el (rcirc-buffer-process): Restore previous
 +	behaviour.  (Bug#17772)
 +
 +2014-06-29  Alan Mackenzie  <acm@muc.de>
 +
 +	Don't call c-parse-state when c++-template-syntax-table is active.
 +	* progmodes/cc-engine.el (c-guess-continued-construct CASE G)
 +	(c-guess-basic-syntax CASE 5D.3): Rearrange so that
 +	c-syntactic-skip-backwards isn't called with the pertinent syntax table.
 +
 +2014-06-28  Stephen Berman  <stephen.berman@gmx.net>
  
  	* calendar/todo-mode.el (todo-set-top-priorities): Fix logic to
  	account for file-wide setting of todo-top-priorities-overrides.
diff --cc src/ChangeLog
index bb514753bdb,f84fe133c7e..0f9b7431462
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,69 -1,28 +1,94 @@@
 -2014-07-01  Eli Zaretskii  <eliz@gnu.org>
++2014-07-03  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* dispnew.c (prepare_desired_row): Accept 2 additional arguments:
+ 	the window whose glyph row is being prepared and a flag whether it
+ 	is for mode/header line.  Make sure the glyph row's marginal areas
+ 	are in sync with what the window wants.
+ 	(Bug#17892)
+ 
+ 	* xdisp.c (display_line, display_mode_line): Call
+ 	prepare_desired_row with additional arguments, as appropriate.
+ 
+ 	* dispextern.h (prepare_desired_row): Adjust prototype.
+ 
 -2014-07-01  Dmitry Antipov  <dmantipov@yandex.ru>
++2014-07-03  Dmitry Antipov  <dmantipov@yandex.ru>
+ 
+ 	* xfaces.c (init_frame_faces): Always realize basic faces (Bug#17889).
+ 	* menu.c (Fx_popup_dialog): Set Vmenu_updating_frame to avoid crash
+ 	caused by xw_popup_dialog in daemon mode (Bug#17891).
+ 
 -2014-06-30  Eli Zaretskii  <eliz@gnu.org>
++2014-07-03  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* frame.c (do_switch_frame): When switching to another TTY frame,
+ 	make sure FrameCols and FrameRows are in sync with the new frame's
+ 	data.  (Bug#17875)
+ 
 +2014-07-02  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +	Shrink Lisp_Sub_Char_Table by preferring C integers to Lisp_Objects.
 +	* lisp.h (struct Lisp_Sub_Char_Table): Use C integers for depth and
 +	min_char slots.  Adjust comment.
 +	(enum char_table_specials): Rename from CHAR_TABLE_STANDARD_SLOTS.
 +	Add SUB_CHAR_TABLE_OFFSET member.
 +	(make_uninit_sub_char_table): New function.
 +	(toplevel): Add compile-time assert to verify suitable member layout
 +	in Lisp_Sub_Char_Table.
 +	* alloc.c (mark_char_table): Add extra argument to denote char table
 +	subtype.  Adjust to match new layout of sub char-table.
 +	(mark_object): Always mark sub char-tables with mark_char_table.
 +	* chartab.c (make_sub_char_table, copy_sub_char_table)
 +	(sub_char_table_ref, sub_char_table_ref_and_range, sub_char_table_set)
 +	(sub_char_table_set_range, optimize_sub_char_table, map_sub_char_table)
 +	(map_sub_char_table_for_charset, uniprop_table_uncompress):
 +	All related users changed.
 +	* lread.c (read1): Adjust to match new layout of sub char-table.
 +	* print.c (print_object): Likewise (Bug#17898).
 +
 +2014-07-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +	* keymap.c (get_keyelt): Simplify.
 +	(copy_keymap_item): Remove left-over code for when we had
 +	key-shortcut caches.
 +
 +2014-06-30  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +	* nsterm.m (judge): EmacsScroller: Move dealloc code here.
 +	(dealloc): Remove for EmacsScroller.
 +
 +	* nsterm.h (EmacsScroller): Remove dealloc.
 +
 +2014-06-30  Eli Zaretskii  <eliz@gnu.org>
 +
 +	* coding.c (MIN_CHARBUF_SIZE): Enlarge to 32.  (Bug#17881)
 +
 +2014-06-30  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +	* nsmenu.m (update_frame_tool_bar): Set wait_for_tool_bar to NO
 +	when setNeedsDisplay is called so we don't trigger redisplay for every
 +	tool bar update.
 +
 +	* nsterm.m (any_help_event_p): New variable.
 +	(mouseMoved:): Set any_help_event_p to YES if help event is
 +	generated.  Remove else with empty help event that triggered redisplay
 +	for every mouse move.
 +	(windowDidResignKey:): If any_help_event_p, generate empty help event.
 +
 +2014-06-29  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +	* xfns.c (Qsuppress_icon): Remove; no real users.
 +	(syms_of_xfns): Don't DEFSYM it.  Remove ancient comments.
 +	* w32fns.c (Qsuppress_icon): Remove, for the same reason.
 +	(syms_of_w32fns): Don't DEFSYM it.
 +
 +2014-06-29  Glenn Morris  <rgm@gnu.org>
 +
 +	* Makefile.in (ns-app): Mark as PHONY.
 +
 +2014-06-28  Glenn Morris  <rgm@gnu.org>
 +
 +	* Makefile.in (mostlyclean): There are no libXMenu11.a,
 +	liblw.a in this directory.
 +
  2014-06-28  Andreas Schwab  <schwab@linux-m68k.org>
  
  	* coding.c (encode_coding_utf_8): Correctly count produced_chars
diff --cc test/ChangeLog
index 8c28eaf30dc,f93b553f341..cf55beb87f0
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,12 -1,10 +1,18 @@@
 -2014-07-01  Fabián Ezequiel Gallina  <fgallina@gnu.org>
++2014-07-03  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+ 
 -	* automated/python-tests.el
 -	(python-tests-self-insert): New function.
++	* automated/python-tests.el (python-tests-self-insert): New function.
+ 	(python-triple-quote-pairing): Use it.
+ 	(python-util-forward-comment-1): New test. (Bug#17658)
+ 
 +2014-06-30  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 +
 +	* automated/subr-x-tests.el: New file.
 +
 +2014-06-29  Michael Albinus  <michael.albinus@gmx.de>
 +
 +	* automated/tramp-tests.el (tramp--instrument-test-case):
 +	Print debug buffer in any case.
 +
  2014-06-28  Leo Liu  <sdl.web@gmail.com>
  
  	* automated/calc-tests.el: New file and add tests for math-bignum.