1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-16 08:10:43 -08:00
Commit graph

116079 commits

Author SHA1 Message Date
Eli Zaretskii
342cf49489 Fixed display and padding of menu items; File menu displays OK. 2013-09-17 18:31:37 +03:00
Stefan Monnier
e8b66a6a26 * lisp/eshell/esh-cmd.el (eshell-post-rewrite-command-function): New var.
(eshell-post-rewrite-command-hook): Make obsolete.
(eshell-parse-command): Simplify.
(eshell-structure-basic-command): Remove unused arg `vocal-test'.
(eshell--cmd): Declare.
(eshell-parse-pipeline): Remove unused var `final-p'.
Pass a dynvar to eshell-post-rewrite-command-hook.
Implement the new eshell-post-rewrite-command-function.
(eshell-invoke-directly): Remove unused arg `input'.
* lisp/eshell/esh-io.el (eshell-io-initialize):
Use eshell-post-rewrite-command-function.
(eshell--apply-redirections): Rename from eshell-apply-redirections;
adjust to new calling convention.
(eshell-create-handles): Rename args to avoid clashing with dynvar
`standard-output'.

Fixes: debbugs:15399
2013-09-17 11:19:12 -04:00
Katsumi Yamaoka
4e0bf886e0 gnus-int.el (gnus-open-server): Silence compiler 2013-09-17 14:08:24 +00:00
Dmitry Antipov
2cd9881277 * frame.h (x_set_bitmap_icon) [!HAVE_NS]: New function.
(x_icon_type): Remove prototype.
(x_bitmap_icon) [!HAVE_NS]: Declare as such.
* frame.c (x_icon_type): Remove.
* w32term.c (x_make_frame_visible, x_iconify_frame):
* xterm.c (x_make_frame_visible, x_iconify_frame):
Use x_set_bitmap_icon to factor out common code.
2013-09-17 16:59:45 +04:00
Eli Zaretskii
ffc3882f6c Minor fixes to interfaces, avoid assertion violation under GLYPH_DEBUG. 2013-09-17 15:47:37 +03:00
Dmitry Antipov
a6c2ee1b72 * dispextern.h (check_x_display_info, x_get_string_resource):
Declare here just once and unify the latter.
* frame.c (check_x_display_info, x_get_string_resource):
* nsterm.h (check_x_display_info):
* xrdb.c (x_get_string_resource):
* xterm.h (check_x_display_info): Remove prototypes.
* nsfns.m (x_get_string_resource): Likewise.  Adjust definition.
* w32reg.c (x_get_string_resource): Likewise.
(w32_get_rdb_resource): Adjust user.
2013-09-17 16:27:21 +04:00
Katsumi Yamaoka
07dd2ea47f lisp/gnus/mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag 2013-09-17 10:21:24 +00:00
Glenn Morris
5cf10af897 Auto-commit of generated files. 2013-09-17 06:17:44 -04:00
Katsumi Yamaoka
4a8bb694aa message.el (message-display-completion-list): Abolish 2013-09-17 09:24:02 +00:00
Dmitry Antipov
baed360360 * xterm.h (struct x_display_info): New member
x_pending_autoraise_frame, going to replace...
* xterm.c (pending_autoraise_frame): ...static variable.
(x_new_focus_frame, XTread_socket): Adjust users.
* w32term.h (struct w32_display_info): New member
w32_pending_autoraise_frame, going to replace...
* w32term.c (pending_autoraise_frame): ...global variable.
(x_new_focus_frame, w32_read_socket): Adjust users.
2013-09-17 12:24:20 +04:00
Glenn Morris
f804aa63be Fix ChangeLog typos 2013-09-17 00:47:51 -07:00
Glenn Morris
3696fe8aae ChangeLog whitespace fixes 2013-09-17 00:45:18 -07:00
Glenn Morris
16bda9698e Commentary update 2013-09-17 00:43:14 -07:00
Glenn Morris
90582f05bc Add a major-mode for the *Messages* buffer
Ref: http://lists.gnu.org/archive/html/emacs-devel/2010-02/msg00135.html

* lisp/simple.el (messages-buffer-mode): New major mode.
(messages-buffer): New function.

* lisp/startup.el (normal-top-level): Switch mode of *Messages* buffer.

* src/xdisp.c (message_dolog): If we create *Messages*,
switch it to messages-buffer-mode.

* lisp/emacs-lisp/ert.el (ert--force-message-log-buffer-truncation)
(ert-run-test): Use `message-buffer' function.
(ert--force-message-log-buffer-truncation): Ignore read-only.

* lisp/help.el (view-echo-area-messages): Use `message-buffer' function.

