From: Glenn Morris <rgm@gnu.org>
Date: Sun, 5 Oct 2014 17:19:23 +0000 (-0700)
Subject: Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier@iro.umontreal.ca
X-Git-Tag: emacs-25.0.90~2635^2~679^2~118
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/249635f0dfb22bcae4c7134e95f01640a6a0d149

Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier@iro.umontreal.ca
---

249635f0dfb22bcae4c7134e95f01640a6a0d149
diff --cc doc/emacs/ChangeLog
index 4014725adf,773e3bb51e..59d4280e78
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,10 -1,8 +1,14 @@@
 -2014-10-04  Glenn Morris  <rgm@gnu.org>
++2014-10-05  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* misc.texi (Sorting):
+ 	* search.texi (Query Replace): Markup fixes.
+ 
 +2014-10-04  Martin Rudalics  <rudalics@gmx.at>
 +
- 	* frames.texi (Scroll Bars): Describe use of horizontal scroll
- 	bars.
++	* frames.texi (Scroll Bars): Describe use of horizontal scroll bars.
 +
 +2014-10-04  Glenn Morris  <rgm@gnu.org>
 +
  	* cmdargs.texi (Misc X):
  	* display.texi (Optional Mode Line):
  	* misc.texi (emacsclient Options):
diff --cc lisp/ChangeLog
index 3a88ac6b37,d5eda032f7..039387ed4a
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,30 -1,7 +1,34 @@@
+ 2014-10-05  Leo Liu  <sdl.web@gmail.com>
+ 
+ 	* imenu.el (imenu-default-goto-function): Fix typo.
+ 
 +2014-10-04  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
 +
 +	* net/ntlm.el (ntlm-build-auth-request):
 +	Add NTLM2 Session support.  (Bug#15603)
 +
 +2014-10-04  Glenn Morris  <rgm@gnu.org>
 +
 +	* apropos.el (apropos-symbols-internal):
 +	Avoid error with non-symbol properties.  (Bug#18337#16)
 +
 +	* startup.el (command-line):
 +	Handle altered user-emacs-directory in load-path warning.  (Bug#18512)
 +
 +2014-10-04  Martin Rudalics  <rudalics@gmx.at>
 +
 +	* window.el (window-full-height-p): Make it behave correctly for
 +	minibuffer window.
 +	(window-current-scroll-bars): Fix code.
 +	(fit-frame-to-buffer): Use window-scroll-bar-height instead of
 +	window-scroll-bars.
 +	* frame.el (frame-current-scroll-bars): Fix doc-string.
 +	* scroll-bar.el (toggle-horizontal-scroll-bar): New command.
 +
 +2014-10-04  Mark Oteiza  <mvoteiza@udel.edu>  (tiny change)
 +
 +	* files.el (auto-mode-alist): Use sh-mode for .zsh files.  (Bug#18488)
 +
  2014-10-04  Glenn Morris  <rgm@gnu.org>
  
  	* frame.el (frame-monitor-attributes)