Michael Albinus [Tue, 23 Jul 2013 14:06:02 +0000 (16:06 +0200)]
* net/tramp.el (tramp-handle-file-notify-add-watch): New defun.
* net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* net/tramp-smb.el (tramp-smb-file-name-handler-alist): Use it.
Juanma Barranquero [Tue, 23 Jul 2013 11:29:30 +0000 (13:29 +0200)]
lisp/desktop.el (desktop-list*): Fix previous change.
Glenn Morris [Tue, 23 Jul 2013 10:17:48 +0000 (06:17 -0400)]
Auto-commit of generated files.
Paul Eggert [Tue, 23 Jul 2013 09:06:46 +0000 (10:06 +0100)]
Fix ChangeLog typo.
Paul Eggert [Tue, 23 Jul 2013 08:08:57 +0000 (09:08 +0100)]
Port to GNU/Linux systems with tinfo but not ncurses.
* configure.ac (USE_NCURSES): New symbol.
* src/dispnew.c (init_display): Depend on USE_NCURSES, not GNU_LINUX,
to decide whether ncurses is being used. Without this change,
GCC complains about tgetent not being declared, on a system
that has tinfo installed but ncurses not installed.
Paul Eggert [Tue, 23 Jul 2013 07:22:16 +0000 (08:22 +0100)]
* eval.c (Fprogn): Check that BODY is a proper list.
Katsumi Yamaoka [Tue, 23 Jul 2013 07:04:24 +0000 (07:04 +0000)]
[Gnus] Fix previous commit
* gnus.el (gnus-continuum-version):
* gnus-msg.el (gnus-extended-version): Simplify.
* gnus.el (gnus-continuum-version-1): Remove.
* gnus-msg.el (gnus-bug): Revert.
Paul Eggert [Tue, 23 Jul 2013 06:48:34 +0000 (07:48 +0100)]
Tune UNEVALLED functions by using XCAR instead of Fcar, etc.
* data.c (Fsetq_default):
* eval.c (Fif, Fcond, Fprog1, Fsetq, Fquote, Ffunction, Fdefvar)
(Fdefconst, FletX, Flet, Fwhile, Fcatch, Funwind_protect)
(Fcondition_case):
Tune by taking advantage of the fact that ARGS is always a list
when a function is declared to have UNEVALLED args.
Paul Eggert [Tue, 23 Jul 2013 06:38:51 +0000 (07:38 +0100)]
* emacsgtkfixed.c: Port to GCC 4.6.
GCC 4.6 complains about -Wunused-local-typedefs, introduced in 4.7.
Katsumi Yamaoka [Tue, 23 Jul 2013 05:22:20 +0000 (05:22 +0000)]
Calculate gnus-version correctly on Cygwin
* gnus.el (gnus-continuum-version): Do main calculations in integers.
(gnus-continuum-version-1): New function, return a string.
* gnus-msg.el (gnus-extended-version, gnus-bug):
Use gnus-continuum-version-1 instead of gnus-continuum-version.
Juanma Barranquero [Tue, 23 Jul 2013 01:11:40 +0000 (03:11 +0200)]
src/callproc.c (child_setup): Silence compiler warnings.
Juanma Barranquero [Tue, 23 Jul 2013 01:10:54 +0000 (03:10 +0200)]
lisp/desktop.el: Simplify.
(desktop-clear): Simplify; remove useless checks against invalid buffer names.
(desktop-list*): Use cl-list*.
(desktop-buffer-info, desktop-create-buffer): Simplify.
Leo Liu [Tue, 23 Jul 2013 00:58:28 +0000 (08:58 +0800)]
* bookmark.el (bookmark-make-record): Restore NAME as a default
value.
Fixes: debbugs:14933
Stefan Monnier [Mon, 22 Jul 2013 23:21:14 +0000 (19:21 -0400)]
* lisp/emacs-lisp/autoload.el (autoload--setup-output): New function,
extracted from autoload--insert-text.
(autoload--insert-text): Remove.
(autoload--print-cookie-text): New function, extracted from
autoload--insert-cookie-text.
(autoload--insert-cookie-text): Remove.
(autoload-generate-file-autoloads): Adjust calls accordingly.
Stefan Monnier [Mon, 22 Jul 2013 22:51:29 +0000 (18:51 -0400)]
* lisp/winner.el (winner-hook-installed-p): Remove.
(winner-mode): Simplify accordingly.
Stefan Monnier [Mon, 22 Jul 2013 17:24:31 +0000 (13:24 -0400)]
* lisp/subr.el (add-to-list): Fix compiler-macro when `append' is
not constant. Don't use `cl-member' for the base case.
Stefan Monnier [Mon, 22 Jul 2013 16:25:32 +0000 (12:25 -0400)]
* lisp/progmodes/subword.el: Fix boundary case.
(subword-forward-regexp): Make it a constant. Wrap optional \\W in its
own group.
(subword-backward-regexp): Make it a constant.
(subword-forward-internal): Don't treat a trailing capital as the
beginning of a word.
* test/automated/subword-tests.el: New file.
Fixes: debbugs:13758
Paul Eggert [Mon, 22 Jul 2013 15:30:54 +0000 (16:30 +0100)]
* sysdep.c (frame) [__FreeBSD__]: #define to freebsd_frame
when including <sys/user.h>, to prevent Sparc/ARM machine/frame.h
from messing up Emacs's 'struct frame'.
Fixes: debbugs:14923
Ari Roponen [Mon, 22 Jul 2013 11:39:32 +0000 (13:39 +0200)]
lisp/emacs-lisp/package.el (package-menu-mode): Fix bug#14930.
Don't modify the global value of tabulated-list-revert-hook.
Glenn Morris [Mon, 22 Jul 2013 10:21:02 +0000 (06:21 -0400)]
Auto-commit of loaddefs files.
Michael Albinus [Mon, 22 Jul 2013 09:19:00 +0000 (11:19 +0200)]
* files.texi (Magic File Names): Add file-notify-add-watch,
file-notify-rm-watch and file-notify-supported-p. Move
file-remote-p down.
* errors.texi (Standard Errors): Add file-notify-error.
* os.texi (Desktop Notifications): Rename from Notifications.
(File Notifications): New node.
* elisp.texi (Top): Update menu for these changes.
Michael Albinus [Mon, 22 Jul 2013 09:17:21 +0000 (11:17 +0200)]
Fix typo.
Stefan Monnier [Mon, 22 Jul 2013 04:06:21 +0000 (00:06 -0400)]
* lisp/url/url-http.el (status): Remove, unused.
(success): Remove var.
(url-http-handle-authentication): Return the value that `success'
should take instead of setting `success' directly. Don't set `status'
since it's not used.
(url-http-parse-headers): Avoid unneeded setq.
Move the `setq success'.
(url-http): Use pcase.
(url-http-file-exists-p): Simplify.
Juanma Barranquero [Mon, 22 Jul 2013 01:25:47 +0000 (03:25 +0200)]
lisp/desktop.el: Require 'cl-lib.
(desktop-before-saving-frames-functions): New hook.
(desktop--process-minibuffer-frames): Set desktop-mini parameter only
for frames being saved. Rename from desktop--save-minibuffer-frames.
(desktop-save-frames): Run hook desktop-before-saving-frames-functions.
Do not save frames with non-nil `desktop-dont-save' parameter. Filter
out deleted frames.
(desktop--find-frame): Use cl-find-if.
(desktop--select-frame): Use cl-(first|second|third) to access values
of desktop-mini.
(desktop--make-frame): Use cl-delete-if.
(desktop--sort-states): Fix sorting of minibuffer-owning frames.
(desktop-restore-frames): Use cl-(first|second|third) to access values
of desktop-mini. Look for visible frame at the end, not while
restoring frames.
Juanma Barranquero [Mon, 22 Jul 2013 01:04:10 +0000 (03:04 +0200)]
lisp/dired-x.el: Fix bug#14927.
(dired-mark-unmarked-files, dired-virtual, dired-guess-default)
(dired-mark-sexp, dired-filename-at-point): Use string-match-p, looking-at-p.
Juanma Barranquero [Sun, 21 Jul 2013 17:45:12 +0000 (19:45 +0200)]
lisp/desktop.el: Make some frame-restoring functions public.
(desktop-saved-frame-states): Rename from desktop--saved-states;
all users changed.
(desktop-save-frames): Rename from desktop--save-frames.
Do not save state to desktop file.
(desktop-save): Save desktop-saved-frame-states to desktop file
and reset to nil.
(desktop-restoring-frames-p): New function.
(desktop-restore-frames): Use it. Rename from desktop--restore-frames.
(desktop-read): Use desktop-restoring-frames-p. Do not try to fix
buffer-lists when restoring frames. Suggested by Martin Rudalics.
Paul Eggert [Sun, 21 Jul 2013 15:56:55 +0000 (08:56 -0700)]
* alloc.c (make_save_ptr_ptr): Define this function.
It was inadvertently omitted. It's needed only if
HAVE_MENUS && ! (USE_X_TOOLKIT || USE_GTK).
Jan Djärv [Sun, 21 Jul 2013 11:47:07 +0000 (13:47 +0200)]
* nsterm.m (sendEvent:): Skip mouse moved if no dialog and no Emacs
frame have focus.
Fixes: debbugs:14895
Glenn Morris [Sun, 21 Jul 2013 10:19:07 +0000 (06:19 -0400)]
Auto-commit of generated files.
Paul Eggert [Sun, 21 Jul 2013 06:53:47 +0000 (23:53 -0700)]
Avoid vfork-related deadlock more cleanly.
* callproc.c (child_setup): When the child's exec fails, output
the program name, as that's more useful. Use O_NONBLOCK to avoid
deadlock.
* process.c (create_process_1): Remove; no longer needed.
(create_process): Remove timer hack; no longer needed, now that
the child avoids deadlock.
Paul Eggert [Sun, 21 Jul 2013 04:22:33 +0000 (21:22 -0700)]
Spelling fixes.
Juanma Barranquero [Sun, 21 Jul 2013 02:53:19 +0000 (04:53 +0200)]
lisp/ChangeLog, src/ChangeLog: Fix typos.
Juanma Barranquero [Sun, 21 Jul 2013 02:42:11 +0000 (04:42 +0200)]
lisp/desktop.el: Correctly restore iconified frames.
(desktop--filter-iconified-position): New function.
(desktop-filter-parameters-alist): Add entries for `top' and `left'.
Glenn Morris [Sat, 20 Jul 2013 19:29:02 +0000 (12:29 -0700)]
image-dired.el: use with-current-buffer
* lisp/image-dired.el (image-dired-track-original-file):
Use with-current-buffer.
(image-dired-track-thumbnail): Use with-current-buffer.
Avoid changing point of wrong window.
Glenn Morris [Sat, 20 Jul 2013 19:25:05 +0000 (12:25 -0700)]
Tweak some message calls in gdb-mi.el
* lisp/progmodes/gdb-mi.el (gdb-delete-handler, gdb-stopped):
Let `message' do the formatting.
(def-gdb-preempt-display-buffer): Add explicit format.
Glenn Morris [Sat, 20 Jul 2013 19:20:33 +0000 (12:20 -0700)]
Merge from emacs-24; up to 2012-12-31T11:35:13Z!rudalics@gmx.at
Glenn Morris [Sat, 20 Jul 2013 19:17:32 +0000 (12:17 -0700)]
* lisp/image-dired.el (image-dired-track-original-file):
Avoid changing point of wrong window.
Fixes: debbugs:14909
Andreas Schwab [Sat, 20 Jul 2013 15:41:38 +0000 (17:41 +0200)]
* international/mule.el (coding-system-iso-2022-flags): Fix last
change.
Paul Eggert [Sat, 20 Jul 2013 15:33:00 +0000 (08:33 -0700)]
Fix array bounds violation when pty allocation fails.
* configure.ac (PTY_TTY_NAME_SPRINTF): Use PTY_NAME_SIZE,
not sizeof pty_name, since pty_name is now a pointer to the array.
* src/process.c (PTY_NAME_SIZE): New constant.
(pty_name): Remove static variable; it's now auto.
(allocate_pty): Define even if !HAVE_PTYS; that's simpler.
Take pty_name as an arg rather than using a static variable.
All callers changed.
(create_process): Recover pty_flag from process, not from volatile local.
(create_pty): Stay inside array even when pty allocation fails.
(Fmake_serial_process): Omit unnecessary initializaiton of pty_flag.
Paul Eggert [Sat, 20 Jul 2013 14:21:25 +0000 (07:21 -0700)]
* lread.c (Fload): Avoid initialization only when lint checking.
Mention that it's needed only for older GCCs.
Kenichi Handa [Sat, 20 Jul 2013 11:51:53 +0000 (20:51 +0900)]
merge trunk
Kenichi Handa [Sat, 20 Jul 2013 11:45:50 +0000 (20:45 +0900)]
coding.c (decode_coding_iso_2022): Fix previous change.
Kenichi Handa [Sat, 20 Jul 2013 11:22:56 +0000 (20:22 +0900)]
mule.el (coding-system-iso-2022-flags): Change 8-bit-level-4'
Andreas Schwab [Sat, 20 Jul 2013 08:25:46 +0000 (10:25 +0200)]
* lread.c (Fload): Avoid uninitialized warning.
Kenichi Handa [Sat, 20 Jul 2013 04:19:05 +0000 (13:19 +0900)]
* coding.c (CODING_ISO_FLAG_LEVEL_4): New macro.
(decode_coding_iso_2022): Check the single-shift area. (Bug#8522)
Kenichi Handa [Sat, 20 Jul 2013 04:15:37 +0000 (13:15 +0900)]
* mule.el (coding-system-iso-2022-flags): Add `level-4'. (Bug#8522)
Paul Eggert [Fri, 19 Jul 2013 18:09:23 +0000 (11:09 -0700)]
Fix some minor file descriptor leaks and related glitches.
* filelock.c (create_lock_file) [!O_CLOEXEC]: Use fcntl with FD_CLOEXEC.
(create_lock_file): Use write, not emacs_write.
* image.c (slurp_file, png_load_body):
* process.c (Fnetwork_interface_list, Fnetwork_interface_info)
(server_accept_connection):
Don't leak an fd on memory allocation failure.
* image.c (slurp_file): Add a cheap heuristic for growing files.
* xfaces.c (Fx_load_color_file): Block input around the fopen too,
as that's what the other routines do. Maybe input need not be
blocked at all, but it's better to be consistent.
Avoid undefined behavior when strlen is zero.
Paul Eggert [Fri, 19 Jul 2013 17:54:26 +0000 (10:54 -0700)]
* alloc.c (staticpro): Avoid buffer overrun on repeated calls.
(NSTATICS): Now a constant; doesn't need to be a macro.
Richard M. Stallman [Fri, 19 Jul 2013 16:15:51 +0000 (12:15 -0400)]
(decode_coding_utf_8): Add simple loop for fast processing of ASCII characters.
Lars Magne Ingebrigtsen [Fri, 19 Jul 2013 14:57:28 +0000 (16:57 +0200)]
* net/shr.el (shr-mouse-browse-url): New command and keystroke.
Fixes: debbugs:14815
Gnus developers [Fri, 19 Jul 2013 14:50:21 +0000 (14:50 +0000)]
Merge Changes made in Gnus master
2013-07-19 Geoff Kuenning <geoff@cs.hmc.edu> (tiny change)
* gnus.texi (Customizing Articles): Document function predicates.
2013-07-19 Geoff Kuenning <geoff@cs.hmc.edu> (tiny change)
* gnus-art.el (gnus-treat-predicate): Allow functions as predicates (bug#13384).
2013-07-18 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-start.el (gnus-clean-old-newsrc): Remove the newsrc cleanups
that were only relevant in a development version a long time ago.
Lars Magne Ingebrigtsen [Fri, 19 Jul 2013 14:44:16 +0000 (16:44 +0200)]
eww textarea input fixup
* net/eww.el (eww-process-text-input): Allow inputting when the
point is at the start of the line, as the properties aren't
front-sticky.
Paul Eggert [Fri, 19 Jul 2013 14:34:56 +0000 (07:34 -0700)]
* conf_post.h (RE_TRANSLATE_P) [emacs]: Remove obsolete optimization.
Lars Magne Ingebrigtsen [Fri, 19 Jul 2013 14:07:43 +0000 (16:07 +0200)]
(shr-make-table-1): Ensure that we don't infloop on degenerate widths.
Richard M. Stallman [Fri, 19 Jul 2013 13:30:58 +0000 (09:30 -0400)]
* epa.el (epa-popup-info-window): Doc fix.
Richard M. Stallman [Fri, 19 Jul 2013 13:09:03 +0000 (09:09 -0400)]
Add a comment.
Richard M. Stallman [Fri, 19 Jul 2013 12:18:16 +0000 (08:18 -0400)]
split-string takes a new arg TRIM that's a regexp
saying what to trim from the start and end of each substring.
* subr.el (split-string): New arg TRIM.
Eli Zaretskii [Fri, 19 Jul 2013 10:55:36 +0000 (13:55 +0300)]
Fix the fix for bug #14901.
src/keyboard.c (kbd_buffer_get_event): Use Display_Info instead of
unportable 'struct x_display_info'.
(DISPLAY_LIST_INFO): Delete macro: not needed, since Display_Info
is a portable type.
Xue Fuqiao [Fri, 19 Jul 2013 06:31:17 +0000 (14:31 +0800)]
* doc/lispref/windows.texi (Display Action Functions): Mention next-window.
Paul Eggert [Fri, 19 Jul 2013 05:36:50 +0000 (22:36 -0700)]
* sysdep.c [GNU_LINUX]: Fix fd and memory leaks and similar issues.
(procfs_ttyname): Don't use uninitialized storage if emacs_fopen
or fscanf fails.
(system_process_attributes): Prefer plain char to unsigned char
when either will do. Clean up properly if interrupted or if
memory allocations fail. Don't assume sscanf succeeds. Remove
no-longer-needed workaround to stop GCC from whining. Read
command-line once, instead of multiple times. Check read status a
bit more carefully.
Paul Eggert [Fri, 19 Jul 2013 01:24:35 +0000 (18:24 -0700)]
Fix obscure porting bug with varargs functions.
The code assumed that int is treated like ptrdiff_t in a vararg
function, which is not a portable assumption. There was a similar
-- though these days less likely -- porting problem with various
assumptions that pointers of different types all smell the same as
far as vararg functions is conserved. To make this problem less
likely in the future, redo the API to use varargs functions.
* alloc.c (make_save_value): Remove this vararg function.
All uses changed to ...
(make_save_int_int_int, make_save_obj_obj_obj_obj)
(make_save_ptr_int, make_save_funcptr_ptr_obj, make_save_memory):
New functions.
(make_save_ptr): Rename from make_save_pointer, for consistency with
the above. Define only on platforms that need it. All uses changed.
Juanma Barranquero [Fri, 19 Jul 2013 00:38:19 +0000 (02:38 +0200)]
lisp/ChangeLog, src/ChangeLog: Fix typos.
Paul Eggert [Thu, 18 Jul 2013 21:16:33 +0000 (14:16 -0700)]
* keyboard.c: Try to fix typos in previous change.
(DISPLAY_LIST_INFO): New macro.
(kbd_buffer_get_event): Do not access members that are not present
in X11. Revert nadvertent change of "!=" to "=".
Richard Copley [Thu, 18 Jul 2013 16:56:08 +0000 (12:56 -0400)]
* gdb-mi.el (gdb-done-or-error): Guard against "%" in gdb output (tiny change)
Fixes: debbugs:14127
Juanma Barranquero [Thu, 18 Jul 2013 16:50:05 +0000 (18:50 +0200)]
Followup to 2013-07-16T11:41:06Z!jan.h.d@swipnet.se.
* lisp/frame.el (blink-cursor-timer-function, blink-cursor-suspend):
Add check for W32.
* src/keyboard.c (kbd_buffer_get_event):
* src/w32term.c (x_focus_changed): Port FOCUS_(IN|OUT)_EVENT changes to W32.
Katsumi Yamaoka [Thu, 18 Jul 2013 11:26:04 +0000 (11:26 +0000)]
gnus-art.el (gnus-shr-put-image): Make it work as well for shr.el's that the old Emacs 24s bundle
Paul Eggert [Thu, 18 Jul 2013 10:24:26 +0000 (03:24 -0700)]
* filelock.c: Fix unlikely file descriptor leaks.
(get_boot_time_1): Rework to avoid using emacs_open.
This doesn't actually fix a leak, but is better anyway.
(read_lock_data): Use read, not emacs_read.
Michael Albinus [Thu, 18 Jul 2013 10:03:49 +0000 (12:03 +0200)]
* filenotify.el (file-notify--library): Renamed from
`file-notify-support'. Do not autoload. Adapt all uses.
(file-notify-supported-p): New defun.
* autorevert.el (auto-revert-use-notify): Use
`file-notify-supported-p' instead of `file-notify-support'. Adapt
docstring.
(auto-revert-notify-add-watch): Use `file-notify-supported-p'.
* net/tramp.el (tramp-file-name-for-operation):
Add `file-notify-supported-p'.
* net/tramp-sh.el (tramp-sh-handle-file-notify-supported-p):
New defun.
(tramp-sh-file-name-handler-alist): Add it as handler for
`file-notify-supported-p '.
* net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `ignore' as handler for `file-notify-*' functions.
Paul Eggert [Thu, 18 Jul 2013 09:55:00 +0000 (02:55 -0700)]
* doc.c: Fix minor memory and file descriptor leaks.
* doc.c (get_doc_string): Fix memory leak when doc file absent.
(get_doc_string, Fsnarf_documentation):
Fix file descriptor leak on error.
Paul Eggert [Thu, 18 Jul 2013 08:35:27 +0000 (01:35 -0700)]
* term.c: Fix minor fdopen-related file descriptor leaks.
* term.c (Fresume_tty) [!MSDOS]: Close fd if fdopen (fd) fails.
(init_tty) [!DOS_NT]: Likewise. Also close fd if isatty (fd) fails.
Paul Eggert [Thu, 18 Jul 2013 02:12:59 +0000 (19:12 -0700)]
* charset.c: Fix file descriptor leaks and errno issues.
Include <errno.h>.
(load_charset_map_from_file): Don't leak file descriptor on error.
Use plain record_xmalloc since the allocation is larger than
MAX_ALLOCA; that's simpler here. Simplify test for exhaustion
of entries.
* eval.c (record_unwind_protect_nothing):
* fileio.c (fclose_unwind):
New functions.
* lread.c (load_unwind): Remove. All uses replaced by fclose_unwind.
The replacement doesn't block input, but that no longer seems
necessary.
Paul Eggert [Wed, 17 Jul 2013 17:24:54 +0000 (10:24 -0700)]
* lread.c: Fix file descriptor leaks and errno issues.
(Fload): Close some races that leaked fds or streams when 'load'
was interrupted.
(Fload, openp): Report error number of last nontrivial failure to open.
ENOENT counts as trivial.
* eval.c (do_nothing, clear_unwind_protect, set_unwind_protect_ptr):
New functions.
* fileio.c (close_file_unwind): No need to test whether FD is nonnegative,
now that the function is always called with a nonnegative arg.
* lisp.h (set_unwind_protect_ptr, set_unwind_protect_int): Remove.
All uses replaced with ...
(clear_unwind_protect, set_unwind_protect_ptr): New decls.
Eli Zaretskii [Wed, 17 Jul 2013 16:47:49 +0000 (19:47 +0300)]
Fix bug #14881 with scrolling images smaller than the window height.
lisp/simple.el (line-move-partial, line-move): Don't start vscroll or
scroll-up if the current line is not taller than the window.
Paul Eggert [Wed, 17 Jul 2013 04:37:27 +0000 (21:37 -0700)]
A few more minor file errno-reporting bugs.
* callproc.c (Fcall_process):
* doc.c (Fsnarf_documentation):
* fileio.c (Frename_file, Fadd_name_to_file, Fmake_symbolic_link):
* process.c (set_socket_option):
Don't let a constructor trash errno.
* doc.c: Include <errno.h>.
Juanma Barranquero [Tue, 16 Jul 2013 23:29:05 +0000 (01:29 +0200)]
src/w32fns.c (unwind_create_tip_frame): Fix declaration.
Paul Eggert [Tue, 16 Jul 2013 22:40:17 +0000 (15:40 -0700)]
Fix w32 bug with call-process-region.
* callproc.c (Fcall_process_region): Pass nil, not "/dev/null",
to Fcall_process when the input is empty. This simplifies the
code a bit. It makes no difference on POSIXish platforms but
apparently it fixes a bug on w32.
Fixes: debbugs:14885
Paul Eggert [Tue, 16 Jul 2013 21:49:32 +0000 (14:49 -0700)]
Fix bug where insert-file-contents closes a file twice.
* fileio.c (close_file_unwind): Don't close if FD is negative;
this can happen when unwinding a zapped file descriptor.
(Finsert_file_contents): Unwind-protect the fd before the point marker,
in case Emacs runs out of memory between the two unwind-protects.
Don't trash errno when closing FD.
Zap the FD in the specpdl when closing it, instead of deferring
the removal of the unwind-protect; this fixes a bug where a child
function unwinds the stack past us.
Fixes: debbugs:14839
Paul Eggert [Tue, 16 Jul 2013 21:35:45 +0000 (14:35 -0700)]
New unwind-protect flavors to better type-check C callbacks.
This also lessens the need to write wrappers for callbacks,
and the need for make_save_pointer.
* alloca.c (free_save_value):
* atimer.c (run_all_atimers):
Now extern.
* alloc.c (safe_alloca_unwind):
* atimer.c (unwind_stop_other_atimers):
* keyboard.c (cancel_hourglass_unwind) [HAVE_WINDOW_SYSTEM]:
* menu.c (cleanup_popup_menu) [HAVE_NS]:
* minibuf.c (choose_minibuf_frame_1):
* process.c (make_serial_process_unwind):
* xdisp.h (pop_message_unwind):
* xselect.c (queue_selection_requests_unwind):
Remove no-longer-needed wrapper. All uses replaced by the wrappee.
* alloca.c (record_xmalloc):
Prefer record_unwind_protect_ptr to record_unwind_protect with
make_save_pointer.
* alloca.c (Fgarbage_collect):
Prefer record_unwind_protect_void to passing a dummy.
* buffer.c (restore_buffer):
* window.c (restore_window_configuration):
* xfns.c, w32fns.c (do_unwind_create_frame)
New wrapper. All record-unwind uses of wrappee changed.
* buffer.c (set_buffer_if_live):
* callproc.c (call_process_cleanup, delete_temp_file):
* coding.c (code_conversion_restore):
* dired.c (directory_files_internal_w32_unwind) [WINDOWSNT]:
* editfns.c (save_excursion_restore)
(subst_char_in_region_unwind, subst_char_in_region_unwind_1)
(save_restriction_restore):
* eval.c (restore_stack_limits, un_autoload):
* fns.c (require_unwind):
* keyboard.c (recursive_edit_unwind, tracking_off):
* lread.c (record_load_unwind, load_warn_old_style_backquotes):
* macros.c (pop_kbd_macro, restore_menu_items):
* nsfns.m (unwind_create_frame):
* print.c (print_unwind):
* process.c (start_process_unwind):
* search.c (unwind_set_match_data):
* window.c (select_window_norecord, select_frame_norecord):
* xdisp.c (unwind_with_echo_area_buffer, unwind_format_mode_line)
(fast_set_selected_frame):
* xfns.c, w32fns.c (unwind_create_tip_frame):
Return void, not a dummy Lisp_Object. All uses changed.
* buffer.h (set_buffer_if_live): Move decl here from lisp.h.
* callproc.c (call_process_kill):
* fileio.c (restore_point_unwind, decide_coding_unwind)
(build_annotations_unwind):
* insdel.c (Fcombine_after_change_execute_1):
* keyboard.c (read_char_help_form_unwind):
* menu.c (unuse_menu_items):
* minibuf.c (run_exit_minibuf_hook, read_minibuf_unwind):
* sound.c (sound_cleanup):
* xdisp.c (unwind_redisplay):
* xfns.c (clean_up_dialog):
* xselect.c (x_selection_request_lisp_error, x_catch_errors_unwind):
Accept no args and return void, instead of accepting and returning
a dummy Lisp_Object. All uses changed.
* cygw32.c (fchdir_unwind):
* fileio.c (close_file_unwind):
* keyboard.c (restore_kboard_configuration):
* lread.c (readevalllop_1):
* process.c (wait_reading_process_output_unwind):
Accept int and return void, rather than accepting an Emacs integer
and returning a dummy object. In some cases this fixes an
unlikely bug when the corresponding int is outside Emacs integer
range. All uses changed.
* dired.c (directory_files_internal_unwind):
* fileio.c (do_auto_save_unwind):
* gtkutil.c (pop_down_dialog):
* insdel.c (reset_var_on_error):
* lread.c (load_unwind):
* xfns.c (clean_up_file_dialog):
* xmenu.c, nsmenu.m (pop_down_menu):
* xmenu.c (cleanup_widget_value_tree):
* xselect.c (wait_for_property_change_unwind):
Accept pointer and return void, rather than accepting an Emacs
save value encapsulating the pointer and returning a dummy object.
All uses changed.
* editfns.c (Fformat): Update the saved pointer directly via
set_unwind_protect_ptr rather than indirectly via make_save_pointer.
* eval.c (specpdl_func): Remove. All uses replaced by definiens.
(unwind_body): New function.
(record_unwind_protect): First arg is now a function returning void,
not a dummy Lisp_Object.
(record_unwind_protect_ptr, record_unwind_protect_int)
(record_unwind_protect_void): New functions.
(unbind_to): Support SPECPDL_UNWIND_PTR etc.
* fileio.c (struct auto_save_unwind): New type.
(do_auto_save_unwind): Use it.
(do_auto_save_unwind_1): Remove; subsumed by new do_auto_save_unwind.
* insdel.c (struct rvoe_arg): New type.
(reset_var_on_error): Use it.
* lisp.h (SPECPDL_UNWIND_PTR, SPECPDL_UNWIND_INT, SPECPDL_UNWIND_VOID):
New constants.
(specbinding_func): Remove; there are now several such functions.
(union specbinding): New members unwind_ptr, unwind_int, unwind_void.
(set_unwind_protect_ptr): New function.
* xselect.c: Remove unnecessary forward decls, to simplify maintenance.
Dmitry Gutov [Tue, 16 Jul 2013 19:16:51 +0000 (23:16 +0400)]
* lisp/progmodes/ruby-mode.el (ruby-block-beg-keywords): Inline.
(ruby-font-lock-keyword-beg-re): Extract from
`ruby-font-lock-keywords'.
Paul Eggert [Tue, 16 Jul 2013 18:30:52 +0000 (11:30 -0700)]
Be simpler and more consistent about reporting I/O errors.
* fileio.c (Fcopy_file, Finsert_file_contents, Fwrite_region):
Say "Read error" and "Write error", rather than "I/O error", or
"IO error reading", or "IO error writing", when a read or write
error occurs.
* process.c (Fmake_network_process, wait_reading_process_output)
(send_process, Fprocess_send_eof, wait_reading_process_output):
Capitalize diagnostics consistently. Put "failed foo" at the
start of the diagnostic, so that we don't capitalize the
function name "foo". Consistently say "failed" for such
diagnostics.
* sysdep.c, w32.c (serial_open): Now accepts Lisp string, not C string.
All callers changed. This is so it can use report_file_error.
* sysdep.c (serial_open, serial_configure): Capitalize I/O
diagnostics consistently as above.
Paul Eggert [Tue, 16 Jul 2013 16:39:42 +0000 (09:39 -0700)]
* fileio.c (report_file_errno): Fix errno reporting bug.
If the file name is neither null nor a pair, package it up as a
singleton list. All callers changed, both to this function and to
report_file_error. This fixes a bug where the memory allocator
invoked by list1 set errno so that the immediately following
report_file_error reported the wrong errno value.
Paul Eggert [Tue, 16 Jul 2013 14:52:22 +0000 (07:52 -0700)]
Fix minor problems found by --enable-gcc-warnings.
* frame.c (Fhandle_focus_in, Fhandle_focus_out): Return a value.
* keyboard.c (kbd_buffer_get_event): Remove unused local.
Dmitry Gutov [Tue, 16 Jul 2013 14:47:23 +0000 (18:47 +0400)]
* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Do not
highlight question marks in the method names as strings.
Jan Djärv [Tue, 16 Jul 2013 11:41:06 +0000 (13:41 +0200)]
Stop cursor blink after blink-cursor-blinks (10), stop timers when not blinking.
* etc/NEWS: Document blink-cursor-blinks and blink timers stopped.
* lisp/frame.el (blink-cursor-blinks): New defcustom.
(blink-cursor-blinks-done): New defvar.
(blink-cursor-start): Set blink-cursor-blinks-done to 1.
(blink-cursor-timer-function): Check if number of blinks has been
done on X and NS.
(blink-cursor-suspend, blink-cursor-check): New defuns.
* src/frame.c (Fhandle_focus_in, Fhandle_focus_out): New functions.
(Fhandle_switch_frame): Call Fhandle_focus_in.
(syms_of_frame): defsubr handle-focus-in/out.
* src/keyboard.c (Qfocus_in, Qfocus_out): New static objects.
(make_lispy_focus_in, make_lispy_focus_out): Declare and define.
(kbd_buffer_get_event): For FOCUS_IN, make a focus_in event if no
switch frame event is made. Check ! NILP (event->arg) if X11 (moved
from xterm.c). Make focus_out event for FOCUS_OUT_EVENT if NS or X11
and there is a focused frame.
(head_table): Add focus-in and focus-out.
(keys_of_keyboard): Add focus-in and focus-out to Vspecial_event_map,
bind to handle-focus-in/out.
* src/nsterm.m (windowDidResignKey): If this is the focused frame, generate
FOCUS_OUT_EVENT.
* src/termhooks.h (enum event_kind): Add FOCUS_OUT_EVENT.
* src/xterm.c (x_focus_changed): Always generate FOCUS_IN_EVENT.
Set event->arg to Qt if switch-event shall be generated.
Generate FOCUS_OUT_EVENT for FocusOut if this is the focused frame.
Paul Eggert [Tue, 16 Jul 2013 07:05:41 +0000 (00:05 -0700)]
Fix porting bug to older POSIXish platforms.
* sysdep.c (emacs_pipe): New function, that implements
pipe2 (fd, O_CLOEXEC) even on hosts that lack O_CLOEXEC.
This should port better to CentOS 5 and to Mac OS X 10.6.
All calls to pipe2 changed.
Fixes: debbugs:14862
Xue Fuqiao [Tue, 16 Jul 2013 06:45:01 +0000 (14:45 +0800)]
Fix the introduction of `set-frame-selected-window''s arguments.
* doc/lispref/windows.texi (Selecting Windows): Fix the introduction of `set-frame-selected-window''s arguments.
Paul Eggert [Tue, 16 Jul 2013 06:39:49 +0000 (23:39 -0700)]
Prefer list1 (X) to Fcons (X, Qnil) when building lists.
This makes the code easier to read and the executable a bit smaller.
Do not replace all calls to Fcons that happen to create lists,
just calls that are intended to create lists. For example, when
creating an alist that maps FOO to nil, use list1 (Fcons (FOO, Qnil))
rather than list1 (list1 (FOO)) or Fcons (Fcons (FOO, Qnil), Qnil).
Similarly for list2 through list5.
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer):
* bytecode.c (exec_byte_code):
* callint.c (quotify_arg, Fcall_interactively):
* callproc.c (Fcall_process, create_temp_file):
* charset.c (load_charset_map_from_file)
(Fdefine_charset_internal, init_charset):
* coding.c (get_translation_table, detect_coding_system)
(Fcheck_coding_systems_region)
(Fset_terminal_coding_system_internal)
(Fdefine_coding_system_internal, Fdefine_coding_system_alias):
* composite.c (update_compositions, Ffind_composition_internal):
* dired.c (directory_files_internal, file_name_completion)
(Fsystem_users):
* dispnew.c (Fopen_termscript, bitch_at_user, init_display):
* doc.c (Fsnarf_documentation):
* editfns.c (Fmessage_box):
* emacs.c (main):
* eval.c (do_debug_on_call, signal_error, maybe_call_debugger)
(Feval, eval_sub, Ffuncall, apply_lambda):
* fileio.c (make_temp_name, Fcopy_file, Faccess_file)
(Fset_file_selinux_context, Fset_file_acl, Fset_file_modes)
(Fset_file_times, Finsert_file_contents)
(Fchoose_write_coding_system, Fwrite_region):
* fns.c (Flax_plist_put, Fyes_or_no_p, syms_of_fns):
* font.c (font_registry_charsets, font_parse_fcname)
(font_prepare_cache, font_update_drivers, Flist_fonts):
* fontset.c (Fset_fontset_font, Ffontset_info, syms_of_fontset):
* frame.c (make_frame, Fmake_terminal_frame)
(x_set_frame_parameters, x_report_frame_params)
(x_default_parameter, Fx_parse_geometry):
* ftfont.c (syms_of_ftfont):
* image.c (gif_load):
* keyboard.c (command_loop_1):
* keymap.c (Fmake_keymap, Fmake_sparse_keymap, access_keymap_1)
(Fcopy_keymap, append_key, Fcurrent_active_maps)
(Fminor_mode_key_binding, accessible_keymaps_1)
(Faccessible_keymaps, Fwhere_is_internal):
* lread.c (read_emacs_mule_char):
* menu.c (find_and_return_menu_selection):
* minibuf.c (get_minibuffer):
* nsfns.m (Fns_perform_service):
* nsfont.m (ns_script_to_charset):
* nsmenu.m (ns_popup_dialog):
* nsselect.m (ns_get_local_selection, ns_string_from_pasteboard)
(Fx_own_selection_internal):
* nsterm.m (append2):
* print.c (Fredirect_debugging_output)
(print_prune_string_charset):
* process.c (Fdelete_process, Fprocess_contact)
(Fformat_network_address, set_socket_option)
(read_and_dispose_of_process_output, write_queue_push)
(send_process, exec_sentinel):
* sound.c (Fplay_sound_internal):
* textprop.c (validate_plist, add_properties)
(Fput_text_property, Fadd_face_text_property)
(copy_text_properties, text_property_list, syms_of_textprop):
* unexaix.c (report_error):
* unexcoff.c (report_error):
* unexsol.c (unexec):
* xdisp.c (redisplay_tool_bar, store_mode_line_string)
(Fformat_mode_line, syms_of_xdisp):
* xfaces.c (set_font_frame_param)
(Finternal_lisp_face_attribute_values)
(Finternal_merge_in_global_face, syms_of_xfaces):
* xfns.c (x_default_scroll_bar_color_parameter)
(x_default_font_parameter, x_create_tip_frame):
* xfont.c (xfont_supported_scripts):
* xmenu.c (Fx_popup_dialog, xmenu_show, xdialog_show)
(menu_help_callback, xmenu_show):
* xml.c (make_dom):
* xterm.c (set_wm_state):
Prefer list1 (FOO) to Fcons (FOO, Qnil) when creating a list,
and similarly for list2 through list5.
Paul Eggert [Tue, 16 Jul 2013 04:39:23 +0000 (21:39 -0700)]
Spelling fixes for "does not exists".
Glenn Morris [Mon, 15 Jul 2013 19:45:22 +0000 (15:45 -0400)]
* lisp/edmacro.el (edmacro-format-keys): Fix previous change.
Glenn Morris [Mon, 15 Jul 2013 16:03:47 +0000 (09:03 -0700)]
* src/image.c (Fimage_flush): Fix doc typo.
Paul Eggert [Mon, 15 Jul 2013 02:56:17 +0000 (19:56 -0700)]
* callproc.c (Fcall_process_region): Fix minor race and tune.
(create_temp_file): New function, with the temp-file-creation part
of the old Fcall_process_region. Use Fcopy_sequence to create the
temp file name, rather than alloca + build_string, for simplicity.
Don't bother to block input around the temp file creation;
shouldn't be needed. Simplify use of mktemp. Use
record_unwind_protect immediately after creating the temp file;
this closes an unlikely race where the temp file was not removed.
Use memcpy rather than an open-coded loop.
(Fcall_process_region): Use the new function. If the input is
empty, redirect from /dev/null rather than from a newly created
empty temp file; this avoids unnecessary file system traffic.
Paul Eggert [Mon, 15 Jul 2013 02:33:54 +0000 (19:33 -0700)]
* shell.el (explicit-bash-args): Remove obsolete hack for Bash 1.x.
The hack didn't work outside English locales anyway.
Juanma Barranquero [Mon, 15 Jul 2013 00:49:22 +0000 (02:49 +0200)]
lisp/simple.el (define-alternatives): Rename from alternatives-define.
Juanma Barranquero [Mon, 15 Jul 2013 00:07:51 +0000 (02:07 +0200)]
lisp/desktop.el (desktop-restore-frames): Change default to t.
(desktop-restore-in-current-display): Now offer more options.
(desktop-restoring-reuses-frames): New customization option.
(desktop--saved-states): Doc fix.
(desktop-filter-parameters-alist): New variable, renamed and expanded from
desktop--excluded-frame-parameters.
(desktop--target-display): New variable.
(desktop-switch-to-gui-p, desktop-switch-to-tty-p, desktop--filter-tty*)
(desktop--filter-*-color, desktop--filter-minibuffer)
(desktop--filter-restore-desktop-parm, desktop--filter-save-desktop-parm)
(desktop-restore-in-original-display-p): New functions.
(desktop--filter-frame-parms): Use new desktop-filter-parameters-alist.
(desktop--save-minibuffer-frames): New function, inspired by a similar
function from Martin Rudalics.
(desktop--save-frames): Call it; play nice with desktop-globals-to-save.
(desktop--restore-in-this-display-p): Remove.
(desktop--find-frame): Rename from desktop--find-frame-in-display and add
predicate argument.
(desktop--make-full-frame): Remove, integrated into desktop--make-frame.
(desktop--reuse-list): New variable.
(desktop--select-frame, desktop--make-frame, desktop--sort-states):
New functions.
(desktop--restore-frames): Add support for "minibuffer-special" frames.
Paul Eggert [Sun, 14 Jul 2013 23:12:42 +0000 (16:12 -0700)]
* filelock.c (create_lock_file) [!HAVE_MKOSTEMP && !HAVE_MKSTEMP]:
Simplify by making this case like the other two. This is a bit
slower on obsolete hosts, but the extra complexity isn't worth it.
Michael Albinus [Sun, 14 Jul 2013 18:45:50 +0000 (20:45 +0200)]
* net/tramp-sh.el (tramp-sh-handle-vc-registered): Use `ignore-error'.
Paul Eggert [Sun, 14 Jul 2013 05:18:48 +0000 (22:18 -0700)]
Spelling fixes.
Paul Eggert [Sun, 14 Jul 2013 00:30:45 +0000 (17:30 -0700)]
* callproc.c (child_setup, relocate_fd) [!DOS_NT]:
* process.c (create_process) [!DOS_NT]:
Remove now-unnecessary calls to emacs_close.
Dmitry Gutov [Sat, 13 Jul 2013 19:10:19 +0000 (23:10 +0400)]
* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
conversion methods on Kernel.
Alan Mackenzie [Sat, 13 Jul 2013 17:45:07 +0000 (17:45 +0000)]
progmodes/cc-engine.el (c-forward-decl-or-cast-1): Label CASE 13
and comment it out. This out-commenting enables certain C++
declarations to be parsed correctly.