1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-02 03:40:36 -08:00
Commit graph

120423 commits

Author SHA1 Message Date
Katsumi Yamaoka
2dacd0a7ee Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs 2015-02-10 07:55:14 +00:00
Lars Magne Ingebrigtsen
f6d781c294 Fix up :align-to background colours
(shr-insert-table): Only copy the background, not underline and
the like.
(shr-face-background): New function.
2015-02-10 18:52:57 +11:00
Katsumi Yamaoka
b88908b6f0 lisp/gnus/mm-decode.el: Fix previous commit 2015-02-10 07:52:35 +00:00
Paul Eggert
f0ed1d6336 Use bool for boolean in xdisp.c
* dispextern.h (display_prop_intangible_p, resize_mini_window)
(pixel_to_glyph_coords, mark_window_display_accurate)
(compute_display_string_pos, handle_tool_bar_click)
(x_intersect_rectangles, clear_mouse_face, display_tty_menu_item):
* lisp.h (setup_echo_area_for_printing, message_with_string)
(pos_visible_p): Use bool for boolean.
* xdisp.c: Use bool, true, false intstead of int, 1, 0.
Remove unnecessary forward decls.
(trace_move) [DEBUG_TRACE_MOVE]: Now static.
(CHECK_IT, CHECK_WINDOW_END):
Now an inline function that is always defined.
(check_it) [0]:
(check_window_end) [oGLYPH_DEBUG && ENABLE_CHECKING]:
Remove; no longer needed.
(handle_stop): Prefer (X && !Y) to (X ? !Y : 0).
(get_overlay_strings): Omit unnecessary casts.
(forward_to_next_line_start):
(Ftool_bar_height):
Prefer !BOOL to (BOOL ? 0 : 1).
(next_element_function): New typedef.
(get_next_element): Use it.  Now const.
(IT_POS_VALID_AFTER_MOVE_P): Prefer !X || Y==0 to (X ? Y==0 : 1).
(vmessage): Now ATTRIBUTE_FORMAT_PRINTF (1, 0), to pacify GCC 4.9.2
(display_echo_area): Prefer BOOLEXPR to BOOLEXPR ? 1 : 0.
(tool_bar_item_info): Simplify.
(invisible_prop): Rename from invisible_p, since it doesn't
return bool.  All callers changed.
(x_produce_glyphs): Simplify.
2015-02-09 23:50:18 -08:00
Lars Magne Ingebrigtsen
d5111d525f shr cleanup and background color fix
(shr-table-widths): Off-by-one error in width computation.
(shr-expand-newlines): Remove dead code.
(shr-insert-table): Extend background colors to the end of the column.
2015-02-10 18:09:56 +11:00
Lars Magne Ingebrigtsen
50f64a3653 (shr-tag-hr): Compute the right length when using fonts. 2015-02-10 16:54:13 +11:00
Lars Magne Ingebrigtsen
6a319400cc Fix <h1> and <tt> rendering
(shr-tag-h1): Don't use variable-pitch fonts on fontless rendering.
(shr-tag-tt): New function.
2015-02-10 16:48:04 +11:00
Lars Magne Ingebrigtsen
84d9c19319 Mention the shr font changes
* doc/misc/eww.texi (Basics): Mention eww-toggle-fonts.
2015-02-10 16:41:36 +11:00
Lars Magne Ingebrigtsen
656caef350 Allow using variable-width fonts in eww
* lisp/gnus/mm-decode.el (mm-shr): Only pass the fill column when not using
fonts, because limiting the width to what's appropriate for followups
doesn't really help when not using proportional fonts.

