mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-17 00:30:37 -08:00
Code Issues Projects Releases Wiki Activity
116079 commits 244 branches 194 tags 723 MiB
Commit graph

116079 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eli Zaretskii
4130631877 Merge from trunk after a lot of time. 2013-09-05 11:01:04 +03:00
Dmitry Antipov
257b3b03cb Make --without-x compatible with --enable-gcc-warnings. 
* configure.ac: If both --without-x and --enable-gcc-warnings are
specified, use -Wno-unused-variable, -Wno-unused-but-set-variable
and -Wno-unused-but-set-parameter.
* src/font.c (register_font_driver): Move check under HAVE_WINDOW_SYSTEM.
* src/font.h (struct font_driver): Move draw, get_bitmap and free_bitmap
members under HAVE_WINDOW_SYSTEM.
* src/keyboard.c (make_lispy_focus_out): Likewise.
(record_menu_key): Move under HAVE_MENUS.
* src/xdisp.c (toplevel): Move hourglass_shown_p, hourglass_atimer and
THIN_SPACE_WIDTH under HAVE_WINDOW_SYSTEM.
(syms_of_xdisp): Adjust user.
(window_box_edges): Define only if HAVE_WINDOW_SYSTEM.
(start_hourglass, cancel_hourglass):
* src/xfaces.c (toplevel): Likewise with PT_PER_INCH,
clear_font_table_count, CLEAR_FONT_TABLE_COUNT
and CLEAR_FONT_TABLE_NFONTS.
(set_font_frame_param, clear_face_gcs, realize_non_ascii_face):
Declare only if HAVE_WINDOW_SYSTEM.
(lface_same_font_attributes_p, clear_face_gcs): Define only
if HAVE_WINDOW_SYSTEM.
 2013-09-05 10:25:12 +04:00
Dmitry Antipov
98b7f4bdef * frame.c (check_minibuf_window): Update 'frame' with frame pointer. 
* xterm.c (x_scroll_bar_handle_click) [!USE_TOOLKIT_SCROLL_BARS]:
Don't pass C integer to XINT (tiny fix for 2013-09-03 change).
 2013-09-05 07:51:37 +04:00
Stefan Monnier
c0458e0b21 * lisp/subr.el (pop): Use `car-safe'. 
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Remove hack
to detect unused `pop' return value.

* lisp/emacs-lisp/advice.el (defadvice): Add indent rule.

* lisp/international/mule-cmds.el: Require CL.
(find-coding-systems-for-charsets): Avoid add-to-list.
(sanitize-coding-system-list): New function, extracted from
select-safe-coding-system-interactively.
(select-safe-coding-system-interactively): Use it.
(read-input-method-name): Accept symbols for `default'.

* lisp/progmodes/python.el (python-nav-beginning-of-block): Remove unused
var `block-regexp'.
(python-nav--forward-sexp): Remove unused var `re-search-fn'.
(python-fill-string): Remove unused var `marker'.
(python-skeleton-add-menu-items): Remove unused var `items'.
 2013-09-04 23:46:34 -04:00
Daniel Hackney
6c42fc3efb * lisp/dired-x.el: 
* lisp/net/ange-ftp.el:
* lisp/net/browse-url.el:
* lisp/net/dbus.el:
* lisp/net/eudc.el:
* lisp/net/eudcb-ldap.el:
* lisp/net/eww.el:
* lisp/net/imap.el:
* lisp/printing.el:
* lisp/vc/ediff-diff.el:
* lisp/vc/ediff-init.el:
* lisp/vc/ediff-merg.el:
* lisp/vc/ediff-mult.el:
* lisp/vc/ediff-util.el:
* lisp/vc/ediff-wind.el:
* lisp/vc/ediff.el:
* lisp/vc/emerge.el:
* lisp/vc/pcvs.el:
* vc/vc-annotate.el: Prefix unused arguments with `_' to silence
byte compiler.  Remove some unused let-bound variables.
 2013-09-04 23:30:07 -04:00
Stefan Monnier
4c528aabaa * lisp/emacs-lisp/cconv.el: Use car-safe' rather than car' to access 
a "ref-cell", since it gets better optimized.

Fixes: debbugs:14883
 2013-09-04 23:05:44 -04:00
Stefan Monnier
a7e43722c7 * src/cmds.c (Fself_insert_command): Don't pass a non-integer to XINT. 2013-09-04 22:27:13 -04:00
Glenn Morris
2a6f417413 * semantic/fw.el (semantic-make-local-hook): Simplify by dropping Emacs <= 20. 2013-09-04 20:22:45 -04:00
Glenn Morris
bd15c39024 * lisp/progmodes/cc-awk.el (c-forward-sws): Declare. 2013-09-04 20:12:36 -04:00
Glenn Morris
1c3ac2e53e rul-generic-mode-syntax-table fix for recent cc-mode changes 
* lisp/generic-x.el [rul-generic-mode]: Require cc-mode.
(c++-mode-syntax-table): Declare.
(rul-generic-mode-syntax-table): Init in the defvar.
 2013-09-04 19:55:08 -04:00
