1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 16:21:07 -08:00
Commit graph

112671 commits

Author SHA1 Message Date
Dmitry Antipov
6bdcbfe1e3 * buffer.c (Foverlays_at, Foverlays_in, Fnext_overlay_change)
(Fprevious_overlay_change): Fast path for buffer with no overlays.
2013-08-28 12:33:12 +04:00
Paul Eggert
50b13cdedb * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
for portability to hosts where /bin/sh has problems.
2013-08-27 23:01:52 -07:00
Dmitry Antipov
f60e429a1a Redesign redisplay interface to drop global output_cursor.
* dispextern.h (struct redisplay_interface): Remove cursor_to member.
(toplevel): Remove declaration of output_cursor.
(set_output_cursor, x_cursor_to): Remove prototype.
* window.h (struct window): New member output_cursor.
(output_cursor_to): New function to replace RIF member.
* dispnew.c (redraw_overlapped_rows, update_marginal_area)
(update_text_area, set_window_cursor_after_update): Use it.
* xdisp.c (output_cursor, set_output_cursor, x_cursor_to): Remove.
(x_write_glyphs, x_insert_glyphs, x_clear_end_of_line):
* nsterm.m (ns_update_window_begin, ns_update_window_end):
* w32term.c (x_update_window_begin, x_update_window_end):
* xterm.c (x_update_window_begin, x_update_window_end):
Adjust to use per-window output cursor.
2013-08-28 09:45:38 +04:00
Stefan Monnier
0acfedd349 Try to reduce redundancy in doc/misc/Makefile.in.
* configure.ac (DOCMISC_W32): New var to replace DOCMISC_*_W32.
* doc/misc/Makefile.in (DOCMISC_W32): New var to replace DOCMISC_*_W32.
(TARGETS): New intermediate variable.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS): Use it.
2013-08-27 21:37:13 -04:00
Stefan Monnier
95888bca5d * lisp/emacs-lisp/cconv.el (cconv--analyse-function): Improve warning. 2013-08-27 21:33:31 -04:00
Glenn Morris
63e984f8fd Update location of Emacs on MS Windows FAQ 2013-08-27 15:40:24 -04:00
Paul Eggert
d486344e6f Simplify SELECT_TYPE-related code.
Like EMACS_TIME, this portability layer is no longer needed, since
Emacs has been using fd_set as a portability layer for some time.
* sysselect.h (FD_SETSIZE): Rename from MAXDESC.  All uses changed.
(SELECT_TYPE): Remove.  All uses changed to fd_set.
(fd_set) [!FD_SET]: New typedef.
2013-08-27 12:36:28 -07:00
Paul Eggert
b73517d9ec Spelling fixes. 2013-08-27 12:02:42 -07:00
Paul Eggert
43aac990c3 Simplify EMACS_TIME-related code.
This portability layer is no longer needed, since Emacs has been
using struct timespec as a portability layer for some time.
Merge from gnulib, incorporating:
2013-08-27 timespec: new convenience constants and function
* src/atimer.h, src/buffer.h, src/dispextern.h, src/xgselect.h:
Include <time.h> rather than "systime.h"; that's all that's needed now.
* src/dispnew.c: Include <timespec.h> rather than "systime.h";
that's all that's needed now.
* src/systime.h (EMACS_TIME): Remove.  All uses changed to struct timespec.
(EMACS_TIME_RESOLUTION): Remove.  All uses changed to
TIMESPEC_RESOLUTION.
(LOG10_EMACS_TIME_RESOLUTION): Remove.  All uses changed to
LOG10_TIMESPEC_RESOLUTION.
(EMACS_SECS, emacs_secs_addr): Remove.  All uses changed to tv_sec.
(EMACS_NSECS): Remove.  All uses changed to tv_nsec.
(make_emacs_time): Remove.  All used changed to make_timespec.
(invalid_timespec): Rename from invalid_emacs_time.  All uses changed.
(current_timespec): Rename from current_emacs_time.  All uses changed.
(add_emacs_time): Remove.  All uses changed to timespec_add.
(sub_emacs_time): Remove.  All uses change dot timespec_sub.
(EMACS_TIME_SIGN): Remove.  All uses changed to timespec_sign.
(timespec_valid_p): Rename from EMACS_TIME_VALID_P.  All uses changed.
(EMACS_TIME_FROM_DOUBLE): Remove.  All uses changed to dtotimespec.
(EMACS_TIME_TO_DOUBLE): Remove.  All uses changed to timespectod.
(current_timespec): Rename from current_emacs_time.  All uses changed.
(EMACS_TIME_EQ, EMACS_TIME_LT, EMACS_TIME_LE): Remove.  All uses
changed to timespec_cmp.
* src/xgselect.c: Include <timespec.h>, since our .h files don't.
2013-08-27 11:47:55 -07:00
Glenn Morris
278208b8e6 * doc/misc/efaq.texi: Rename from faq.texi, to match its output files.
* doc/misc/Makefile.in: Update for faq.texi name change.

* admin/admin.el (manual-misc-manuals): "faq" does not need special
  treatment any more.
2013-08-27 13:19:04 -04:00
Juri Linkov
bbe558f195 * lisp/isearch.el (isearch-other-meta-char): Don't store kmacro commands
in the keyboard macro.

Fixes: debbugs:15126
2013-08-27 19:06:16 +03:00
Juri Linkov
26f98a7d3f * lisp/isearch.el (isearch-quote-char): Comment out converting unibyte
to multibyte, thus syncing with its `quoted-insert' counterpart.

Fixes: debbugs:15166
2013-08-27 18:57:16 +03:00
Glenn Morris
3ed86db9c6 * configure.ac (DOCMISC_INFO_W32): Typo fix. 2013-08-27 08:44:07 -07:00
Martin Rudalics
7c97d35ecc Add missing argument in call of get-largest-window (Bug#15185).
* window.el (display-buffer-use-some-window): Add missing
argument in call of get-largest-window (Bug#15185).  Reported by
Stephen Leake.
2013-08-27 14:46:00 +02:00
Glenn Morris
ffeb6dec74 Auto-commit of generated files. 2013-08-27 06:17:45 -04:00
Dmitry Antipov
15091df55b * configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): No spaces!
2013-08-27 13:21:46 +04:00
Glenn Morris
79c238dc2f * doc/misc/efaq-w32.texi (EMACSVER): Get it from emacsver.texi. 2013-08-27 01:14:58 -07:00
Glenn Morris
c076ba953a * doc/misc/Makefile.in (webhack): Remove; it's nothing to do with Emacs.
Presumably it is some Gnus thing.
2013-08-27 01:04:08 -07:00
Glenn Morris
a0b5606ec7 Merge from emacs-24; up to 2013-01-03T01:56:56Z!rgm@gnu.org 2013-08-27 01:01:13 -07:00
Glenn Morris
1857cd3f9e Move source for Emacs on MS Windows FAQ here from Emacs webpages repository
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.

* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables.
* Makefile.in (check-info-dir): Ignore efaq-w32.

* admin/admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS.

* doc/misc/efaq-w32.texi: Move here from the web-pages repository.

* doc/misc/Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
(INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
Add DOCMISC_*_W32 variables.
(echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
(efaq_w32_deps): New variable.
(efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
(efaq-w32.pdf, efaq-w32.html): New rules.
(clean): Remove efaq-w32 products.
2013-08-27 00:57:39 -07:00
Glenn Morris
61ac6b9f82 * Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.
2013-08-26 23:58:08 -07:00
Dmitry Antipov
d350e350ea * xterm.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE:)
* nsterm.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE):
Remove the leftovers.
* gtkutil.c (toplevel): Do not declare Qxft but include
font.h to do so.
* image.c (toplevel): Do not declare Vlibrary_cache because
it's already done in lisp.h.
2013-08-27 08:23:54 +04:00
Dmitry Antipov
9fed97293c * lisp.h (Mouse_HLInfo): Move from here...
* dispextern.h (Mouse_HLInfo): ...to here and offload lisp.h.
(reset_mouse_highlight): New function.
* msdos.c (dos_set_window_size, IT_update_begin)
(internal_terminal_init):
* nsterm.m (ns_update_window_end, x_free_frame_resources)
(ns_initialize_display_info):
* w32console.c (initialize_w32_display):
* w32term.c (x_update_window_end, x_free_frame_resources)
(w32_initialize_display_info):
* xterm.c (x_update_window_end, x_free_frame_resources, x_term_init):
* window.c (Fdelete_other_windows_internal):
* xdisp.c (clear_mouse_face, cancel_mouse_face): Use it.
* termchar.h (toplevel):
* xterm.h (toplevel): Include dispextern.h.
2013-08-27 07:52:21 +04:00
Stefan Monnier
9e89d835b0 * lisp/progmodes/python.el (python-font-lock-keywords): Don't return nil
from a matcher-function unless there's no more matches.

Fixes: debbugs:15161
2013-08-26 22:41:41 -04:00
Paul Eggert
12c4970d70 Minor merge from gnulib (mostly just for texinfo.tex). 2013-08-26 15:17:31 -07:00
Paul Eggert
f462f0750f Fix minor problems found by static checking.
* image.c (XGetPixel, XPutPixel) [HAVE_NS]: Now static.
(expect): Avoid nested-if warning.
(x_build_heuristic_mask) [HAVE_NS]: Avoid unused-var warning.
* nsmenu.m (fillWithWidgetValue:): Avoid type warning.
* nsterm.h, nsterm.m (ns_select):
* xgselect.c, xgselect.h (xg_select):
Adjust signature to better match pselect's.
* nsterm.m (ns_select):
Don't set *TIMEOUT, since pselect doesn't.
* regex.c (whitespace_regexp): Now const_re_char *, to avoid
diagnostic about assigning const char * to it.
* xfaces.c (x_display_info) [HAVE_NS]: Remove; unused.
2013-08-26 14:31:50 -07:00
Stefan Monnier
068f9124b4 * src/lread.c (substitute_object_recurse): Handle hash-tables as well.
Fixes: debbugs:15190
2013-08-26 16:33:21 -04:00
Paul Eggert
1fc8eb33f5 Fix unlikely core dump in init_tty, and simplify terminfo case.
* term.c (init_tty) [TERMINFO]: Fix check for buffer overrun.
The old version incorrectly dumped core if malloc returned a
buffer containing only non-NUL bytes.
(init_tty): Do not allocate or free termcap buffers; the
struct does that for us now.
* termchar.h (TERMCAP_BUFFER_SIZE) [!TERMINFO]: New constant.
(struct tty_display_info): Define members termcap_term_buffer and
termcap_strings_buffer only if !TERMINFO, since terminfo doesn't
use them.  Allocate them directly in struct rather than indirectly
via a pointer, to simplify init_tty.
2013-08-26 11:10:30 -07:00
Paul Eggert
f5adc984fb * frame.c (check_minibuf_window): Initialize 'window' properly,
so that Emacs reliably aborts later if 'window' is not initialized.
2013-08-26 10:31:00 -07:00
Dmitry Antipov
447218dd74 Fix ChangeLog typo. 2013-08-26 20:29:52 +04:00
Jan Djärv
efec3894b2 * gtkutil.c (xg_initialize): Set gtk-menu-bar-accel to "" instead
of VoidSymbol.

Fixes: debbugs:15154
2013-08-26 17:44:56 +02:00
Stefan Monnier
a8544941cf * lispref/variables.texi (File Local Variables): Don't recommend quoting! 2013-08-26 11:28:24 -04:00
Dmitry Antipov
e1d0341e25 * lisp.h (Mouse_HLInfo): Drop set-but-unused members
mouse_face_beg_y and mouse_face_end_y.
* xdisp.c (note_tool_bar_highlight, mouse_face_from_buffer_pos)
(mouse_face_from_string_pos, note_mode_line_or_margin_highlight):
Adjust users and update comment where appropriate.
2013-08-26 18:00:55 +04:00
Michael Albinus
78fc2530af * minibuffer.el: Revert change from 2013-08-20.
* net/tramp.el (tramp-find-method, tramp-find-user): Mark result
with text property `tramp-default', if appropriate.
(tramp-check-proper-host): New defun.
(tramp-dissect-file-name): Do not check hostname.  Revert change
of 2013-03-18.
(tramp-backtrace): Make VEC-OR-PROC optional.