* lisp/net/shr.el (shr-use-fonts): New variable.
(shr-fill-text): Rename from "fold".
(shr-pixel-column, shr-pixel-region, shr-string-pixel-width): New
functions.
(shr-insert): Just insert, don't fill the text.  Filling is now
done afterwards per display unit.
(shr-fill-lines, shr-fill-line): New functions to fill text on a
per-unit base.
(shr-find-fill-point): Take a "beginning" parameter.
(shr-indent): Indent using the :width display parameter when using
fonts.
(shr-parse-style): Ignore "inherit" values, since we already do that.
(shr-tag-img): Remove the insertion states.
(shr-tag-blockquote): New-style filling.
(shr-tag-dd): Ditto.
(shr-tag-li): Ditto.
(shr-mark-fill): New function to mark lines that need filling.
(shr-tag-h1): Use a larger font.
(shr-tag-table-1): Get the natural and suggested widths in one
rendering.
(shr-tag-table): Create the "fixed" version of the table only once
so that we can cache data in the table.
(shr-insert-table): Get colspan calculations right by having
zero-width columns after colspan ones.
(shr-expand-alignments): New function to make :align-to specs work
right when rendered in one buffer and displayed in another one.
(shr-insert-table-ruler): Use :align-to to get the widths right.
(shr-make-table): Cache more.
(shr-make-table-1): Use the new <td> data layout.
(shr-pixel-buffer-width): New function.
(shr-render-td): Add a caching layer.
(shr-dom-max-natural-width): New function.
2015-02-10 16:29:05 +11:00
Fabián Ezequiel Gallina
880415a6a6 python.el: Fix typo in eldoc initialization for Emacs 24.x 2015-02-09 23:53:11 -03:00
Fabián Ezequiel Gallina
859e865e93 python.el: Improved shell font lock respecting markers.
Fixes: debbugs:19650

* lisp/progmodes/python.el
(python-shell-font-lock-get-or-create-buffer): Use special buffer name.
(python-shell-font-lock-with-font-lock-buffer): Enable font lock.
(python-shell-font-lock-post-command-hook): Fontify by copying text
properties from fontified buffer to shell, keeping markers unchanged.
(python-shell-font-lock-turn-off): Fix typo.
(python-util-text-properties-replace-name): Delete function.
2015-02-09 23:44:06 -03:00
Paul Eggert
21d1f8b85e Check for some overflows in vertical-motion
* indent.c (window_column_x): New function.
(Fvertical_motion): Use it to protect against integer overflow
when computing column.  Prefer extract_float to doing things by hand.
Avoid unnecessary casts.
2015-02-09 11:26:33 -08:00
Paul Eggert
b7028f6736 * xfont.c: Minor style fixes
(xfont_list_pattern): Reindent to 80 cols and use Emacs-style comments.
Redo loop so that less indentation is needed.
2015-02-09 11:08:58 -08:00
Gareth Rees
44d42562c3 Fixes: debbugs:19820
* etc/NEWS.24: Fix typo
2015-02-09 12:31:20 -05:00
Simen Heggestøyl
42c99697b6 Fixes: debbugs:19815
* lisp/textmodes/css-mode.el (css-smie-rules): Fix paren indent.
2015-02-09 12:26:14 -05:00
Eli Zaretskii
cbf1c1f2c7 Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs 2015-02-09 18:27:21 +02:00
Eli Zaretskii
403cb178c7 Speed up vertical-motion when screen coordinates are known
src/indent.c (Fvertical_motion): Accept an additional argument
 CUR-COL and use it as the starting screen coordinate.
 src/window.c (window_scroll_line_based, Fmove_to_window_line): All
 callers of vertical-motion changed.

 doc/lispref/positions.texi (Screen Lines): Update the documentation of
 vertical-motion to document the new additional argument.
2015-02-09 18:24:46 +02:00
Stefan Monnier
2973127159 * lisp/emacs-lisp/cl-generic.el (cl--generic-lambda): Use macroexp-parse-body. 2015-02-09 10:52:48 -05:00
Stefan Monnier
699ece2757 * lisp/emacs-lisp/eieio-core.el (eieio-oset-default): Catch the unexpected
case where the default value would be re-interpreted as a form!
2015-02-09 10:49:43 -05:00
Dima Kogan
af560cd6f1 Remove unused assignment.
* font.c (font_score): Remove unused variable assignment.
2015-02-09 15:56:38 +01:00
Dima Kogan
054dcbab24 Try non-scaled xld fonts first, and scaled if that failed.
Fixes: debbugs:19117

