1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00
Commit Graph

116789 Commits

Author SHA1 Message Date
Paul Eggert
cae17e36bc Minor fixups related to usage of the 'long' type.
* gnutls.c (emacs_gnutls_handshake):
* xfaces.c (dump_realized_face):
Work even if 'long' is narrower than 'void *'.
* termcap.c (scan_file):
* xselect.c (x_decline_selection_request)
(x_reply_selection_request, x_get_window_property):
* xterm.c (x_set_frame_alpha):
Remove unnecessary 'L' suffixes of integer constants.
* xfns.c (hack_wm_protocols):
* xselect.c (x_fill_property_data):
* xterm.c (x_set_offset, x_set_window_size_1, x_make_frame_invisible):
Remove unnecessary casts to 'long'.
(set_machine_and_pid_properties): Don't assume pid_t fits in 32 bits.
2014-07-07 16:33:05 -07:00
Paul Eggert
0e14232948 Minor ImageMagick safety fixes.
* image.c (imagemagick_compute_animated_image):
Remove useless assignment to local.  Avoid problems if dest_width is 0.
(imagemagick_load_image): Use int for pixel counts that can't
exceed INT_MAX.  Avoid problem if PixelGetNextIteratorRow returns
a row width greater than the image width (or greater than LONG_MAX!).
2014-07-07 16:25:13 -07:00
Luke Lee
2c57885024 HideIfDef mode bug fixes and enhancements. This is #3 of 3 patches based
on the completed work posted on http://www.emacswiki.org/emacs/HideIfDef.

- Add macro evaluation function and key binding for a marked region.
- Merge continuous "..." lines into one.
- Fix old hideif bugs that fail to hide the correct #elif regions
- Support hide/show commands in a marked region.
- Expand top level for .h files to prevent re-inclusion protection.
- Change maintainer.

* lisp/progmodes/hideif.el (hide-ifdef-env): Change to global.
(hide-ifdef-env-backup): New variable.
(hide-ifdef-expand-reinclusion-protection, hide-ifdef-header-regexp):
New customizable variables.
(hif-clear-all-ifdef-defined): New defun.
(hif-merge-ifdef-region, hide-ifdef-region-internal, hide-ifdef-region)
(hif-show-ifdef-region): Merge hidden regions to prevent continuous "...".
(hif-tokenize): Fix for MS-DOS/Win EOL style.
(hif-endif-to-ifdef, hif-make-range, hif-find-range, hif-possibly-hide):
Fix bug to hide the correct #elif region(s).
(hif-range-elif): New defun.
(hif-recurse-level): New var.
(hif-evaluate-region, hif-evaluate-macro): New defun.
(hide-ifdef-guts): Prevent reinclusion protected C/C++ headers from
fully hidden.
(hide-ifdef-define, hide-ifdefs, hide-ifdef-block, show-ifdef-block):
Better interaction.
2014-07-07 16:59:32 +08:00
Katsumi Yamaoka
4cf00b8c15 lisp/gnus/gnus-start.el (gnus-dribble-read-file): Don't stop auto-saving 2014-07-07 05:47:59 +00:00
Kenichi Handa
aeb894a9a0 merge trunk 2014-07-05 23:07:57 +09:00
Michael Albinus
a984543a44 * automated/dbus-tests.el (dbus-test02-register-service-session)
(dbus-test02-register-service-system): Fix docstring.
(dbus-test02-register-service-own-bus)
(dbus-test03-peer-interface): New tests.
2014-07-04 12:07:45 +02:00
Michael Albinus
b39eecb3c7 Fix Bug#17858
* net/dbus.el (dbus-peer-handler): New defun.
(dbus-register-service): Register it. 
(dbus-managed-objects-handler): Fix docstring.
2014-07-04 12:03:14 +02:00
Dmitry Antipov
9d7b0167fd * font.h (struct font_driver): Remove get_outline and free_outline;
not used by any font driver.
* ftfont.c (ftfont_driver):
* macfont.m (macfont_driver):
* nsfont.m (nsfont_driver):
* w32font.c (w32font_driver):
* w32uniscribe.c (uniscribe_font_driver):
* xfont.c (xfont_driver): Related users changed.
* xselect.c (x_get_window_property): Use convenient xmalloc.
Call to xfree only if some data was really allocated.
2014-07-04 06:28:54 +04:00
Phil Sainty
2b13ca4d11 * lisp/emacs-lisp/lisp.el (narrow-to-defun-include-comments): New var.
(narrow-to-defun): New arg include-comments, defaulting to it.