* net/tramp-adb.el (tramp-adb-maybe-open-connection):
* net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* net/tramp-sh.el (tramp-maybe-open-connection):
* net/tramp-smb.el (tramp-smb-maybe-open-connection): Apply
`tramp-check-proper-host'.
2013-08-26 15:17:22 +02:00
Martin Rudalics
bfff644518 New function check_minibuf_window to fix bug#15183.
* frame.c (check_minibuf_window): New function.
(delete_frame, Fmake_frame_invisible, Ficonify_frame): Call
check_minibuf_window (Bug#15183).
2013-08-26 14:39:08 +02:00
Tassilo Horn
edca97cde7 * epa-hook.el (epa-file-encrypt-to): Quote `safe-local-variable'
lambda expression in order to have `describe-variable' display it.
2013-08-26 13:03:09 +02:00
Dmitry Antipov
c80016b3c1 * window.h (struct window): Replace last_cursor with last_cursor_vpos
because this is the only last cursor data we need to keep and consult.
* window.c (replace_window, set_window_buffer, Fsplit_window_internal):
* xdisp.c (mark_window_display_accurate_1, try_cursor_movement):
Adjust users.
2013-08-26 13:33:37 +04:00
Michael Albinus
df54bcbde0 * net/tramp-sh.el (tramp-sh-handle-verify-visited-file-modtime):
BUF can be optional.  (Bug#15186)
2013-08-26 08:59:53 +02:00
Dmitry Antipov
de3967312f Fix recovering from possible decompression error. Since
insert_from_gap doesn't always move point, we can't use PT as
the position where the partially decompressed data ends, and
should count how may bytes was produced so far.
* decompress.c (struct decompress_unwind_data): Add nbytes member.
(unwind_decompress): Really delete partially uncompressed data.
(Fzlib_decompress_region): Take decompressed data size into account.
2013-08-26 09:32:47 +04:00
Dmitry Antipov
1570ae92dc * alloc.c (sweep_vectors): Do not initialize 'block' twice. 2013-08-26 09:26:06 +04:00
Dmitry Antipov
c76826d98c * syntax.c (init_syntax_once): Adjust comment and do an early
initialization of Qchar_table_extra_slots just once...
* casetab.c (init_casetab_once):
* category.c (init_category_once):
* character.c (syms_of_character):
* coding.c (syms_of_coding):
* xdisp.c (syms_of_xdisp): ...and omit it here.
2013-08-26 09:20:59 +04:00
Xue Fuqiao
eed991017a Fix broken customization in Flymake.
* lisp/progmodes/flymake.el (flymake-get-real-file-name-function):
Fix broken customization.  (Bug#15184)
2013-08-26 06:30:56 +08:00
Alan Mackenzie
8a51e84232 Improve indentation of bracelists defined by macros (without "=").
* progmodes/cc-engine.el (c-inside-bracelist-p): When a macro
expansion begins with "{", regard it as bracelist when it doesn't
contain a ";".
2013-08-25 21:06:07 +00:00
Vincent Belaïche
e687aa335a Add a question into configure.bat whether the user want to continue at
his/her own risks.
2013-08-25 22:11:56 +02:00
Glenn Morris
67aeda8d2f * INSTALL: Refer to INSTALL.MSYS. 2013-08-25 12:46:41 -07:00
Glenn Morris
b1dc190562 * nt/configure.bat: Disable it.
Ref http://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00705.html
2013-08-25 12:44:59 -07:00
Alan Mackenzie
869455d432 Parse C++ inher-intro when there's a template split over 2 lines.
* progmodes/cc-engine.el (c-guess-basic-syntax CASE 5C): Code more
rigorously the search for "class" etc. followed by ":".

* progmodes/cc-langs.el (c-opt-<>-sexp-key): Make the value for
random languages a regexp which never matches rather than nil.
2013-08-25 13:52:14 +00:00
Alan Mackenzie
b5eb903526 Handle "/"s more accurately in test for virtual semicolons (AWK Mode).
* progmodes/cc-awk.el (c-awk-one-line-possibly-open-string-re)
(c-awk-regexp-one-line-possibly-open-char-list-re)
(c-awk-one-line-possibly-open-regexp-re)
(c-awk-one-line-non-syn-ws*-re): Remove.
(c-awk-possibly-open-string-re, c-awk-non-/-syn-ws*-re)
(c-awk-space*-/-re, c-awk-space*-regexp-/-re)
(c-awk-space*-unclosed-regexp-/-re): New constants.
(c-awk-at-vsemi-p): Reformulate better to recognize "/"s which
aren't regexp delimiters.

* progmodes/cc-engine.el (c-crosses-statement-barrier-p): Add in
handling for a rare situation in AWK Mode involving unterminated
strings/regexps.
2013-08-25 10:09:56 +00:00
Eli Zaretskii
6dc695d1e3 Add commentary for the last commit. 2013-08-24 18:21:05 +03:00
Eli Zaretskii
11f20add70 Fix bug #15175 with cursor on boxed characters from display tables.
src/xdisp.c (get_next_display_element): Don't apply to characters
 from a display vector the logic of setting it->end_of_box_run_p
 suitable for characters from a buffer.
2013-08-24 15:59:13 +03:00