Paul Eggert
0c90b9eed9 * alloc.c (make_event_array): First arg is now ptrdiff_t, not int. 
This fixes a type error on hosts where ptrdiff_t is wider than int.
 2013-09-04 15:34:04 -07:00
Stefan Monnier
9c750ebae6 * lisp/vc/vc-dispatcher.el (vc-run-delayed): New macro. 
(vc-do-command, vc-set-async-update):
* lisp/vc/vc-mtn.el (vc-mtn-dir-status):
* lisp/vc/vc-hg.el (vc-hg-dir-status, vc-hg-dir-status-files)
(vc-hg-pull, vc-hg-merge-branch):
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage, vc-git-pull)
(vc-git-merge-branch):
* lisp/vc/vc-cvs.el (vc-cvs-print-log, vc-cvs-dir-status)
(vc-cvs-dir-status-files):
* lisp/vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch, vc-bzr-dir-status)
(vc-bzr-dir-status-files):
* lisp/vc/vc-arch.el (vc-arch-dir-status): Use vc-run-delayed.
* lisp/vc/vc-annotate.el: Use lexical-binding.
(vc-annotate-display-select, vc-annotate): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
(vc-annotate): Don't use `goto-line'.
* lisp/vc/vc.el (vc-diff-internal): Prefer a closure to `(lambda...).
(vc-diff-internal, vc-log-internal-common): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
* lisp/vc/vc-svn.el: Use lexical-binding.
(vc-svn-dir-status, vc-svn-dir-status-files): Use vc-run-delayed.
* lisp/vc/vc-sccs.el:
* lisp/vc/vc-rcs.el: Use lexical-binding.
 2013-09-04 17:09:42 -04:00
Stefan Monnier
abae272cce * lisp/autorevert.el (auto-revert-notify-handler): Explicitly ignore 
`deleted'.  Don't drop errors silently.
 2013-09-04 16:56:54 -04:00
Stefan Monnier
6629638eb3 * src/keyboard.c (read_key_sequence_vs): New function. 
(Fread_key_sequence_vector, Fread_key_sequence): Use it to factor out
common code.
 2013-09-04 16:32:22 -04:00
Stefan Monnier
d99760fa44 * src/callint.c (Fcall_interactively): Always return a vector for 'K'. 2013-09-04 16:22:37 -04:00
Stefan Monnier
52b1cc7915 * lisp/emacs-lisp/gv.el (gv-get): Warn about CL-compiled places. 2013-09-04 16:03:52 -04:00
Paul Eggert
224e313d3b Makefile improvements. 
* Makefile.in (lib): Depend on am--refresh, to avoid a race.
(src): Remove duplicate dependency on FRC.
Invoke just one submake, not two.  Avoid the need for 'pwd'.
* lwlib/Makefile.in (all): Put this first.  Don't use double-colon
rules, as they are not portable according to POSIX.  Mark as phony.
* oldXMenu/Makefile.in (all, tags): Don't use double-colon rules, as they
are not portable according to POSIX.  Mark as phony.
* src/Makefile.in (config.status): Don't use double-colon rules, as
they are not portable according to POSIX.  Fix shell typo with `;
I guess this rule has never been tested?
(VCSWITNESS): New macro, to override any environment var.
 2013-09-03 23:45:44 -07:00
Dmitry Antipov
6d6ed1af81 * xterm.h (struct x_display_info): Do not track X connection 
fd separately because it is always available from Display.
* xterm.c (x_term_init, x_delete_terminal, x_delete_display):
Adjust users.
 2013-09-04 08:02:56 +04:00
Xue Fuqiao
adf2fc4a01 Merge from mainline. 2013-09-04 08:39:34 +08:00
Xue Fuqiao
63191d9f20 Some fixes for vc-ignore. 
* lisp/vc/vc.el (vc-ignore): Rewrite.
(vc-default-ignore): New function.
(vc-default-ignore-completion-table): Use find-ignore-file.

* lisp/vc/vc-bzr.el (vc-bzr-ignore, vc-bzr-ignore-completion-table):
* lisp/vc/vc-git.el (vc-git-ignore, vc-git-ignore-completion-table):
* lisp/vc/vc-hg.el (vc-hg-ignore, vc-hg-ignore-completion-table):
Remove.  Most code moved to vc.el.

* doc/emacs/maintaining.texi (VC Ignore): Mention `vc-ignore' with prefix argument.
 2013-09-04 08:31:13 +08:00
