Commit 95a2cb24 authored by Fabián Ezequiel Gallina's avatar Fabián Ezequiel Gallina
Browse files

Merge from origin/emacs-24

9664defd Signal a file-error from directory-files on MS-Windows  (Bug#19701)
fd4e65e4 Added missing test for previous commit
5485e3e5 python.el: New non-global state dependent indentation engine.
3b23e6a7 Fix the description of --insert command-line option  (Bug#19694)
7a7e5941 Add a cross-reference in ELisp manual.  (Bug#19668)
b4f40757 Fixes: debbugs:19660
83b3c312 * test/automated/regexp-tests.el: Require regexp-opt

Conflicts:
	lisp/progmodes/python.el
parents f5ebe84d 9664defd
2015-01-26 Eli Zaretskii <eliz@gnu.org>
* cmdargs.texi (Action Arguments): Clarify into which buffer
'--insert' inserts. (Bug#19694)
2015-01-21 Eli Zaretskii <eliz@gnu.org>
* programs.texi (Custom C Indent): Fix a typo. (Bug#19647)
......
......@@ -165,9 +165,12 @@ Evaluate Lisp expression @var{expression}.
@item --insert=@var{file}
@opindex --insert
@cindex insert file contents, command-line argument
Insert the contents of @var{file} into the @file{*scratch*} buffer
(@pxref{Lisp Interaction}). This is like what @kbd{M-x insert-file}
does (@pxref{Misc File Ops}).
Insert the contents of @var{file} into the buffer that is current when
this command-line argument is processed. Usually, this is the
@file{*scratch*} buffer (@pxref{Lisp Interaction}), but if arguments
earlier on the command line visit files or switch buffers, that might
be a different buffer. The effect of this command-line argument is
like what @kbd{M-x insert-file} does (@pxref{Misc File Ops}).
@item --kill
@opindex --kill
......
2015-01-24 Eli Zaretskii <eliz@gnu.org>
* searching.texi (Regexp Search): Add a cross-reference to "Syntax
of Regexps". (Bug#19668)
2015-01-21 Daniel Koning <dk@danielkoning.com> (tiny change)
* commands.texi (Drag Events, Motion Events, Event Examples)
......
......@@ -988,10 +988,11 @@ list of characters @var{chars}.
@cindex searching for regexp
In GNU Emacs, you can search for the next match for a regular
expression either incrementally or not. For incremental search
commands, see @ref{Regexp Search, , Regular Expression Search, emacs,
The GNU Emacs Manual}. Here we describe only the search functions
useful in programs. The principal one is @code{re-search-forward}.
expression (@pxref{Syntax of Regexps}) either incrementally or not.
For incremental search commands, see @ref{Regexp Search, , Regular
Expression Search, emacs, The GNU Emacs Manual}. Here we describe
only the search functions useful in programs. The principal one is
@code{re-search-forward}.
These search functions convert the regular expression to multibyte if
the buffer is multibyte; they convert the regular expression to unibyte
......
2015-01-26 Fabián Ezequiel Gallina <fgallina@gnu.org>
python.el: New non-global state dependent indentation engine.
(Bug#18319, Bug#19595)
* progmodes/python.el (python-syntax-comment-or-string-p): Accept
PPSS as argument.
(python-syntax-closing-paren-p): New function.
(python-indent-current-level)
(python-indent-levels): Mark obsolete.
(python-indent-context): Return more context cases.
(python-indent--calculate-indentation)
(python-indent--calculate-levels): New functions.
(python-indent-calculate-levels): Use them.
(python-indent-calculate-indentation, python-indent-line):
(python-indent-line-function): Rewritten to use new API.
(python-indent-dedent-line): Simplify logic.
(python-indent-dedent-line-backspace): Use `unless`.
(python-indent-toggle-levels): Delete function.
2015-01-21 Daniel Koning <dk@danielkoning.com> (tiny change)
* subr.el (posnp): Correct docstring of `posnp'.
......
This diff is collapsed.
2015-01-27 Eli Zaretskii <eliz@gnu.org>
* dired.c (directory_files_internal) [WINDOWSNT]: If readdir
returns NULL and errno is ENOTDIR, behave as if opendir failed to
open the directory. (Bug#19701)
* w32.c (sys_readdir): If FindFirstFile fails because the
directory doesn't exist, set errno to ENOTDIR.
2015-01-24 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (drawRect:): Add block/unblock_input (Bug#19660).
2015-01-21 Paul Eggert <eggert@cs.ucla.edu>
Fix coding.c subscript error
......
......@@ -238,6 +238,19 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
QUIT;
continue;
}
#ifdef WINDOWSNT
/* The MS-Windows implementation of 'opendir' doesn't
actually open a directory until the first call to
'readdir'. If 'readdir' fails to open the directory, it
sets errno to ENOTDIR; we convert it here to ENOENT so
that the error message is similar to what happens on
Posix hosts in such cases. */
if (errno == ENOTDIR)
{
errno = ENOENT;
report_file_error ("Opening directory", directory);
}
#endif
break;
}
......
......@@ -6773,7 +6773,9 @@ - (void)drawRect: (NSRect)rect
return;
ns_clear_frame_area (emacsframe, x, y, width, height);
block_input ();
expose_frame (emacsframe, x, y, width, height);
unblock_input ();
/*
drawRect: may be called (at least in OS X 10.5) for invisible
......
......@@ -3433,7 +3433,22 @@ sys_readdir (DIR *dirp)
}
if (dir_find_handle == INVALID_HANDLE_VALUE)
return NULL;
{
switch (GetLastError ())
{
case ERROR_PATH_NOT_FOUND:
case ERROR_ACCESS_DENIED:
case ERROR_INVALID_DRIVE:
case ERROR_BAD_NETPATH:
/* This special value will be noticed by
directory_files_internal, which see. */
errno = ENOTDIR;
break;
default:
break;
}
return NULL;
}
}
else if (w32_unicode_filenames)
{
......
2015-01-26 Fabián Ezequiel Gallina <fgallina@gnu.org>
* automated/python-tests.el (python-indent-pep8-1)
(python-indent-pep8-2, python-indent-pep8-3)
(python-indent-after-comment-1, python-indent-after-comment-2)
(python-indent-inside-paren-1, python-indent-inside-paren-2)
(python-indent-after-block-1, python-indent-after-block-2)
(python-indent-after-backslash-1, python-indent-after-backslash-2)
(python-indent-after-backslash-3, python-indent-block-enders-1)
(python-indent-block-enders-2, python-indent-block-enders-3)
(python-indent-block-enders-4, python-indent-block-enders-5)
(python-indent-dedenters-1, python-indent-dedenters-2)
(python-indent-dedenters-3, python-indent-dedenters-4)
(python-indent-dedenters-5, python-indent-dedenters-6)
(python-indent-dedenters-7, python-indent-dedenters-8): Fix tests.
(python-indent-base-case, python-indent-after-block-3)
(python-indent-after-backslash-5, python-indent-inside-paren-3)
(python-indent-inside-paren-4, python-indent-inside-paren-5)
(python-indent-inside-paren-6, python-indent-inside-string-1)
(python-indent-inside-string-2, python-indent-inside-string-3)
(python-indent-dedent-line-backspace-1): New Tests.
2015-01-24 Glenn Morris <rgm@gnu.org>
* automated/regexp-tests.el: Require regexp-opt, which is
not preloaded --without-x.
2015-01-26 Stefan Monnier <monnier@iro.umontreal.ca>
* automated/cl-generic-tests.el: Try and make sure cl-lib is not
......
This diff is collapsed.
......@@ -23,6 +23,8 @@
;;; Code:
(require 'regexp-opt)
(ert-deftest regexp-test-regexp-opt ()
"Test the `compilation-error-regexp-alist' regexps.
The test data is in `compile-tests--test-regexps-data'."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment