From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 23 Mar 2015 17:17:21 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~93
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a660037698bce151915e6e084593071134df1331;p=emacs.git

Merge from origin/emacs-24

bb7b23c In `debug' don't try using window on inaccessible frame (Bug#17170).

Conflicts:
	lisp/ChangeLog
---

a660037698bce151915e6e084593071134df1331
diff --cc lisp/ChangeLog
index 9448e0514e6,8f888e37b06..712bd73dba8
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,82 -1,17 +1,87 @@@
 -2015-03-22  Martin Rudalics  <rudalics@gmx.at>
++2015-03-23  Martin Rudalics  <rudalics@gmx.at>
+ 
+ 	* emacs-lisp/debug.el (debug): Don't try using "previous" window
+ 	when its not live or on an invisible frame (Bug#17170).
+ 
 -2015-03-21  Mario Lang  <mlang@delysid.org>
 +2015-03-23  Dmitry Gutov  <dgutov@yandex.ru>
  
 -	* emacs-lisp/tabulated-list.el (tabulated-list-print): Only call
 -	`recenter' if `current-buffer' is equal to `window-buffer'.
 +	* json.el (json-decode-char0): Delete this alias as well.
 +	(json-read-escaped-char): Don't call it (bug#20154).
  
 -2015-03-20  Dmitry Gutov  <dgutov@yandex.ru>
 +2015-03-23  Daniel Colascione  <dancol@dancol.org>
 +
 +	* emacs-lisp/lisp-mode.el (lisp--el-non-funcall-position-p): New function.
 +	(lisp--el-match-keyword): Use it.
 +
 +2015-03-23  Daiki Ueno  <ueno@gnu.org>
 +
 +	* subr.el (start-process): New function, ported from the C
 +	implementation.
 +
 +2015-03-23  Daniel Colascione  <dancol@dancol.org>
 +
 +	Automatically adjust process window sizes.
 +
 +	* window.el (window-adjust-process-window-size-function): New
 +	customizable variable.
 +	(window-adjust-process-window-size)
 +	(window-adjust-process-window-size-smallest)
 +	(window-adjust-process-window-size-largest)
 +	(window--process-window-list, window--adjust-process-windows):
 +	New functions.
 +	(window-configuration-change-hook): Add
 +	`window--adjust-process-windows'.
 +	* term.el (term-mode): Observe result of
 +	`window-adjust-process-window-size-function'.
 +	(term-check-size): Delete.
 +
 +2015-03-22  Jackson Ray Hamilton  <jackson@jacksonrayhamilton.com>
 +
 +	* textmodes/sgml-mode.el (sgml-attribute-offset): New defcustom.
 +	(sgml-calculate-indent): Use `sgml-attribute-offset' for attribute
 +	indentation (bug#20161).
 +
 +2015-03-22  Dmitry Gutov  <dgutov@yandex.ru>
 +
 +	* json.el (json-encode-char0): Delete this alias.
 +	(json-encode-string): Rewrite to improve performance (bug#20154).
 +	(json-encode-char): Fold into `json-encode-string'.
 +
 +2015-03-22  Artur Malabarba  <bruce.connor.am@gmail.com>
 +
 +	* menu-bar.el (menu-bar-update-buffers): Count displayed buffers
 +	for `buffers-menu-max-size', not total buffers.
  
 -	* progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect
 -	regexps after `!'.  (Bug#19285)
 +2015-03-21  Titus von der Malsburg  <malsburg@posteo.de>
 +
 +	* window.el (window-font-width, window-font-height)
 +	(window-max-chars-per-line): New functions.
 +
 +	* simple.el (default-font-height): Doc fix.
 +	(default-font-width): New function.
 +
 +2015-03-21  Tassilo Horn  <tsdh@gnu.org>
 +
 +	* emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Also
 +	recognize (cl-)defmethod with (setf method) name.
 +
 +2015-03-20  Tassilo Horn  <tsdh@gnu.org>
 +
 +	* emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Fix
 +	false positive in function name font-locking.
 +	(lisp-cl-font-lock-keywords-1): Ditto.
 +
 +2015-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +	* emacs-lisp/cl-macs.el (cl-defsubst): Ignore false-positive
 +	occurrences of args via &cl-defs (bug#20149).
 +
 +2015-03-20  Alan Mackenzie  <acm@muc.de>
 +
 +	Fix debbugs#20146
 +
 +	* font-lock.el (font-lock-extend-jit-lock-region-after-change):
 +	Return the calculated values, as per spec.
  
  2015-03-20  Dmitry Gutov  <dgutov@yandex.ru>