* xfaces.c (realize_basic_faces): Don't set Qscalable_fonts_allowed to
t.
* font.c (font_score): Try to find a font without scaling first,
and only accept scalable fonts if we did not get a match.
2015-02-09 15:52:48 +01:00
Stefan Monnier
83e5a17c34 * src/keyboard.c (syms_of_keyboard): Use non-nil default value. 2015-02-09 09:36:26 -05:00
Christopher Genovese
ad4f670811 * lisp/help-fns.el (help-fns--signature): Keep doc for keymap. 2015-02-09 09:04:47 -05:00
Kelly Dean
c96983efef desktop.el: Save mark-ring less verbosely.
For the discussion, see
https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00582.html
2015-02-09 13:26:19 +00:00
Paul Eggert
2f70087153 Use C99's INFINITY and NAN macros
* lread.c: Include <math.h>.
(string_to_number): Use INFINITY and NAN rather than rolling our own.
This avoids some runtime diagnostics when building with
gcc -fsanitize=undefined.
2015-02-08 23:12:32 -08:00
Paul Eggert
2371717311 Fix bidi_explicit_dir_char undefined behavior
* bidi.c (bidi_explicit_dir_char): Avoid subscript error when
argument is BIDI_EOB.  This can happen in bidi_level_of_next_char.
2015-02-08 18:14:41 -08:00
Leo Liu
751adc4b96 Add macro pcase-lambda
Fixes: debbugs:19814