Fixes: debbugs:16328
2014-07-03 22:00:54 -04:00
Stefan Monnier
9362232cef * lisp/rect.el (rectangle--highlight-for-redisplay): Don't pass `orig' with
different calling convention to rectangle--unhighlight-for-redisplay.
2014-07-03 18:22:42 -04:00
Dmitry Antipov
af8ee9ca88 On MS-Windows, display busy cursor on all GUI frames.
This is similar to what we have on X.  Quickly tested by Dani Moncayo.
* w32fns.c (toplevel): Remove hourglass_hwnd; no longer used.
(w32_show_hourglass, w32_hide_hourglass, w32_note_current_window):
Likewise.
(hide_hourglass, show_hourglass): Redesign to match X counterparts.
* xdisp.c (start_hourglass): Remove Windows-specific bits.
2014-07-03 22:12:41 +04:00
Kelvin White
046d53d46e Fix nick duplication in format-@nick 2014-07-03 08:30:26 -04:00
Dmitry Antipov
60ab579771 Use convenient alists to manage per-frame font driver-specific data.
* frame.h (struct frame): Rename font_data_list to...
[HAVE_XFT || HAVE_FREETYPE]: ... font_data, which is a Lisp_Object now.
* font.h (struct font_data_list): Remove; no longer need a special
data type.
(font_put_frame_data, font_get_frame_data) [HAVE_XFT || HAVE_FREETYPE]:
Adjust prototypes.
* font.c (font_put_frame_data, font_get_frame_data)
[HAVE_XFT || HAVE_FREETYPE]: Prefer alist functions to ad-hoc list
management.
* xftfont.c (xftfont_get_xft_draw, xftfont_end_for_frame):
Related users changed.
* ftxfont.c (ftxfont_get_gcs, ftxfont_end_for_frame): Likewise.
Prefer convenient xmalloc and xfree.
2014-07-03 16:20:00 +04:00
Michael Albinus
95268e987c * net/tramp-adb.el (tramp-adb-sh-fix-ls-output): Use `bolp'.
* net/tramp-sh.el (tramp-sh-handle-set-visited-file-modtime)
(tramp-sh-handle-verify-visited-file-modtime): Use `point-at-eol'.

* net/tramp.el (tramp-call-process): Handle error strings.

* net/trampver.el: Update release number.
2014-07-03 11:27:02 +02:00
Michael Albinus
57b02816a8 * trampver.texi: Update release number. 2014-07-03 11:10:05 +02:00
Glenn Morris
2d3c9015c7 Merge from emacs-24; up to 2014-06-15T04:52:34Z!eli@barzilay.org 2014-07-02 23:00:53 -07:00
Juri Linkov
cbb6a7aeff * lisp/desktop.el (desktop-save): Rename arg auto-save' to only-if-changed'.
Doc fix.