Stefan Monnier
38726039b7 * lisp/net/tramp-gvfs.el (tramp-gvfs-mount-spec, tramp-synce-list-devices): 
* lisp/net/tramp-smb.el (tramp-smb-get-file-entries):
* lisp/net/tramp-sh.el (tramp-sh-handle-insert-directory)
(tramp-compute-multi-hops): Fix misuses of `add-to-list'.
 2013-09-03 16:14:58 -04:00
Stefan Monnier
fde38d4978 * lisp/finder.el (finder-compile-keywords): Don't mess with windows. 
* lisp/net/eww.el (eww-display-raw): Remove unused argument `charset'.
Update call to it.
(eww-change-select): Remove unused var `properties'.
(eww-make-unique-file-name): Remove unused var `base'.
 2013-09-03 15:49:54 -04:00
Stefan Monnier
84032db718 * lisp/calculator.el (calculator-funcall): Fix typo in last change. 2013-09-03 15:44:02 -04:00
Stefan Monnier
724f5e41b6 * lisp/vc/vc-git.el (vc-git-checkin): Make it possible to commit a merge. 2013-09-03 14:28:06 -04:00
Stefan Monnier
14b511d4e5 * lisp/emacs-lisp/package.el (package-activate-1): Don't let a missing 
<pkg>-autoloads.el file stop us.
 2013-09-03 14:21:41 -04:00
Stefan Monnier
9d3f707c59 * lisp/net/tramp.el (with-parsed-tramp-file-name): Silence compiler 
warnings, and factor our common code.
 2013-09-03 12:23:10 -04:00
Dmitry Antipov
bc923770d2 * buffer.c (drop_overlay): 
* fileio.c (restore_point_unwind): Prefer unchain_marker to
Fset_marker (X, Qnil, ...) (which is the same but a bit slower).
 2013-09-03 18:40:09 +04:00
Dmitry Antipov
b1cf96dec7 * buffer.c (Fmake_overlay, Fmove_overlay): 
* intervals.c (set_point_from_marker):
* print.c (PRINTPREPARE): Prefer signal_error
to plain error and report unsuitable marker too.
 2013-09-03 17:29:38 +04:00
Dmitry Antipov
ec5e750402 * xfns.c, image.c (XLIB_ILLEGAL_ACCESS): No longer needed. 2013-09-03 16:41:35 +04:00
Dmitry Antipov
d1ae6a0bca * xterm.h (struct x_output): Remove set-but-unused 
leftovers 'left_before_move' and 'top_before_move'.
* xterm.c (x_set_offset): User changed.
 2013-09-03 16:02:01 +04:00