* lisp/mail/emacsbug.el (report-emacs-bug): Use `message-buffer' function.

* lisp/gnus/gnus-util.el (gnus-message-with-timestamp-1):
Use `message-buffer' function if available.  Ignore read-only.

* etc/NEWS: Mention this.
2013-09-17 00:39:54 -07:00
Dmitry Antipov
33b83dd70c * xterm.c (toplevel) [USE_MOTIF]: Include xlwmenu.h to pacify GCC. 2013-09-17 11:36:35 +04:00
Glenn Morris
e36b2d20d0 ChangeLog whitespace fixes 2013-09-17 00:31:09 -07:00
Glenn Morris
39eb0cb563 Merge from emacs-24; up to 2013-01-03T02:31:36Z!rgm@gnu.org 2013-09-17 00:26:07 -07:00
Paul Eggert
b7ad2f7401 Don't overuse 'const' in types of locals.
* bidi.c (bidi_count_bytes):
* gtkutil.c, gtkutil.h (xg_event_is_for_menubar)
(xg_event_is_for_scrollbar):
* xselect.c (x_handle_property_notify)
(x_handle_selection_notify, x_handle_dnd_message):
* xsettings.c, xsettings.h (xft_settings_event):
* xterm.c (x_handle_net_wm_state, handle_one_event)
(x_menubar_window_to_frame, x_detect_focus_change)
(construct_mouse_click, note_mouse_movement)
(x_scroll_bar_to_input_event, x_scroll_bar_expose)
(x_scroll_bar_handle_click, x_scroll_bar_note_movement)
(handle_one_xevent, x_handle_net_wm_state):
* xterm.h (x_handle_property_notify, x_handle_selection_notify)
(x_handle_dnd_message):
Avoid unnecessary 'const', typically the second 'const' in
'const foo * const arg', a 'const' that does not affect the API
and doesn't significantly help the human reader.
2013-09-17 00:06:42 -07:00
Dmitry Antipov
1893694e3e * xterm.c (handle_one_xevent): Do not call to x_clear_area
if GTK >= 2.7.0.
2013-09-17 10:57:30 +04:00
Dmitry Antipov
19452b8665 * configure.ac: Do not check for g_type_init because we
require glib >= 2.28 for GTK3, glib >= 2.10 for GTK2,
glib >= 2.26 for GSettings and glib >= 2.7.0 for GConf, so
suitable glib should provide g_type_init unconditionally.
* src/image.c (fn_g_type_init) [WINDOWSNT]: Define and load
only if Glib < 2.36.0.
(fn_g_type_init) [!WINDOWSNT]: Define only if Glib < 2.36.0.
* src/xsettings.c (init_gconf, init_gsettings): Do not check
for g_type_init.
2013-09-17 10:33:24 +04:00
Katsumi Yamaoka
1149ffdb07 message.el (message-expand-group, message-completion-in-region): Correct the order of start and end of a region 2013-09-16 23:22:02 +00:00
Glenn Morris
a19f6c6396 * lisp/url/url-misc.el (url-data): Avoid match-data mix-up with base64 case.
Use Content-Transfer-Encoding rather than Content-Encoding.

Fixes: debbugs:15285
2013-09-16 17:28:11 -04:00
Glenn Morris
0c2a2b57fe * test/automated/eshell.el (eshell-match-result):
Return a more informative failure than simply "false".  Update callers.
2013-09-16 16:58:28 -04:00
Glenn Morris
8d95f3a69c Fix comment typo 2013-09-16 15:21:45 -04:00
Glenn Morris
88302cbb9f * test/automated/eshell (eshell-test/for-name-shadow-loop): Tweak previous 2013-09-16 15:20:44 -04:00
Stefan Monnier
504a03813b * lisp/icomplete.el (icomplete-in-buffer): New var.
(icomplete-pre-command-hook, icomplete-post-command-hook): Remove those
vars and replace them with functions.
(icomplete-minibuffer-setup): Adjust accordingly.
(icomplete--completion-table, icomplete--completion-predicate)
(icomplete--field-string, icomplete--field-beg, icomplete--field-end):
New functions.
(icomplete-forward-completions, icomplete-backward-completions)
(icomplete-simple-completing-p, icomplete-exhibit)
(icomplete-completions): Use them.
(icomplete--in-region-buffer): New var.
(icomplete--in-region-setup): New function.
(icomplete-mode): Use it.
2013-09-16 15:09:24 -04:00
Glenn Morris
cde40d2bb8 * test/automated/eshell.el (eshell-test/for-name-shadow-loop):
Test value before and after loop as well as during.
2013-09-16 14:42:41 -04:00
Glenn Morris
16af23266c * etc/CONTRIBUTE: Copyedits. 2013-09-16 14:37:18 -04:00
Stefan Monnier
70568a90a1 * lisp/eshell/esh-opt.el: Fix last change to set lexical-vars properly.
(eshell--do-opts): Rename from eshell-do-opt, remove arg `body-fun',
return args and options.
(eshell-eval-using-options): Use the new return value of
eshell--do-opts to set the options's vars in their scope.
(eshell--set-option): Rename from eshell-set-option.
Add arg `opt-vals'.
(eshell--process-option): Rename from eshell-process-option.
Add arg `opt-vals'.
(eshell--process-args): Use an `opt-vals' alist to store the options's
values during their processing and return them additionally to the
remaining args.

