From: Glenn Morris <rgm@gnu.org>
Date: Sat, 12 Apr 2014 19:24:17 +0000 (-0700)
Subject: Merge from emacs-24; up to 2014-04-07T20:54:16Z!dancol@dancol.org
X-Git-Tag: emacs-25.0.90~2640^2~236
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e0af409500d5f44b34a6e8d971f0c7abe1d747fe;p=emacs.git

Merge from emacs-24; up to 2014-04-07T20:54:16Z!dancol@dancol.org
---

e0af409500d5f44b34a6e8d971f0c7abe1d747fe
diff --cc lisp/ChangeLog
index 08591ac591f,e90693180a8..1eebbe986b8
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,15 -1,36 +1,39 @@@
 -2014-04-12  Matthias Dahl  <matthias.dahl@binary-island.eu>
 -
 -	* faces.el (make-face): Deprecate optional argument as it is no
 -	longer needed/used since the conditional X resources handling
 -	has been pushed down to make-face-x-resource-internal itself.
 -	(make-empty-face): Don't pass optional argument to make-face.
 -
+ 2014-04-12  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* international/characters.el <standard-case-table>: Add entries
+ 	for letters from the Coptic block u+2C80-u+2CFF.  (Bug#17243)
+ 	Set category of Coptic characters be 'g' (Greek).
+ 
+ 2014-04-12  Leo Liu  <sdl.web@gmail.com>
+ 
 -	* progmodes/octave.el (completion-table-with-cache): Define if not
 -	available.
 -	(octave-goto-function-definition)
 -	(octave-sync-function-file-names)
 -	(octave-find-definition-default-filename): Backquote upattern for
 -	compatibility.
++	* progmodes/octave.el (completion-table-with-cache):
++	Define if not available.
++	(octave-goto-function-definition, octave-sync-function-file-names)
++	(octave-find-definition-default-filename):
++	Backquote upattern for compatibility.
+ 
 -2014-04-11  Michael Albinus  <michael.albinus@gmx.de>
++2014-04-12  Michael Albinus  <michael.albinus@gmx.de>
+ 
+ 	* net/tramp-sh.el (tramp-sh-handle-file-truename): Quote the file
+ 	name twice due to backticks.  (Bug#17238)
+ 
 -2014-04-11  Glenn Morris  <rgm@gnu.org>
++2014-04-12  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* term/w32-win.el (x-win-suspend-error):
+ 	* term/x-win.el (x-win-suspend-error): Sync docs.
+ 
 -2014-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 +2014-04-12  Matthias Dahl  <matthias.dahl@binary-island.eu>
 +
 +	* faces.el (make-face): Remove deprecated optional argument. The
 +	conditional application of X resources is handled directly by
 +	make-face-x-resource-internal since Emacs 24.4.
 +	(make-empty-face): Don't pass optional argument to make-face.
 +
 +2014-04-11  Glenn Morris  <rgm@gnu.org>
 +
 +	* Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.  (Bug#16429)
 +
 +2014-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
  
  	Ediff's overlay priorities cause more trouble than they solve.
  	* vc/ediff-init.el (ediff-shadow-overlay-priority): Remove variable.
diff --cc src/ChangeLog
index 927b0010347,cb17738d139..30852b3ae56
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,18 +1,16 @@@
+ 2014-04-12  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* xdisp.c (move_it_by_lines): If a large portion of buffer text is
+ 	covered by a display string that ends in a newline, and that cases
+ 	going back by DVPOS lines to hit the search limit, lift the limit
+ 	and go back until DVPOS is reached.  (Bug#17244)
+ 
+ 	* indent.c (Fvertical_motion): Handle correctly the case when the
+ 	display string is preceded by an empty line.
+ 
 -2014-04-11  Eli Zaretskii  <eliz@gnu.org>
 -
+ 	* w32.c (sys_umask) <WRITE_USER>: Remove redundant constant, and
+ 	use S_IWRITE instead.
+ 
  2014-04-11  Glenn Morris  <rgm@gnu.org>
  
  	* keyboard.c (Fopen_dribble_file): Make file private.  (Bug#17187)