Commit graph

13225 commits

Author SHA1 Message Date
Eli Zaretskii
8549f9e89b Remove all references to buffer-file-type and related features.
src/xdisp.c (decode_mode_spec): Remove handling of %t.

 lisp/net/ange-ftp.el (ange-ftp-insert-file-contents): Don't reference
 buffer-file-type.
 lisp/mail/feedmail.el (feedmail-force-binary-write): Doc fix.
 (feedmail-run-the-queue, feedmail-dump-message-to-queue)
 (feedmail-send-it-immediately): Don't bind buffer-file-type, bind
 coding-system-for-write instead.
 lisp/jka-compr.el (jka-compr-write-region): Don't bind
 buffer-file-type.
 lisp/emacs-lisp/bytecomp.el (byte-compile-file): Don't bind
 buffer-file-type.
 lisp/files.el (file-name-buffer-file-type-alist): Remove defvar.
 (insert-file-contents-literally): Remove reference to
 file-name-buffer-file-type-alist.
 lisp/dos-w32.el (file-name-buffer-file-type-alist): Deprecate and
 make-obsolete.
 (find-buffer-file-type-match, find-buffer-file-type): Remove.
 (find-buffer-file-type-coding-system): Remove references to
 find-buffer-file-type-match, find-buffer-file-type, and
 buffer-file-type.
 Don't put find-buffer-file-type-coding-system into
 file-coding-system-alist.
 (find-file-binary, find-file-text): Bind coding-system-for-read
 instead of file-name-buffer-file-type-alist.
 lisp/erc/erc-dcc.el (erc-dcc-get-file): Don't reference buffer-file-type.

 doc/emacs/msdog.texi (Text and Binary): Delete the description of
 file-name-buffer-file-type-alist.

 doc/lispref/modes.texi (%-Constructs): Remove the description of %t.
 doc/lispref/nonascii.texi (MS-DOS File Types): Delete node.

Fixes: debbugs:12989
2013-02-09 14:52:01 +02:00
Eli Zaretskii
6b48c83105 src/msdos.c (careadlinkatcwd): Remove. 2013-02-09 11:02:17 +02:00
Stefan Monnier
75a65c7eb4 * src/lread.c (skip_dyn_bytes): New function.
(read1): Use it.  Use getc instead of READCHAR to read bytes.
(load_each_byte): Remove.  Update users.

Fixes: debbugs:12598
2013-02-08 12:42:09 -05:00
Dmitry Antipov
8ca3092052 * search.c (scan_buffer): Calculate end byte position just once.
(scan_newline): Do not recalculate start_byte.
(search_command): Use eassert.
* syntax.c (struct lisp_parse_state): New member location_byte.
(scan_sexps_forward): Record from_byte and avoid redundant
character to byte position calculation ...
(Fparse_partial_sexp): ... here.  Break too long line.
2013-02-08 18:44:53 +04:00
Dmitry Antipov
25721f5bb5 * lisp.h (make_uninit_vector): New function.
* alloc.c (Fvector, Fmake_byte_code):
* ccl.c (Fregister_ccl_program):
* charset.c (Fdefine_charset_internal, define_charset_internal):
* coding.c (make_subsidiaries, Fdefine_coding_system_internal):
* composite.c (syms_of_composite):
* font.c (Fquery_font, Ffont_info, syms_of_font):
* fontset.c (FONT_DEF_NEW, Fset_fontset_font):
* ftfont.c (ftfont_shape_by_flt):
* indent.c (recompute_width_table):
* nsselect.m (clean_local_selection_data):
* syntax.c (init_syntax_once):
* w32unsubscribe.c (uniscribe_shape):
* window.c (Fcurrent_window_configuration):
* xfaces.c (Fx_family_fonts):
* xselect.c (selection_data_to_lisp_data): Use it.
2013-02-08 09:28:52 +04:00
Dmitry Antipov
9a9d91d9c2 * coding.c (Fdefine_coding_system_internal): Use AREF where
argument is known to be a vector.
* fns.c (Flocale_info): Likewise for ASET.
* xselect.c (selection_data_to_lisp_data): Likewise for ASET.
* w32fns.c (w32_parse_hot_key): Likewise for ASIZE and AREF.
2013-02-07 20:09:04 +04:00
Jan Djärv
6871e574da * lisp/cus-start.el (all): Add ns-use-native-fullscreen.
* src/nsmenu.m (update_frame_tool_bar): Check for negative tool bar
height.