Fixes: debbugs:15379
2013-09-16 14:23:30 -04:00
Jan Djärv
3f386383dc * xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0
before calling g_type_init.
2013-09-16 20:17:35 +02:00
Glenn Morris
510f531ef2 * etc/CONTRIBUTE: Clarify disclaimer a bit. 2013-09-16 13:54:15 -04:00
Stefan Monnier
1809eef8b7 * lisp/subr.el (eval-after-load): Preserve evaluation order.
Fixes: debbugs:15389
2013-09-16 12:29:46 -04:00
Jan Djärv
6434e34375 Fix syms_of_(mac|ms)font calls.
* font.c (syms_of_font): Move call to syms_of_(ns|mac)font ...

* nsterm.m (syms_of_nsterm): ... to here.
2013-09-16 17:55:02 +02:00
Dmitry Antipov
83a119f8d8 * xterm.c (toolkit_scroll_bar_interaction): Use bool for boolean.
(ignore_next_mouse_click_timeout): Use Time as X does.
(handle_one_xevent): Avoid cast and use unsigned comparison.
2013-09-16 15:23:03 +04:00
Dmitry Antipov
61582e6aad Do not copy X event in handle_one_xevent except KeyPress case.
Wnen XEvent is processed, it is unlikely to be changed except
KeyPress case, so we can avoid copying and use const pointer to
const data to make sure that an event is not changed elsewhere.
* xterm.c (handle_one_xevent): Change 2nd arg to 'const XEvent *
const' and do not create local copy except for the KeyPress event.
Use casts to avoid a few glitches.  Adjust formatting.  Add comments.
(SET_SAVED_BUTTON_EVENT): Remove and move the code to the only user.
(x_handle_net_wm_state, x_menubar_window_to_frame)
(x_detect_focus_change, construct_mouse_click, note_mouse_movement)
(x_scroll_bar_to_input_event, x_scroll_bar_expose)
(x_scroll_bar_handle_click, x_scroll_bar_note_movement):
* gtkutil.c (xg_event_is_for_menubar, xg_event_is_for_scrollbar):
* xselect.c (x_handle_property_notify, x_handle_selection_notify)
(x_handle_dnd_message):
* xsettings.c (xft_settings_event):
Use 'const XEvent * const' where appropriate.
* xterm.h, gtkutil.h, xsettngs.h: Adjust related prototypes.
2013-09-16 14:41:41 +04:00
Glenn Morris
c6ad9bcade Auto-commit of generated files. 2013-09-16 06:17:41 -04:00
Dmitry Antipov
f8eb15727a Fix X event waiting to handle multiple frames.
* frame.h (struct frame) [HAVE_X_WINDOWS]: New member wait_event_type.
* xterm.c (pending_event_wait): Remove.  Adjust users.
(x_detect_focus_change): Pass frame arg.
(handle_one_xevent): Find related frame early and clear per-frame
wait_event_type only if this is an event for the relevant frame.
(x_wait_for_event): Use per-frame wait_event_type.
2013-09-16 11:27:51 +04:00
Dmitry Gutov
578c21bc03 * lisp/progmodes/ruby-mode.el (ruby-operator-re): Consider line
continuation character an operator, as far as indentation is
concerned.

Fixes: debbugs:15369
2013-09-16 02:42:26 +03:00
Jan Djärv
745d3809b6 Fix compilation for GNUStep due to font changes.
* font.c (syms_of_font): Check MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
for syms_of_macfont.

* nsfns.m (Fx_create_frame): Fix font driver registration for
GNUStep.
2013-09-15 21:43:32 +02:00
Jan Djärv
d93ab42eb9 Forgot to add files. 2013-09-15 21:36:20 +02:00
Jan Djärv
3fa2054efd Port the font backend from the Mac port.
* configure.ac: Add check for OSX 10.5, required for macfont.o.

* etc/NEWS: Mention the macfont backend.