* emacs-lisp/lisp-mode.el (el-kws-re): Include `pcase-lambda'.

* emacs-lisp/macroexp.el (macroexp-parse-body): New function.

* emacs-lisp/pcase.el (pcase-lambda): New Macro.
2015-02-09 10:05:44 +08:00
Paul Eggert
fd6f7d1449 Better distinguish infinite from invalid times
* editfns.c (check_time_validity): New function.
(decode_time_components): Return int, not bool.
Return -1 (not 0) if the time is out of range.
All callers changed.
(lisp_time_struct, lisp_seconds_argument): Distinguish better
between time overflow and invalid time values.
2015-02-08 16:21:44 -08:00
Paul Eggert
db3fc07caf * configure.ac (HAVE_LIBXML2): Add missing comma. 2015-02-08 16:03:15 -08:00
Paul Eggert
5c20aa7486 Port to platforms lacking test -a and -o
* configure.ac (HAVE_LIBXML2):
* lisp/Makefile.in (compile-clean):
* lisp/net/tramp-sh.el (tramp-find-executable):
Prefer '&&' and '||' to 'test -a' and 'test -o'.
2015-02-08 16:00:58 -08:00
Artur Malabarba
7d631aa0ff newcomment.el (comment-line): Fix missing paren. 2015-02-08 20:24:36 -02:00
Ulrich Müller
dbde138155 configure --with-gameuser now defaults to games group.
* configure.ac (--with-gameuser): Default to 'games' group instead
of 'games' user.
* lisp/play/gamegrid.el: Update comment to reflect that the
'update-game-score' helper program is now setgid by default.
2015-02-08 21:09:22 +01:00
David Kastrup
19ee7875db subr.el (apply-partially): Use lexical binding.
Fixes: debbugs:19785

See
<URL:http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00784.html>
for discussion.
2015-02-08 19:50:53 -02:00
Artur Malabarba
64bdc0efbe NEWS: Document `comment-line'. 2015-02-08 19:05:24 -02:00
Artur Malabarba
97cb255360 newcomment.el (comment-line): New command on C-x C-;. 2015-02-08 19:03:17 -02:00
Paul Eggert
61320cc95c Minor tweaks to frame_size_history_add
* frame.c (frame_size_history_add): Don't assume length fits in 'int'.
Prefer XCAR and XCDR to Fcar and Fcdr when the arg is a cons.
(Fframe_after_make_frame): Simplify.
* gtkutil.c: Remove commented-out code.
* xfns.c (Fx_create_frame): Fix indenting.
2015-02-08 10:52:37 -08:00
Eli Zaretskii
dd2aa937d6 Fix a thinko in frame-parameter (Bug#19802)
src/frame.c (Fframe_parameter): Don't replace a non-nil value of
 foreground-color or background-color parameters with a nil value.
2015-02-08 19:54:59 +02:00
Oleh Krehel
1a489c1a42 lisp/outline.el (outline-show-entry): Fix one invisible char
* lisp/outline.el (outline-show-entry): Previously, when called for
the last outline in a file, a single invisible char was left.
Add a check for this condition.
2015-02-08 16:08:40 +01:00
Stefan Monnier
60f8214e97 * src/data.c (Findirect_function): Don't signal an error
* src/data.c (Findirect_function): Like `symbol-function', don't signal an
error for void functions any more.
* lisp/subr.el (indirect-function): Change advertised calling convention.
2015-02-08 08:51:10 -05:00
Fabián Ezequiel Gallina
dcec731abf python.el: Fix completion-at-point.
Fixes: debbugs:19667

* lisp/progmodes/python.el
(python-shell-completion-native-get-completions): Force process
buffer.
(python-shell-completion-at-point): Handle case where call is not
in a shell buffer.
2015-02-08 01:31:12 -03:00
Fabián Ezequiel Gallina
67dfbd6057 python.el: Fix shell font-lock multiline input.
Fixes: debbugs:19744

* lisp/progmodes/python.el
(python-shell-font-lock-post-command-hook): Handle multiline
input.
2015-02-08 00:36:30 -03:00
Fabián Ezequiel Gallina
52df70a887 python.el: Make shell font-lock respect markers.
Fixes: debbugs:19650

* lisp/progmodes/python.el (python-shell-font-lock-cleanup-buffer): Use
`erase-buffer`.
(python-shell-font-lock-comint-output-filter-function): Handle
newlines.
(python-shell-font-lock-post-command-hook): Respect markers on
text fontification.
2015-02-08 00:25:20 -03:00
Fabián Ezequiel Gallina
b480a6adda Fix attribution in previous commit 2015-02-07 18:41:44 -03:00
Fabián Ezequiel Gallina
2155973e5e python.el: Keep eldoc visible while typing args.
Fixes: debbugs:19637

* lisp/progmodes/python.el (python-eldoc--get-symbol-at-point): New
function.
(python-eldoc--get-doc-at-point, python-eldoc-at-point): Use it.

* test/automated/python-tests.el
(python-eldoc--get-symbol-at-point-1)
(python-eldoc--get-symbol-at-point-2)
(python-eldoc--get-symbol-at-point-3)
(python-eldoc--get-symbol-at-point-4): New tests.
2015-02-07 18:39:07 -03:00
Fabián Ezequiel Gallina
2d467a0ff0 Fix hideshow integration.
Fixes: debbugs:19761

* lisp/progmodes/python.el
(python-hideshow-forward-sexp-function): New function based on
Carlos Pita <carlosjosepita@gmail.com> patch.
(python-mode): Make `hs-special-modes-alist` use it and initialize
the end regexp with the empty string to avoid skipping parens.

* test/automated/python-tests.el
(python-tests-visible-string): New function.
(python-parens-electric-indent-1)
(python-triple-quote-pairing): Fix indentation, move require calls.
(python-hideshow-hide-levels-1)
(python-hideshow-hide-levels-2): New tests.
2015-02-07 16:43:47 -03:00
Fabián Ezequiel Gallina
86c50b9af1 * lisp/progmodes/python.el (python-check-custom-command): Do not use
defvar-local for compat with Emacs<24.3.
2015-02-07 14:25:47 -03:00
Martin Rudalics
d165578319 Try to improve handling of fullwidth/-height frames.
* frame.el (frame-notice-user-settings): Update
`frame-size-history'.
(make-frame): Update `frame-size-history'.  Call
`frame-after-make-frame'.
* faces.el (face-set-after-frame-default): Remove call to
frame-can-run-window-configuration-change-hook.
* frame.c (frame_size_history_add): New function.
(frame_inhibit_resize): Consider frame_inhibit_implied_resize
only after frame's after_make_frame slot is true.  Inhibit
resizing fullwidth-/height frames in one direction only.  Update
frame_size_history.
(adjust_frame_size): Call frame_size_history_add.
(make_frame): Initalize after_make_frame slot.
(Fmake_terminal_frame): Adjust adjust_frame_size call.
(Fcan_run_window_configuration_change_hook): Rename to
Fframe_after_make_frame.  Set after_make_frame slot.  Return
second argument.
(x_set_frame_parameters): Postpone handling fullscreen parameter
until after width and height parameters have been set.  Apply
width and height changes only if can_x_set_window_size is true.
Update frame_size_history.
(Qadjust_frame_size_1, Qadjust_frame_size_2)
(Qadjust_frame_size_3, QEmacsFrameResize, Qframe_inhibit_resize)
(Qx_set_fullscreen, Qx_check_fullscreen, Qx_set_window_size_1)
(Qxg_frame_resized, Qxg_frame_set_char_size_1)
(Qxg_frame_set_char_size_2, Qxg_frame_set_char_size_3)
(Qxg_change_toolbar_position, Qx_net_wm_state)
(Qx_handle_net_wm_state, Qtb_size_cb, Qupdate_frame_tool_bar)
(Qfree_frame_tool_bar): New symbol for updating
frame_size_history.
(Qtip_frame, Qterminal_frame): New symbols.
(Vframe_adjust_size_history): Rename to frame_size_history.
* frame.h (struct frame): Rename
can_run_window_configuration_change_hook slot to
after_make_frame.
(frame_size_history_add): Extern.
* gtkutil.c (xg_frame_resized): Call frame_size_history_add.
Don't set FRAME_PIXEL_WIDTH and FRAME_PIXEL_HEIGHT here.
(xg_frame_set_char_size): Try to preserve the status of
fullwidth/-height frames.  Call frame_size_history_add.
(tb_size_cb, update_frame_tool_bar, free_frame_tool_bar)
(xg_change_toolbar_position): Call frame_size_history_add.
* w32fns.c (x_change_tool_bar_height): Handle frame's fullscreen
status.
(Fx_create_frame): Process fullscreen parameter after frame has
been resized.
(x_create_tip_frame): Pass Qtip_frame to adjust_frame_size.
(Fx_frame_geometry): Don't pollute pure storage.
* w32term.c (w32_read_socket): For WM_WINDOWPOSCHANGED,
WM_ACTIVATE and WM_ACTIVATEAPP set frame's visibility before
calling w32fullscreen_hook.  For WM_DISPLAYCHANGE call
w32fullscreen_hook immediately.
(x_fullscreen_adjust, x_check_fullscreen): Remove.
(w32fullscreen_hook): Call change_frame_size just as with a
"normal" frame resize operation.  Call do_pending_window_change.
(x_set_window_size): Try to handle fullwidth and fullheight more
accurately.  Don't rely on w32_enable_frame_resize_hack.
(w32_enable_frame_resize_hack): Remove variable.
* widget.c (EmacsFrameResize): Remove dead code.  Call
frame_size_history_add
* window.c (run_window_configuration_change_hook): Check
f->after_make_frame instead of
f->can_run_window_configuration_change_hook.
* xfns.c (x_change_tool_bar_height): Handle frame's fullscreen status.
(Fx_create_frame): Process fullscreen parameter after frame has
been resized.
(Fx_frame_geometry): Don't pollute pure storage.
* xterm.c (x_net_wm_state, x_handle_net_wm_state): Call
frame_size_history_add.
(do_ewmh_fullscreen): Handle x_frame_normalize_before_maximize.
(x_check_fullscreen): Count in menubar when calling
XResizeWindow.  Wait for ConfigureNotify event.  Call
frame_size_history_add.
(x_set_window_size_1): Remove PIXELWISE argument.  Try to handle
changing a fullheight frame's width or a fullwidth frame's
height.  Call frame_size_history_add.
(x_set_window_size): Simplify xg_frame_set_char_size and
x_set_window_size_1 calls.
(x_frame_normalize_before_maximize): New variable.
2015-02-07 11:51:03 +01:00
Paul Eggert
cf498e5b9a Remove no-longer-used cursor_in_echo_area code
* dispnew.c (set_window_cursor_after_update, update_frame_1):
Remove checks for negative cursor_in_echo_area, since this var is
a boolean, and has been a boolean for some time.  Simplify.
* dispnew.c (init_display):
* xdisp.c (message3_nolog, vmessage): Use bool for boolean.
2015-02-06 19:28:56 -08:00
Dmitry Gutov
66e6398505 Make vc-test-svn03-working-revision pass
* test/automated/vc-tests.el (vc-test--working-revision): Fix
`vc-working-revision' checks to be compared against nil, which is
what is should return for unregistered files.
2015-02-07 04:26:05 +03:00
Dmitry Gutov
fa7f79e823 (vc-cvs-dir-status-files): Don't pass DIR to `vc-cvs-command'
Fixes: debbugs:19732

* lisp/vc/vc-cvs.el (vc-cvs-dir-status-files): Don't pass DIR to
`vc-cvs-command'.
2015-02-07 02:35:24 +03:00