Dmitry Antipov
d1fc6c21a8 * xterm.h (struct scroll_bar): Prefer int to Lisp_Object 
for 'dragging' member.
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb):
* xterm.c (xt_action_hook, xm_scroll_callback, xg_scroll_callback)
(xg_end_scroll_callback, xaw_jump_callback, xaw_scroll_callback)
(x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
(x_scroll_bar_set_handle, XTset_vertical_scroll_bar)
(x_scroll_bar_handle_click, x_scroll_bar_note_movement)
(x_scroll_bar_report_motion): Related users changed.
 2013-09-03 13:35:47 +04:00
Jan Djärv
0ce9f6de64 * nsfont.m (INVALID_GLYPH): New define. 
(nsfont_encode_char): Use INVALID_GLYPH.
(ns_uni_to_glyphs): Ditto, check for NSNullGlyph.

Fixes: debbugs:15138
 2013-09-03 08:56:25 +02:00
Dmitry Gutov
88527bc0a2 * lisp/progmodes/ruby-mode.el (ruby-calculate-indent): Consider 
two-character operators and whether the character preceding them
changes their meaning.

Fixes: debbugs:15208
 2013-09-03 03:29:10 +03:00
Martin Rudalics
9718b207e9 Move Flast_nonminibuf_frame from dispnew.c to frame.c. 
* dispnew.c (Flast_nonminibuf_frame): Move from here ...
* frame.c (Flast_nonminibuf_frame): ... to here.
 2013-09-02 19:23:26 +02:00
Dmitry Antipov
b594a96c87 * xterm.c (x_last_mouse_movement_time): Revert last change. 
This code should use XDisplayMotionBufferSize to check display's
motion history first, and there are few other issues as well.
(x_scroll_bar_note_movement): Pass XMotionEvent rather than XEvent.
(handle_one_xevent): Adjust user.
 2013-09-02 19:48:59 +04:00
Fabián Ezequiel Gallina
96edb67781 Format code sent to Python shell for robustness. 
* progmodes/python.el (python-shell-buffer-substring): New
function.
(python-shell-send-region, python-shell-send-buffer): Use it.
 2013-09-02 10:56:03 -03:00
Michael Albinus
95beaef369 * net/tramp-compat.el (tramp-compat-user-error): Move it ... 
* net/tramp.el (tramp-user-error): ... here.
(tramp-find-method, tramp-check-proper-host)
(tramp-dissect-file-name, tramp-debug-message)
(tramp-handle-shell-command):
* net/tramp-adb.el (tramp-adb-handle-shell-command):
* net/tramp-gvfs.el (tramp-gvfs-file-name-handler): Adapt callees.

* net/tramp-cache.el (tramp-cache-print): Don't print text properties.
 2013-09-02 15:41:08 +02:00
Martin Rudalics
8b09823660 In check_minibuf_window don't abort if no window was found (Bug#15247). 
* frame.c (check_minibuf_window): Don't abort if no window was
found (Bug#15247).
 2013-09-02 14:22:21 +02:00
Dmitry Antipov
fc85e20be1 * xterm.c (handle_one_xevent): Use event.xunmap and not event.xmap when 
handling UnmapNotify event.
 2013-09-02 15:24:11 +04:00
Dmitry Antipov
def74bdc48 * xterm.c (x_last_mouse_movement_time) [X_MOTION_HISTORY]: Fix last change. 2013-09-02 14:37:06 +04:00
Glenn Morris
2f3426954a Auto-commit of generated files. 2013-09-02 06:17:37 -04:00
Dmitry Antipov
84e70bbae4 Use XGetMotionEvents to ask the last mouse motion time from X server. 
* xterm.c (X_MOTION_HISTORY): Default to 1.
(x_last_mouse_movement_time) [X_MOTION_HISTORY]: New function.
(x_last_mouse_movement_time) [!X_MOTION_HISTORY]: Legacy version.
(note_mouse_movement, x_scroll_bar_note_movement) [!X_MOTION_HISTORY]:
Ifdef away legacy code.
(XTmouse_position, x_scroll_bar_report_motion):
Use x_last_mouse_movement_time.
 2013-09-02 12:45:32 +04:00
Martin Rudalics
f167c27b19 In avoid.el handle case where posn-at-point returns nil. 
* avoid.el (mouse-avoidance-point-position)
(mouse-avoidance-too-close-p): Handle case where posn-at-point
returns nil.
 2013-09-02 09:11:26 +02:00
Jan Djärv
de3d0b572d Fix copying of nextstep/Emacs.app for make -j install 
* configure.ac: Add ns_check_file.

* nextstep/Makefile.in (${ns_check_file}): Add so Emacs.app gets properly
updated when doing parallel make install.
 2013-09-02 09:01:53 +02:00
Dmitry Antipov
1fccc53063 * msdos.c (last_mouse_window): Move to... 
(dos_rawgetc): ...this function and adjust comment.
* nsterm.m (last_window): Rename to last_mouse_window, move to...
(mouseMoved): ...this function and adjust comment.
* w32term.c (last_window): Likewise with...
(w32_read_socket): ...this function.
* xterm.c (last_window): Likewise with...
(handle_one_xevent): ...this function.
 2013-09-02 10:45:04 +04:00
Dmitry Antipov
b7da754d21 * window.h (Vmouse_window, Vmouse_event): Remove the leftovers. 2013-09-02 10:12:26 +04:00
Dmitry Antipov
0ab10992ed * xterm.c (toplevel): Drop obsolete comment and move compose_status... 
(handle_one_xevent): ...to here.
(STORE_KEYSYM_FOR_DEBUG): Move under ENABLE_CHECKING and make no-op
otherwise.
 2013-09-02 09:59:35 +04:00
Dmitry Antipov
0c7f856e9f * msdos.c (IT_set_terminal_window): Remove no-op. 
(initialize_msdos_display): Adjust terminal setup.
* w32console.c (w32con_set_terminal_window): Remove no-op.
(initialize_w32_display): Adjust terminal setup.
* w32term.c (w32_set_terminal_window): Remove no-op.
(w32_create_terminal): Adjust terminal setup.
* xterm.c (XTset_terminal_window): Remove no-op.
(x_create_terminal): Adjust terminal setup.
 2013-09-02 07:39:06 +04:00
Fabián Ezequiel Gallina
e5c144d64d * progmodes/python.el (python-nav-if-name-main): New command. 2013-09-02 00:37:18 -03:00
Fabián Ezequiel Gallina
cd16c5f1f5 * progmodes/python.el (python-shell-completion-get-completions): 
Drop use of deleted `comint-last-prompt-overlay'.
 2013-09-02 00:21:13 -03:00