* src/Makefile.in (NS_OBJ, SOME_MACHINE_OBJECTS): Add macfont.o.

* src/font.c (syms_of_font): Call syms_of_macfont.

* src/font.h: Declare syms_of_macfont.

* src/nsfns.m: Include macfont.h.
(Fx_create_frame): Register macfont driver, make a better default font.
(Fns_popup_font_panel): Get font from macfont driver, if used.

* src/nsfont.m (ns_tmp_flags, ns_tmp_font): Remove.
(nsfont_open): Set font driver type.
Set font->ascent and font->descent.  Figure out font instead of
ns_tmp_font, and flags instead of ns_tmp_flags.
Fix indentation. Remove call to ns_draw_text_decoration,
moved to nsterm.

* src/nsterm.m: Include macfont.h.
(ns_tmp_flags, ns_tmp_font): Remove.
(ns_compute_glyph_string_overhangs): Check for driver Qns.
(ns_draw_glyph_string): Use local variables instead of ns_tmp_flags,
ns_tmp_font.  Call ns_draw_text_decoration here instead of nsfont.m.
(changeFont:): Fix code style.  Check for font driver type when
getiing font.

* src/nsterm.h (FONT_DESCENT, FONT_ASCENT): Define to (f)->ascent and
(f)->descent.
2013-09-15 19:58:46 +02:00
Martin Rudalics
c089653d56 In window--state-put-2 don't process buffer state when buffer doesn't exist (Bug#15382).
* window.el (window--state-put-2): Don't process buffer state
when buffer doesn't exist any more (Bug#15382).
2013-09-15 18:08:04 +02:00
Glenn Morris
820a4cbeb6 Auto-commit of loaddefs files. 2013-09-15 06:22:42 -04:00
Dmitry Antipov
0eed035504 Drop VERTICAL_SCROLL_BAR_WIDTH_TRIM. For X, it is zero since 1999,
and it is always zero for others, so I assume that this is an ancient
leftover which nobody will want to change any more.
* xterm.h, w32term.h, nsterm.h (VERTICAL_SCROLL_BAR_WIDTH_TRIM): Remove.
(VERTICAL_SCROLL_BAR_INSIDE_WIDTH):
* frame.c (x_set_scroll_bar_width):
* w32fns.c (w32_createscrollbar):
* w32term.c (w32_set_vertical_scroll_bar):
* xfns.c (x_set_scroll_bar_default_width):
* xterm.c (XTflash, x_scroll_bar_create, XTset_vertical_scroll_bar)
(x_scroll_bar_expose): Related users changed.
2013-09-15 12:28:30 +04:00
Dmitry Antipov
7f09455e58 * xterm.c, xfns.c (toplevel): Remove #ifdef HAVE_X_WINDOWS because
these modules are never compiled otherwise.
2013-09-15 11:48:25 +04:00
Dmitry Antipov
901049a661 * xterm.h (SCROLL_BAR_X_WIDGET, SET_SCROLL_BAR_X_WIDGET) [USE_X_TOOLKIT]:
Define as such.
* w32term.h (SCROLL_BAR_X_WIDGET, SET_SCROLL_BAR_X_WIDGET):
Remove unused Xisms.
2013-09-15 11:28:38 +04:00
Dmitry Antipov
c7cc32f7ab * frame.h (FRAME_SMALLEST_CHAR_WIDTH, FRAME_SMALLEST_FONT_HEIGHT):
Define once here...
* nsterm.h, w32term.h, xterm.h: ...and not here.
2013-09-15 11:06:05 +04:00
Dmitry Antipov
07013c6895 * xterm.h (FRAME_X_SCREEN_NUMBER): Add comment.
(BLACK_PIX_DEFAULT, WHITE_PIX_DEFAULT): Use FRAME_X_SCREEN_NUMBER.
2013-09-15 10:50:41 +04:00
Glenn Morris
3075324210 * eshell/em-unix.el (eshell/rm): Make -f ignore missing files.
Does not work until bug=15379 gets fixed.

Fixes: debbugs:15373
2013-09-14 17:35:54 -07:00
Glenn Morris
1e53bb4bf2 * lisp/eshell/esh-cmd.el (eshell--local-vars): New variable.
(eshell-rewrite-for-command): Add for loop vars to eshell--local-vars.

* lisp/eshell/esh-var.el (eshell-get-variable): Respect eshell--local-vars.

* test/automated/eshell.el (eshell-test/for-name-shadow-loop):
New test.
(eshell-test/for-loop, eshell-test/for-name-loop): Doc fix.

Fixes: debbugs:15372
2013-09-14 17:10:45 -07:00