* src/nsterm.h (HAVE_NATIVE_FS): Define if OSX => 10.7.
(EmacsView): Add fs_is_native, fsIsNative, isFullscreen and
updateCollectionBehaviour.

* src/nsterm.m (NEW_STYLE_FS): Remove.
(ns_last_use_native_fullscreen): New variable.
(x_make_frame_visible): Replace NEW_STYLE_FS with isFullscreen.
(x_set_window_size): Do not take title bar and tool bar into account
if isFullscreen returns YES.
(ns_fullscreen_hook): Replace NEW_STYLE_FS with isFullscreen.
(check_native_fs): New function.
(ns_select, ns_read_socket): Call check_native_fs if HAVE_NATIVE_FS.
(ns_term_init): Remove NEW_STYLE_FS.
(updateFrameSize:, windowWillResize:toSize:): Only adjust for title bar
and tool bar if isFullscreen returns NO.
(windowDidResize:): Replace NEW_STYLE_FS with fsIsNative.
(initFrameFromEmacs:): Initialize fs_is_native.  Replace NEW_STYLE_FS
with HAVE_NATIVE_FS.
(window:willUseFullScreenPresentationOptions:): New method.
(windowDidEnterFullScreen:): Replace NEW_STYLE_FS with fsIsNative.
Hide toolbar if not enabled.
(windowDidExitFullScreen:): Call updateCollectionBehaviour.
Restore tool bar if enabled, hide it otherwise (Bug#13444).
(fsIsNative, isFullscreen, updateCollectionBehaviour): New methods.
(toggleFullScreen:): If fs_is_native, call toggleFullScreen on
window.  Do no set FRAME_EXTERNAL_TOOL_BAR (f) to 0.
Check FRAME_EXTERNAL_TOOL_BAR (f) before restoring
FRAME_TOOLBAR_HEIGHT (f).  Call updateFrameSize when going non-fs.
(syms_of_nsterm): Add ns-use-native-fullscreen.
2013-02-05 13:16:35 +01:00
Paul Eggert
3f011c7f7c * fileio.c (Qchoose_write_coding_system): Now static. 2013-02-04 08:33:30 -08:00
Eli Zaretskii
86f7c0fe60 Fix bugs #13623 and 13626 caused by changes in 2013-02-01T07:23:18Z!dmantipov@yandex.ru.
src/xdisp.c (window_buffer_changed): region_showing can be negative,
 which still means region is being displayed.
 (redisplay_internal): Resurrect code that forced redisplay of the
 whole window when showing region and the mark has changed.  Record
 the new mark position to allow redisplay optimizations.
 (display_line): If it->region_beg_charpos is non-zero, set the
 window's region_showing member to -1.
 src/window.h (struct window) <region_showing>: Declare ptrdiff_t,
 not bitfield of 1 bit.
2013-02-04 17:39:55 +02:00
Daniel Colascione
5257b7014c * emacs.c: Use execvp, not execv, when DAEMON_MUST_EXEC, so that
daemon mode works on cygw32 when Emacs is installed and not just
during development.
2013-02-03 08:45:37 -08:00
Paul Eggert
8ea41ea996 Avoid file time stamp bug on MS-Windows.
* fileio.c (Fwrite_region): Don't use the heuristic on empty files,
as FAT32 doesn't update time stamps when truncating them.
Also, check that a file time stamp is not a multiple of 100 ns;
this should catch all instances of the problem on MS-Windows,
as its native file system resolution is 100 ns or worse, and
checking for a non-multiple of 100 ns should impose only a small
overhead on systems with ns resolution.

Fixes: debbugs:13149
2013-02-02 11:18:00 -08:00
Eli Zaretskii
e7ac588e19 Avoid encoding file names run through dostounix_filename on MS-Windows.
src/w32.c (normalize_filename): Accept an additional argument
 MULTIBYTE; if non-zero, traverse the file name by bytes and don't
 downcase it even if w32-downcase-file-names is non-nil.
 (dostounix_filename): Accept an additional argument MULTIBYTE and
 pass it to normalize_filename.
 (emacs_root_dir): Adjust.
 src/msdos.h (dostounix_filename): Adjust prototype.
 src/w32.h (dostounix_filename): Adjust prototype.
 src/msdos.c (dostounix_filename): Accept an additional argument and
 ignore it.
 (init_environment): Adjust callers of dostounix_filename.
 src/fileio.c (Ffile_name_directory, file_name_as_directory)
 (directory_file_name, Fexpand_file_name)
 (Fsubstitute_in_file_name): [DOS_NT] Adjust call to
 dostounix_filename.
 [WINDOWSNT]: Downcase file names if w32-downcase-file-names is
 non-nil.
 (Fsubstitute_in_file_name): [DOS_NT] Don't downcase environment
 variables, as egetenv is case-insensitive for DOS_NT.
 src/dired.c (file_name_completion): Don't call Fdirectory_file_name
 with an encoded file name.
 src/w32proc.c (Fw32_short_file_name, Fw32_long_file_name): Adjust
 calls to dostounix_filename.
 src/w32fns.c (Fx_file_dialog): Adjust call to dostounix_filename.
 src/unexw32.c (unexec): Adjust call to dostounix_filename.
 src/termcap.c (tgetent) [MSDOS]: Adjust call to dostounix_filename.
 src/emacs.c (decode_env_path) [DOS_NT]: Adjust call to
 dostounix_filename.
 src/callproc.c (Fcall_process) [MSDOS]: Adjust call to
 dostounix_filename.
2013-02-02 19:14:24 +02:00
Glenn Morris
94fbc90170 Merge from emacs-24; up to 2012-12-13T09:45:54Z!lekktu@gmail.com 2013-02-01 19:38:21 -08:00
Paul Eggert
35e854998e Fix timestamp bug when write-region appends nothing.
* fileio.c (Fwrite_region): When neither O_EXCL nor O_TRUNC is used,
the file's time stamp doesn't change if Emacs happens to write nothing
to the file, and on a buggy file system this could cause Emacs to
incorrectly infer that the file system doesn't have the bug.
Avoid this problem by inhibiting the inference in this case.

Fixes: debbugs:13149
2013-02-01 12:51:12 -08:00
Eli Zaretskii
e7c3fb0624 Make sure program names are encoded before using them to invoke subprocesses.
src/callproc.c (Fcall_process): Make sure program name in PATH and
 new_argv[0] is encoded, if needed.  Otherwise, un-encoded string
 is passed to exec/spawnve, which fails unless the file-name
 encoding is UTF-8.
2013-02-01 12:15:36 +02:00
Eli Zaretskii
18a80473ed w32proc.c (sys_spawnve): Initialize escape_char.
src/w32proc.c (sys_spawnve): Make sure escape_char is initialized,
 even if w32-quote-process-args is nil.
2013-02-01 11:23:23 +02:00
Dmitry Antipov
422ff52b80 * window.h (struct window): Convert base_line_number, base_line_pos
and column_number_displayed members from Lisp_Object to ptrdiff_t.
Convert region_showing member from Lisp_Object to bitfield.
Remove sequence_number member.  Adjust comments.
* window.c (sequence_number): Remove.
(make_window): Initialize column_number_displayed.
* print.c (print_object): Follow the printed representation of
frames and print window pointer to distinguish between windows.
(adjust_window_count): Invalidate base_line_pos.  Adjust comment.
* xdisp.c (wset_base_line_number, wset_base_line_pos)
(wset_column_number_displayed, wset_region_showing): Remove.
(window_buffer_changed, mode_line_update_needed, redisplay_internal)
(try_scrolling, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(display_mode_lines, decode_mode_spec): Adjust users.
* .gdbinit (pwinx): Do not print sequence_number.
2013-02-01 11:23:18 +04:00
Paul Eggert
8654f9d7d6 Use fdopendir, fstatat and readlinkat, for efficiency.
On my host, this speeds up directory-files-and-attributes by a
factor of 3, when applied to Emacs's src directory.
These functions are standardized by POSIX and are common these
days; fall back on a (slower) gnulib implementation if the host
is too old to supply them.
* .bzrignore: Add lib/dirent.h.
* lib/Makefile.am (libgnu_a_SOURCES): Add openat-die.c, save-cwd.c.
* lib/careadlinkat.c, lib/careadlinkat.h: Merge from gnulib,
incorporating: 2013-01-29 careadlinkat: do not provide careadlinkatcwd.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/dirent.in.h, lib/fdopendir.c, lib/fstatat.c, lib/openat-priv.h:
* lib/openat-proc.c, lib/openat.h, m4/dirent_h.m4, m4/fdopendir.m4:
* m4/fstatat.m4: New files, from gnulib.
* lib/openat-die.c, lib/save-cwd.c, lib/save-cwd.h: New files.
These last three are specific to Emacs and are not copied from gnulib.
They are simpler than the gnulib versions and are tuned for Emacs.
* admin/merge-gnulib (GNULIB_MODULES): Add fdopendir, fstatat, readlinkat.
(GNULIB_TOOL_FLAGS): Do not avoid at-internal, openat-h.
Avoid dup, open, opendir.
* nt/inc/sys/stat.h (fstatat):
* nt/inc/unistd.h (readlinkat): New decls.
* src/conf_post.h (GNULIB_SUPPORT_ONLY_AT_FDCWD): Remove.
* src/dired.c: Include <fcntl.h>.
(open_directory): New function, which uses open and fdopendir
rather than opendir.  DOS_NT platforms still use opendir, though.
(directory_files_internal, file_name_completion): Use it.
(file_attributes): New function, with most of the old Ffile_attributes.
(directory_files_internal, Ffile_attributes): Use it.
(file_attributes, file_name_completion_stat): First arg is now fd,
not dir name.  All uses changed.  Use fstatat rather than lstat +
stat.
(file_attributes): Use emacs_readlinkat rather than Ffile_symlink_p.
* src/fileio.c: Include <allocator.h>, <careadlinkat.h>.
(emacs_readlinkat): New function, with much of the old
Ffile_symlink_p, but with an fd argument for speed.
It uses readlinkat rather than careadlinkatcwd, so that it
need not assume the working directory.
(Ffile_symlink_p): Use it.
* src/filelock.c (current_lock_owner): Use emacs_readlinkat
rather than emacs_readlink.
* src/lisp.h (emacs_readlinkat): New decl.
(READLINK_BUFSIZE, emacs_readlink): Remove.
* src/sysdep.c: Do not include <allocator.h>, <careadlinkat.h>.
(emacs_norealloc_allocator, emacs_readlink): Remove.
This stuff is moved to fileio.c.
* src/w32.c (fstatat, readlinkat): New functions.
(careadlinkat): Don't check that fd == AT_FDCWD.
(careadlinkatcwd): Remove; no longer needed.

Fixes: debbugs:13539
2013-01-31 22:30:51 -08:00
Glenn Morris
20a8c47792 ChangeLog for previous fileio.c change 2013-01-31 09:07:57 -08:00
Glenn Morris
9dbda10075 Reduce delay between backing up a file and saving new version
* lisp/files.el (basic-save-buffer-2):
Choose coding system for writing the file before backing it up.

* src/fileio.c (choose_write_coding_system): Make it callable from Lisp.
(Fwrite_region): If coding-system-for-write is set, don't call
choose_write_coding_system.
Move the last piece of choose_write_coding_system here.
(syms_of_fileio): Add choose-write-coding-system.

Fixes: debbugs:13522
2013-01-30 22:35:45 -08:00
Glenn Morris
3f82a88a05 Merge from emacs-24; up to 2012-12-12T22:29:54Z!yamaoka@jpl.org 2013-01-30 00:07:37 -08:00
Eli Zaretskii
cf01a35981 Make opendir on MS-Windows accept a 'const char *'.
src/w32.c (opendir): Now accepts a 'const char *'.

 nt/inc/dirent.h (opendir): Update prototype.
2013-01-28 16:41:08 +02:00
Dmitry Antipov
6fd326b7ae Remove obsolete redisplay code. See the discussion at
http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00576.html.
* dispnew.c (preemption_period, preemption_next_check): Remove.
(Vredisplay_preemption_period): Likewise.
(update_frame, update_single_window, update_window, update_frame_1):
Adjust users.  Always assume that PERIODIC_PREEMPTION_CHECKING is not
used, following the 2012-06-22 change.
2013-01-28 09:47:51 +04:00
Eli Zaretskii
224f4ec129 Tentative fix for bug #13546 with failure to save files on Windows.
src/w32.c (sys_open): Zero out the flags for the new file descriptor.
 (sys_close): Zero out the flags for the file descriptor before
 closing it.
2013-01-27 10:04:16 +02:00
Eli Zaretskii
806fed21f1 Fix bug #13553 with usage of IS_DIRECTORY_SEP on MS-Windows under DBCS.
src/w32.c (parse_root, get_volume_info, readdir, read_unc_volume)
 (logon_network_drive, stat_worker, symlink, chase_symlinks): Use
 CharNextExA and CharPrevExA to iterate over file names encoded in
 DBCS.
2013-01-26 14:49:34 +02:00
Dmitry Antipov
59e624b37b * insdel.c (insert_1): Remove.
* lisp.h (insert_1): Remove prototype.
* xdisp.c (message_dolog): Adjust users to call insert_1_both.
2013-01-25 21:13:31 +04:00
Eli Zaretskii
26854e9c9e Use file-name-coding-system when decoding symlinks on MS-Windows.
src/w32.c (readlink): Use the current file-name-coding-system, not the ANSI
 codepage, to decode and handle targets of symlinks.
2013-01-25 16:47:37 +02:00
Eli Zaretskii
cda5fe8063 Revert 2013-01-25T10:27:16Z!eliz@gnu.org. 2013-01-25 16:38:21 +02:00
Eli Zaretskii
6ee4509abf Support MS-Windows file names encoded in multibyte encodings.
src/w32.c (w32_get_long_filename, init_environment, readlink):
 Support file names encoded in DBCS codepages.
2013-01-25 16:34:26 +02:00
Eli Zaretskii
69bb66c12e w32.c (readlink): Support DBCS codepages. 2013-01-25 12:27:16 +02:00
Eli Zaretskii
d8cd7742b3 Update doc string of w32notify-add-watch per discussions in bug #13540.
src/w32notify.c (Fw32notify_add_watch): Doc fix.
2013-01-25 11:39:47 +02:00
Dmitry Antipov
266fee4f1e * font.c (num_fonts): Remove the leftover from old
debugging code.  Adjust comment style here and there.
2013-01-25 10:31:41 +04:00
Glenn Morris
830e46e61b Merge from emacs-24; up to 2012-12-11T18:52:31Z!monnier@iro.umontreal.ca 2013-01-24 20:41:39 -08:00
Dmitry Antipov
fd3ceb0999 * nsfont.m (ns_escape_name, ns_unescape_name, ns_registry_to_script):
Avoid redundant calls to strlen.
2013-01-24 09:56:31 +04:00
Dmitry Antipov
edfa7fa092 Drop async_visible and async_iconified fields of struct frame.
This is possible because async input is gone; for details, see
http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00734.html.
* frame.h (struct frame): Remove async_visible and async_iconified
members, convert garbaged to unsigned bitfield.  Adjust comments.
(FRAME_SAMPLE_VISIBILITY): Remove.  Adjust all users.
(SET_FRAME_VISIBLE, SET_FRAME_ICONIFIED): New macros.
* frame.c, gtkutil.c, term.c, w32fns.c, window.c, xdisp.c:
Consistently use SET_FRAME_VISIBLE, SET_FRAME_ICONIFIED,
FRAME_VISIBLE_P and FRAME_ICONIFIED_P macros where appropriate.
* w32term.c: Ditto.
(w32_read_socket): Save iconified state to generate DEICONIFY_EVENT
properly.  Likewise for obscured.
* xterm.c: Ditto.
(handle_one_xevent): Save visible state go generate ICONIFY_EVENT
properly.
* nsterm.m: Ditto.
(windowDidDeminiaturize): Generate DEICONIFY_EVENT.
2013-01-24 09:41:28 +04:00
Dmitry Antipov
5ad86e34d8 * src/insdel.c (prepare_to_modify_buffer): Revert last change as suggested
in http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00555.html.
* lisp/doc-view.el (doc-view-display): Force mode line update until
all document is converted.  Suggested by Stefan Monnier (Bug#13164).
2013-01-24 07:34:20 +04:00
Stefan Monnier
b09cca6ace * src/xdisp.c (message2, message2_nolog): Remove functions.
(message3, message3_nolog): Extract nbytes and multibyteness directly
from the string.  Change all callers.
(message3_nolog): Don't set message_enable_multibyte since set_message
will reset it anyway.
(message1, message1_nolog): Use message3.
(vmessage): Use a stack allocated buffer rather than f->message_buf.
(with_echo_area_buffer): Remove last two arguments.  Update all callers.
(set_message): Drop all but the second arg, which has to be a string.
(set_message_1): Simplify now that we know that a1 is NULL and the
second arg is a string.
* src/frame.h (struct frame): Remove `message_buf' field.
Use glyphs_initialized_p instead.
(FRAME_MESSAGE_BUF): Remove macro.
* src/w16select.c (Fw16_set_clipboard_data): Prefer message3 to message2.
* src/lisp.h (message2, message2_nolog): Remove declarations.
(message3, message3_nolog): Update declarations.
* src/keyboard.c (read_char_minibuf_menu_text)
(read_char_minibuf_menu_width): Remove vars.
(read_char_minibuf_menu_prompt): Rewrite the menu's construction so as
to correctly handle multibyte strings.
* src/frame.c (delete_frame): Don't free message_buf any more.
* src/editfns.c (message_text, message_length): Remove vars.
(Fmessage_box): Don't copy the Lisp string's bytes any longer.
* src/fileio.c (auto_save_error): Use message3 instead of message2.
* src/dispnew.c (adjust_frame_message_buffer): Remove function.
2013-01-23 15:07:28 -05:00
Eli Zaretskii
54ab1c5acf Fix dimensions of maximized frame on MS-Windows.
src/w32term.c (w32fullscreen_hook): Account correctly for the screen
 real estate used for the tool bar, the menu bar, and scroll bar.
2013-01-23 18:52:05 +02:00
Eli Zaretskii
6d2851de77 Fix bug #13515 with processing DBCS file names on MS-Windows.
src/w32.c (max_filename_mbslen): New function.
 (normalize_filename, readdir): Use it to detect locales where ANSI
 encoding of file names uses a double-byte character set (DBCS).
 If a DBCS encoding is used, advance by characters using
 CharNextExA, instead of incrementing a 'char *' pointer.  Use
 _mbslwr instead of _strlwr.
2013-01-23 18:11:04 +02:00
Dmitry Antipov
6c27465b76 * insdel.c (prepare_to_modify_buffer): Force redisplay if
hidden buffer is prepared to modification (Bug#13164).
2013-01-23 18:49:54 +04:00
Eli Zaretskii
81abbb9544 Fix bug #13065 with file selector dialog on Windows 7.
src/w32heap.c (allocate_heap) [!_WIN64]: Decrease the initial
 request of memory reservation to 1.7GB.
2013-01-22 15:30:17 +02:00
Dmitry Antipov
9d93ce29bd * window.h (struct window): Change window_end_valid member from
Lisp_Object to a bitfield.  Adjust comments.
(wset_window_end_valid): Remove.
* window.c (adjust_window_count): Clear window_end_valid.
(Fwindow_end): Adjust user.  Remove ancient #if 0 code.
(Fwindow_line_height, set_window_buffer, Frecenter)
(Fsplit_window_internal, Fdelete_other_windows_internal)
(Fset_window_fringes, Fset_window_scroll_bars): Adjust users.
* dispnew.c (adjust_glyph_matrix, clear_window_matrices): Likewise.
* xdisp.c (check_window_end, reconsider_clip_changes)
(redisplay_internal, mark_window_display_accurate_1, redisplay_window)
(try_window, try_window_reusing_current_matrix, note_mouse_highlight)
(find_first_unchanged_at_end_row, try_window_id): Likewise.
2013-01-22 15:48:00 +04:00
Dmitry Antipov
1dcb8ea263 * xdisp.c (mark_window_display_accurate): Simplify the loop
assuming that the only one of vchild, hchild or buffer window
slots is non-nil.  Call mark_window_display_accurate_1 for
the leaf windows only.
(mark_window_display_accurate_1): Always assume leaf window.
Adjust comment.
2013-01-22 15:41:21 +04:00
Paul Eggert
593a5f2efd * emacs.c (Qkill_emacs_hook): Now static. 2013-01-21 23:48:59 -08:00
Paul Eggert
b41b8a7eff * fileio.c (Finsert_file_contents): Simplify.
Remove unnecessary assignments and tests.
2013-01-21 22:10:20 -08:00
Eli Zaretskii
84e5ed96b0 Another minor fix in acl_set_file on Windows.
src/w32.c (acl_set_file): Don't test for errors unless
 set_file_security returns FALSE.  Avoids spurious errors when
 saving files.
2013-01-21 20:00:19 +02:00
Dmitry Antipov
2ef88fd45c * fileio.c (Finsert_file_contents): Revert code introduced at
2013-01-18 in favor of the simpler and generally better fix.
Save stack space by removing 'buffer' and reusing 'read_buf'
where appropriate.
2013-01-21 21:01:09 +04:00
Andreas Schwab
ba14c607ba Fixes: debbugs:13505
* src/coding.c (detect_coding_iso_2022): Move back mis-reordered code
at check_extra_latin label.
2013-01-20 23:59:47 +01:00
Paul Eggert
d7a0a7c9bd * lisp.h (eabs): Define unconditionally.
The old "#if !defined (eabs)" was an unnecessary revenant of back
when this macro was called "abs".  Document 'eabs' better.

Fixes: debbugs:13419
2013-01-19 14:33:29 -08:00
Glenn Morris
795e7a5b32 Merge from emacs-24; up to 2012-12-11T09:51:12Z!dmantipov@yandex.ru 2013-01-19 12:38:13 -08:00