Fixes: debbugs:17873
2014-07-03 02:45:12 +03:00
Dmitry Antipov
e993f8d5d3 * lisp.h (toplevel): Add compile-time assert to verify suitable member layout
in Lisp_Sub_Char_Table.
2014-07-02 19:22:49 +04:00
Stefan Monnier
4991d13037 * mouse.el (mouse-yank-primary, mouse-yank-secondary): Use insert-for-yank.
Fixes: debbugs:17271
2014-07-02 10:42:00 -04:00
Dmitry Antipov
15c1107a30 * print.c (print_object): Adjust to match new layout of sub char-table
(Bug#17898).
2014-07-02 18:00:41 +04:00
Leo Liu
cc4f9c83bc * emacs-lisp/pp.el (pp-eval-expression, pp-eval-last-sexp):
Support lexical-binding.
2014-07-02 13:05:50 +08:00
Luke Lee
fe1c6a42c9 * lisp/progmodes/hideif.el (hide-ifdef-exclude-define-regexp): Add the
forgotten :version "24.5".
2014-07-02 12:25:21 +08:00
Dmitry Antipov
477daa5b53 Shrink Lisp_Sub_Char_Table by preferring C integers to Lisp_Objects.
* lisp.h (struct Lisp_Sub_Char_Table): Use C integers for depth and
min_char slots.  Adjust comment.
(enum char_table_specials): Rename from CHAR_TABLE_STANDARD_SLOTS.
Add SUB_CHAR_TABLE_OFFSET member.
(make_uninit_sub_char_table): New function.
* alloc.c (mark_char_table): Add extra argument to denote char table
subtype.  Adjust to match new layout of sub char-table.
(mark_object): Always mark sub char-tables with mark_char_table.
* chartab.c (make_sub_char_table, copy_sub_char_table)
(sub_char_table_ref, sub_char_table_ref_and_range, sub_char_table_set)
(sub_char_table_set_range, optimize_sub_char_table, map_sub_char_table)
(map_sub_char_table_for_charset, uniprop_table_uncompress):
All related users changed.
* lread.c (read1): Adjust to match new layout of sub char-table.
2014-07-02 07:26:19 +04:00
Stefan Monnier
1dc6f7e738 * doc/lispref/keymaps.texi (Key Lookup): Remove mention of indirect entries.
(Scanning Keymaps): Reword the `noindirect' argument.
* src/keymap.c (get_keyelt): Simplify.
(copy_keymap_item): Remove left-over code for when we had
key-shortcut caches.
2014-07-01 21:49:31 -04:00
Juri Linkov
8b3c1354a9 * lisp/man.el (Man-bgproc-sentinel): Use `Man-page-from-arguments'
for the message about the man page cleaned up.
2014-07-02 03:57:53 +03:00
Juri Linkov
a4b0fffe25 Display man pages immediately and use process-filter to format them asynchronously.
* lisp/man.el (Man-width): Doc fix.
(man): Doc fix.
(Man-start-calling): Use `with-selected-window' to get
`frame-width' and `window-width'.
(Man-getpage-in-background): Call `Man-notify-when-ready'
immediately after creating a new buffer.  Call `Man-mode' and set
`mode-line-process' in the created buffer.  Set process-filter to
`Man-bgproc-filter' in start-process branch.  In call-process branch
call either `Man-fontify-manpage' or `Man-cleanup-manpage'.
Use `Man-start-calling' inside `with-current-buffer'.
(Man-fontify-manpage): Don't print messages.  Fix boundary condition.
(Man-cleanup-manpage): Don't print messages.
(Man-bgproc-filter): New function.
(Man-bgproc-sentinel): Add `save-excursion' to keep point when
user moved it during asynchronous formatting.  Move calls of
`Man-fontify-manpage' and `Man-cleanup-manpage' to
`Man-bgproc-filter'.  Move the call of `Man-mode' to
`Man-getpage-in-background'.  Use `quit-restore-window'
instead of `kill-buffer'.  Use `message' instead of `error'
because errors are catched by process sentinel.
(Man-mode): Move calls of `Man-build-page-list',
`Man-strip-page-headers', `Man-unindent', `Man-goto-page' to
`Man-bgproc-sentinel'.  Doc fix.  (Bug#2588, bug#5054, bug#9084, bug#17831)
2014-07-02 02:54:59 +03:00
Mario Lang
dd72a0ca55 * net/gnutls.el (gnutls-negotiate): Prevent destructive modification of
customization option `gnutls-verify-error.
2014-07-01 20:48:24 +02:00
Stefan Monnier
6372fc12fe * lisp/simple.el (deactivate-mark, set-mark-command, handle-shift-selection):
Don't keep transient-mark-mode buffer-local when not needed.

Fixes: debbugs:6316
2014-07-01 14:13:28 -04:00
Eli Zaretskii
cdadeecf05 src/dispnew.c: Fix a typo in a comment. 2014-07-01 21:00:29 +03:00
Eli Zaretskii
ff6e6a42fc Fix bug #17892 with mode/header line and display margins.
src/dispnew.c (prepare_desired_row): Accept 2 additional arguments:
 the window whose glyph row is being prepared and a flag whether it
 is for mode/header line.  Make sure the glyph row's marginal areas
 are in sync with what the window wants.
 src/xdisp.c (display_line, display_mode_line): Call
 prepare_desired_row with additional arguments, as appropriate.
 src/dispextern.h (prepare_desired_row): Adjust prototype.
 src/window.h: Improve commentary of the marginal columns.
2014-07-01 20:07:24 +03:00
Stefan Monnier
854b22ea18 * lisp/xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
(turn-off-xterm-mouse-tracking-on-terminal): Don't burp if the terminal
is suspended.

Fixes: debbugs:17857
2014-07-01 12:10:02 -04:00
Kenichi Handa
763a11d0d0 merge trunk 2014-07-02 00:34:58 +09:00
Kenichi Handa
0782685d43 * coding.c (MIN_CHARBUF_SIZE): Delete it.
(MAX_CHARBUF_EXTRA_SIZE): New macro.
(ALLOC_CONVERSION_WORK_AREA): Use MAX_CHARBUF_EXTRA_SIZE.
2014-07-02 00:31:59 +09:00
Stefan Monnier
3737a8efcf * lisp/vc/log-edit.el (log-edit-goto-eoh): New function.
(log-edit--match-first-line): Use it.

Fixes: debbugs:17861
2014-07-01 11:15:03 -04:00
Dmitry Antipov
39a61a22ed Fix ChangeLog entry 2014-07-01 18:51:26 +04:00
Michael Albinus
005f996739 * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
Prefer utf-8 coding.  (Bug#17859)
2014-07-01 16:06:11 +02:00
Glenn Morris
b14d27ca8f Auto-commit of loaddefs files. 2014-07-01 07:19:31 -04:00
Glenn Morris
a519335cc3 Auto-commit of loaddefs files. 2014-07-01 06:18:16 -04:00
Dmitry Antipov
9714dfd285 * menu.c (Fx_popup_dialog): Set Vmenu_updating_frame to avoid crash
caused by xw_popup_dialog in daemon mode (Bug#17891).
2014-07-01 12:07:32 +04:00
Dmitry Antipov
34ac10a87b * xfaces.c (init_frame_faces): Always realize basic faces (#Bug17889). 2014-07-01 11:30:33 +04:00
Glenn Morris
3f4d0f042a * lisp/vc/log-edit.el (log-edit-hook): Add missing :version. 2014-07-01 00:00:46 -07:00
Fabián Ezequiel Gallina
3acd6262d9 * lisp/progmodes/python.el (python-indent-post-self-insert-function):
Enhancements to electric indentation behavior inside
parens.

* test/automated/python-tests.el
(python-tests-self-insert): New function.
(python-triple-quote-pairing): Use it.
(python-util-forward-comment-1): New test. (Bug#17658)
2014-07-01 00:54:11 -03:00
Stefan Monnier
64c11219d1 * lisp/ps-def.el (ps-generate-postscript-with-faces1): Don't mess with
buffer-invisibility-spec.

Fixes: debbugs:17867
2014-06-30 22:25:52 -04:00
Fabián Ezequiel Gallina
911ba4d915 * lisp/emacs-lisp/subr-x.el (string-reverse): Define as obsolete alias
for `reverse'.
2014-06-30 17:17:17 -03:00
Fabián Ezequiel Gallina
a24225d513 Changelog, NEWS and Copyright fixes. 2014-06-30 16:58:56 -03:00
Jan Djärv
98bfa4f1e6 Fix use of deallocated memory.
* nsterm.h (EmacsScroller): Remove dealloc.

* nsterm.m (judge): EmacsScroller: Move dealloc code here.
(dealloc): Remove for EmacsScroller.
2014-06-30 20:44:56 +02:00
Glenn Morris
0224bf74b2 Get rid of the AUTOGEN_VCS variable in lisp/Makefile
* lisp/emacs-lisp/autoload.el (autoload-ensure-writable): New variable.
(autoload-ensure-default-file): Maybe make existing output writable.

* lisp/Makefile.in (AUTOGEN_VCS): Remove.
(autoloads): Use autoload-ensure-writable rather than AUTOGEN_VCS.
2014-06-30 14:26:34 -04:00
Eli Zaretskii
1e23f9f308 Fix bug #17875 with changing TTY frame size, then selecting new frame.
src/frame.c (do_switch_frame): When switching to another TTY frame,
 make sure FrameCols and FrameRows are in sync with the new frame's
 data.
2014-06-30 19:45:38 +03:00
Eli Zaretskii
c6ecf7f23d Fix bug #17881 with infloop in decoding emacs-mule encoded text.
src/coding.c (MIN_CHARBUF_SIZE): Enlarge to 32.
2014-06-30 18:39:29 +03:00
Jan Djärv
9c660a187c Remove unnecessary redisplays in NS port.
* nsmenu.m (update_frame_tool_bar): Set wait_for_tool_bar to NO
when setNeedsDisplay is called so we don't trigger redisplay for every
tool bar update.

* nsterm.m (any_help_event_p): New variable.
(mouseMoved:): Set any_help_event_p to YES if help event is
generated.  Remove else with empty help event that triggered redisplay
for every mouse move.
(windowDidResignKey:): If any_help_event_p, generate empty help
event.
2014-06-30 14:38:09 +02:00