1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-30 19:53:09 +00:00
Commit Graph

112214 Commits

Author SHA1 Message Date
Michael Albinus
500dd7a35d Fix last patch. 2013-07-10 17:18:39 +02:00
Michael Albinus
525c5c7704 Improve error messages. (Bug#14808)
* net/tramp.el (tramp-current-connection): New defvar, moved from
tramp-sh.el.
(tramp-message-show-progress-reporter-message): Removed, not
needed anymore.
(tramp-error-with-buffer): Show message in minibuffer.  Discard
input before waiting.  Reset connection timestamp.
(with-tramp-progress-reporter): Improve messages.
(tramp-process-actions): Use progress reporter.  Delete process in
case of error.  Improve messages.

* net/tramp-sh.el (tramp-barf-if-no-shell-prompt): Use
condition-case.  Call `tramp-error-with-buffer' with vector and buffer.
(tramp-current-connection): Removed.
(tramp-maybe-open-connection): The car of
`tramp-current-connection' are the first 3 slots of the vector.
2013-07-10 16:58:26 +02:00
Ted Zlatanov
c7a4d3688e * progmodes/cfengine.el: Do not indent inside continued strings. 2013-07-10 10:34:13 -04:00
Michael Albinus
12580a07f4 Add comment. 2013-07-10 16:07:17 +02:00
Jan Djärv
29be4a5095 * emacs.c (main): Fix syntax error. 2013-07-10 13:27:15 +02:00
Glenn Morris
20c9c1dc90 Auto-commit of generated files. 2013-07-10 06:17:38 -04:00
Paul Eggert
c6e7fc0ea7 * Makefile.in (removenullpaths): Remove adjacent null paths.
Fixes: debbugs:14835
2013-07-09 23:41:37 -07:00
Paul Eggert
954b166e90 Timestamp fixes for undo.
* doc/lispref/text.texi (Undo):
Document (t . 0) and (t . -1) in buffer-undo-list.
* etc/NEWS: Changes to visited-file-modtime, set-visited-file-modtime.
* lisp/files.el (clear-visited-file-modtime): Move here from fileio.c.
* src/atimer.c (schedule_atimer):
* src/fileio.c (Ffile_newer_than_file_p):
Minor cleanup: use EMACS_TIME_LT so that we can remove EMACS_TIME_GT.
* src/buffer.c (buffer-undo-list): Document (t . 0) and (t . -1).
* src/fileio.c (Fclear_visited_file_modtime): Move to lisp/files.el.
(syms_of_fileio): Remove Sclear_visited_file_name.
(Fvisited_file_modtime): Return -1, not (-1 ...), when the visited
file doesn't exist; this avoids an ambiguity with negative timestamps.
(Fset_visited_file_modtime): Accept -1 and 0 as time-list arg.
* src/systime.h (make_emacs_time, invalid_emacs_time):
Don't assume struct timespec layout; POSIX doesn't guarantee it.
(EMACS_TIME_NE, EMACS_TIME_GT, EMACS_TIME_GE): Remove.
* src/undo.c (record_first_change): Push (visited-file-modtime) onto
undo list rather than reimplementing it by hand, incorrectly.

Fixes: debbugs:14824
2013-07-09 23:26:23 -07:00
Leo Liu
56973319b5 * files.el (require-final-newline): Allow safe local value.
Fixes: debbugs:14834
2013-07-10 11:10:27 +08:00
Glenn Morris
c54c978e1d * INSTALL: Try to clarify role of make distclean.
Fixes: debbugs:14833
2013-07-09 14:30:24 -04:00
Peter Rosin
2aae948de5 Avoid nexted functions in AC_LANG_PROGRAM test for Windows headers.
configure.ac (HAVE_W32): Avoid nested functions (the second
 argument of AC_LANG_PROGRAM is already expanded inside a
 function).

Fixes: debbugs:14830
2013-07-09 21:06:25 +03:00
Paul Eggert
7b154deff5 Port recent close-on-exec changes to Cygwin.
* lib/binary-io.c, lib/binary-io.h: New files.
Merge from gnulib, incorporating:
2013-07-09 accept4, dup3, pipe2: port to Cygwin
* lib/pipe2.c: Update from gnulib, as part of this merge.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.

Fixes: debbugs:14821
2013-07-09 10:16:21 -07:00
Ken Brown
d74647c382 * src/sheap.c (STATIC_HEAP_SIZE) [__x86_64__]: Increase to 18MB. 2013-07-09 09:56:47 -04:00
Glenn Morris
d236c30240 Auto-commit of generated files. 2013-07-09 06:17:37 -04:00
Juanma Barranquero
3c51b96b4a src/makefile.w32-in ($(BLD)/emacs.$(O), $(BLD)/sysdep.$(O)): Update. 2013-07-09 11:53:00 +02:00
Michael Albinus
59eb37e5f5 * automated/file-notify-tests.el (file-notify-test00-availability):
Set :expected-result.
(file-notify-test01-add-watch, file-notify-test01-add-watch-remote)
(file-notify-test02-events, file-notify-test02-events-remote)
(file-notify-test03-autorevert, file-notify-test03-autorevert-remote):
Skip when `file-notify-support' is nil.  (Bug#14823)
2013-07-09 09:52:25 +02:00
Glenn Morris
0b57d6fc8e * automated/inotify-test.el (inotify-add-watch, inotify-rm-watch): Declare.
(inotify-file-watch-simple): Silence compiler.
2013-07-09 00:43:12 -07:00
Glenn Morris
a87b74fe64 * test/automated/python-tests.el (python-indent-block-enders):
Make it actually test something.
2013-07-09 00:35:26 -07:00
Glenn Morris
08be5fba9c ChangeLog fix 2013-07-09 00:14:39 -07:00
Glenn Morris
771b2fc303 Explictly require ert in some test/automated/*.el files
* automated/add-log-tests.el, automated/advice-tests.el:
* automated/imenu-test.el, automated/python-tests.el:
* automated/ruby-mode-tests.el, automated/xml-parse-tests.el:
Explictly require ert.
2013-07-09 00:11:50 -07:00
Paul Eggert
4ebbdd6712 Handle errno and exit status a bit more carefully.
* lib/ignore-value.h: Remove this gnulib-imported file.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Remove ignore-value.
* src/callproc.c (child_setup) [!DOS_NT]: Don't try to stuff an error
number into an exit status.  Instead, use EXIT_CANCELED.
(child_setup) [!MSDOS]: Avoid possible deadlock with vfork.
* src/callproc.c (relocate_fd):
* src/emacs.c (close_output_streams, main):
* src/process.c (create_process):
* src/sysdep.c (sys_subshell) [!DOS_NT || !WINDOWSNT]:
Use emacs_perror for simplicity.
* src/callproc.c (relocate_fd, main):
* src/sysdep.c (sys_subshell):
Exit with EXIT_CANCELED etc., not 1, when exec setup fails.
(shut_down_emacs): Use emacs_write, not write.
* src/emacs.c, src/sysdep.c: Don't include <ignore-value.h>.
* src/fileio.c (Fcopy_file, e_write):
* src/nsterm.m (ns_select):
* src/process.c (send_process):
* src/sound.c (vox_write):
Use emacs_write_sig, not emacs_write.
* src/lisp.h (emacs_write_sig, emacs_perror): New decls.
* src/process.h (EXIT_CANCELED), EXIT_CANNOT_INVOKE, EXIT_ENOENT):
New constants.
* src/sysdep.c (emacs_backtrace): Use emacs_write, not ignore_value
of write.
(emacs_full_write): New function.
(emacs_write): Rewrite to use it.
(emacswrite_sig, emacs_perror): New functions.
* src/xrdb.c (fatal): Don't invoke perror, since errno might be garbage.
2013-07-09 00:04:48 -07:00
Glenn Morris
584ee3fc72 ChangeLog fix 2013-07-08 23:59:45 -07:00
Paul Eggert
1b6006a514 * filelock.c: Fix comment to match code. 2013-07-08 23:29:29 -07:00
Leo Liu
c28b9050d5 * ido.el (ido-add-virtual-buffers-to-list): Robustify. (Bug#14552) 2013-07-09 13:09:45 +08:00
Paul Eggert
cf7a0de6e7 Space between "defined" and "(". 2013-07-08 22:04:45 -07:00
Leo Liu
5550a72cf2 * ido.el (ido-read-directory-name): Handle fallback.
(ido-read-file-name): Update DIR to ido-current-directory.

Fixes: debbugs:1516
2013-07-09 10:47:44 +08:00
Dmitry Gutov
70c46b2816 * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove extra
"autoload".  Remove "warn lower camel case" section, previously
commented out.  Highlight negation char.  Do not highlight the
target in singleton method definitions.
2013-07-09 05:17:48 +04:00
Gnus developers
c17b81a7a5 Merge changes made in Gnus master 2013-07-08 23:51:26 +00:00
Stefan Monnier
7fd72e2c01 * lisp/faces.el (tty-setup-hook): Declare the hook. 2013-07-08 18:26:37 -04:00
Stefan Monnier
0b64b838a0 * lisp/emacs-lisp/pcase.el (pcase--split-pred): Add `vars' argument to try
and detect when a guard/pred depends on local vars.
(pcase--u1): Adjust caller.

Fixes: debbugs:14773
2013-07-08 17:54:54 -04:00
Andreas Schwab
f7a0389779 Fixes: debbugs:14826
* progmodes/sh-script.el (sh-read-variable): Remove interactive
spec.
2013-07-08 20:49:53 +02:00
Jan Djärv
9524a13dcb * NEWS: NS can be build with ImageMagick. 2013-07-08 19:54:39 +02:00
Eli Zaretskii
701d79aa3a Fix lisp/ChangeLog entry for last commit. 2013-07-08 20:33:17 +03:00
Eli Zaretskii
ab49d60b09 Improve scrolling when line-spacing is non-nil.
lisp/simple.el (line-move-partial, line-move): Account for
 line-spacing.
2013-07-08 20:30:50 +03:00
Jan Djärv
e4b1e5afb4 configure.ac (HAVE_IMAGEMAGICK): Check on NS also.
image.c (imagemagick_load_image): Do not use MagickExportImagePixels
on NS even if it is present.  Pixmap on NS is a void*.

Fixes: debbugs:14798
2013-07-08 15:26:13 +02:00
Kenichi Handa
6388fe5e47 merge trunk 2013-07-08 20:55:58 +09:00
Kenichi Handa
0f01f02fe7 decoder-tests.el (decoder-tests-prefer-utf-8-read):
Use with-ccoding-priority to avoid side-effect (Bug#14781).
2013-07-08 20:51:55 +09:00
Lars Magne Ingebrigtsen
2d756ae0d8 * net/shr.el (shr-map): Reinstate the `u' key binding
It's been used a while.
2013-07-08 13:19:51 +02:00
Glenn Morris
0cdca42ab2 Auto-commit of generated files. 2013-07-08 06:17:45 -04:00
Paul Eggert
2a74a90a03 Try to fix FreeBSD 9.1 porting problem.
This incorporates the following merge from gnulib:
2013-07-07 stdalign, verify: port to FreeBSD 9.1, to C11, and to C++11

Fixes: debbugs:14812
2013-07-07 23:15:38 -07:00
Paul Eggert
6602769357 Remove stray empty line. 2013-07-07 20:20:35 -07:00
Paul Eggert
9caab067d6 Port to Ubuntu 10.
Problem reported by T.V. Raman.
* configure.ac (accept4): New function to check for.
* src/process.c (close_on_exec, accept4, process_socket):
Define these if !HAVE_ACCEPT4, not if !SOCK_CLOEXEC.

Fixes: debbugs:14803
2013-07-07 16:22:43 -07:00
Juanma Barranquero
5165d44a78 ChangeLog fixes. 2013-07-08 01:05:52 +02:00
Juanma Barranquero
ed095bd758 lisp/subr.el (read-quoted-char): Remove unused local variable `char'. 2013-07-08 00:50:34 +02:00
Michael Kifer
f1e6674bb3 * faces.el (tty-run-terminal-initialization): function changed (Stefan
Monnier's patch).
	
	* viper.el (viper-emacs-state-mode-list): add egg-status-buffer-mode.
	(viper-version): version update.
	(viper-go-away,viper-setup-hooks): function changed (Stefan Monnier's
	patch).
	(viper--lookup-key,viper-catch-tty-ESC,viper-uncatch-tty-ESC,
	viper-setup-ESC-to-escape): new functions (Stefan Monnier's
	patch).
	
	* viper-cmd.el: (viper-del-forward-char-in-insert): new function.
	(viper-save-kill-buffer): check if buffer is modified.
	(viper-envelop-ESC-key): function deleted (Stefan Monnier's patch).
	(viper-intercept-ESC-key): function changed (Stefan Monnier's patch).
	
	* viper-keym.el (viper-ESC-key): constant changed (Stefan Monnier's
	patch).
	
	* ediff.el (ediff-files-command,ediff3-files-command): new functions.
	(ediff-merge-command,ediff-merge-with-ancestor-command): new functions.
	(ediff-directories-command,ediff-directories3-command): new functions.
	(ediff-merge-directories-command): new function.
	(ediff-merge-directories-with-ancestor-command): new function.
	All the above are command-line interfaces to ediff: facilitate calling
	Emacs with the appropriate ediff functions invoked.
	(ediff-version): version update.
2013-07-07 15:35:54 -04:00
Eli Zaretskii
1d44267275 MS-Windows followup for 2013-07-07T18:00:14Z!eggert@cs.ucla.edu.
nt/inc/sys/socket.h (F_SETFD, O_CLOEXEC, F_DUPFD_CLOEXEC)
 (FD_CLOEXEC): New macros.

 src/w32.c (sys_dup): Declare prototype.

 src/filelock.c:
 src/emacs.c:
 src/callproc.c [WINDOWSNT]: Include sys/socket.h.
2013-07-07 21:48:16 +03:00
Paul Eggert
067428c171 Make file descriptors close-on-exec when possible.
This simplifies Emacs a bit, since it no longer needs to worry
about closing file descriptors by hand in some cases.
It also fixes some unlikely races.  Not all such races, as
libraries often open files internally without setting
close-on-exec, but it's an improvement.
* admin/merge-gnulib (GNULIB_MODULES): Add fcntl, pipe2.
(GNULIB_TOOL_FLAGS): Avoid binary-io, close.  Do not avoid fcntl.
* configure.ac (mkostemp): New function to check for.
(PTY_OPEN): Pass O_CLOEXEC to posix_openpt.
* lib/fcntl.c, lib/getdtablesize.c, lib/pipe2.c, m4/fcntl.m4:
* m4/getdtablesize.m4, m4/pipe2.m4: New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* nt/gnulib.mk: Remove empty gl_GNULIB_ENABLED_verify section;
otherwise, gnulib-tool complains given close-on-exec changes.
* nt/inc/ms-w32.h (pipe): Remove.
* nt/mingw-cfg.site (ac_cv_func_fcntl, gl_cv_func_fcntl_f_dupfd_cloexec)
(gl_cv_func_fcntl_f_dupfd_works, ac_cv_func_pipe2): New vars.
* src/alloc.c (valid_pointer_p) [!WINDOWSNT]:
* src/callproc.c (Fcall_process) [!MSDOS]:
* src/emacs.c (main) [!DOS_NT]:
* src/nsterm.m (ns_term_init):
* src/process.c (create_process):
Use 'pipe2' with O_CLOEXEC instead of 'pipe'.
* src/emacs.c (Fcall_process_region) [HAVE_MKOSTEMP]:
* src/filelock.c (create_lock_file) [HAVE_MKOSTEMP]:
Prefer mkostemp with O_CLOEXEC to mkstemp.
* src/callproc.c (relocate_fd) [!WINDOWSNT]:
* src/emacs.c (main): Use F_DUPFD_CLOEXEC, not plain F_DUPFD.
No need to use fcntl (..., F_SETFD, FD_CLOEXEC), since we're
now using pipe2.
* src/filelock.c (create_lock_file) [! HAVE_MKOSTEMP]:
Make the resulting file descriptor close-on-exec.
* src/lisp.h, src/lread.c, src/process.c (close_load_descs, close_process_descs):
* src/lread.c (load_descriptor_list, load_descriptor_unwind):
Remove; no longer needed.  All uses removed.
* src/process.c (SOCK_CLOEXEC): Define to 0 if not supplied by system.
(close_on_exec, accept4, process_socket) [!SOCK_CLOEXEC]:
New functions.
(socket) [!SOCK_CLOEXEC]: Supply a substitute.
(Fmake_network_process, Fnetwork_interface_list):
(Fnetwork_interface_info, server_accept_connection):
Make newly-created socket close-on-exec.
* src/sysdep.c (emacs_open, emacs_fopen):
Make new-created descriptor close-on-exec.
* src/w32.c (fcntl): Support F_DUPFD_CLOEXEC well enough for Emacs.
* src/w32.c, src/w32.h (pipe2): Rename from 'pipe', with new flags arg.

Fixes: debbugs:14803
2013-07-07 11:00:14 -07:00
Eli Zaretskii
9aff9b3864 Improve scrolling of windows whose font is different from frame's default.
lisp/simple.el (default-font-height, window-screen-lines): New
 functions.
 (line-move, line-move-partial): Use them instead of
 frame-char-height and window-text-height.  This makes scrolling
 text smoother when the buffer's default face uses a font that is
 different from the frame's default font.
2013-07-07 18:49:03 +03:00
Jan Djärv
0da857ddac *** empty log message *** 2013-07-07 10:41:09 +02:00
Paul Eggert
5f86adcd2c Fix openp errno handling.
* callproc.c (Fcall_process): Preserve openp errno around close.
* lread.c (openp): Set errno when returning -1, as some callers
expect this.
2013-07-07 00:28:29 -07:00