1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-13 09:32:47 +00:00
Commit Graph

95420 Commits

Author SHA1 Message Date
Chong Yidong
fea9cabd27 Merge changes from emacs-23 branch. 2010-07-16 11:42:15 -04:00
Michael Albinus
7e4289ad2b * net/tramp.el (tramp-handle-shell-command): Don't use hard-wired
"/bin/sh" but `tramp-remote-sh' from `tramp-methods'.
(tramp-find-shell): Simplify setting connection property.
(tramp-get-ls-command): Make test for "--color=never" stronger.
2010-07-16 14:09:55 +02:00
Reiner Steib
f253ef6a8e Fix bug #4451.
vc.el (vc-coding-system-inherit-eol): New defvar.
 (vc-coding-system-for-diff): Use it to decide whether to inherit
 from the file the EOL format for reading the diffs of that file.
2010-07-16 13:17:13 +03:00
Eli Zaretskii
134a027f69 mail/rmailmm.el (rmail-mime-save): Make the temp buffer unibyte,
so compressed attachments are not compressed again.

 See http://lists.gnu.org/archive/html/emacs-devel/2010-07/msg00599.html
2010-07-16 12:59:37 +03:00
Jan D
23243f2971 * xmenu.c (free_frame_menubar): Only call x_set_window_size if
widget is non-null (Bug#6645).
2010-07-16 09:50:37 +02:00
Andreas Schwab
01b564ff5e * xterm.c (x_fully_uncatch_errors, x_trace_wire, x_check_font): Convert old-style definition. 2010-07-15 23:54:10 +02:00
Andreas Schwab
2b23d2a6b1 * xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of timestamp argument. 2010-07-15 23:53:32 +02:00
Eli Zaretskii
c4affd2cb4 Restore mistakenly reverted code from 2010-04-17T12:33:05Z!eliz@gnu.org merged in 2010-04-20T13:31:28Z!eliz@gnu.org.
fringe.c (update_window_fringes): For R2L rows, swap the bitmaps
 of continuation indicators on the fringes.
2010-07-15 19:48:34 +03:00
Simon South
7473fff9e5 Correct my email address in the last update. 2010-07-15 10:36:27 -04:00
Simon South
e7e85b6a2b Merge fixes to indentation of case statements, variant parts in record
declarations.
2010-07-15 10:21:47 -04:00
Simon South
2c6a779afe (delphi-previous-indent-of): Indent case blocks within record
declarations (i.e. variant parts) correctly.
2010-07-14 23:12:37 -04:00
Simon South
a11b38eea2 (delphi-token-at): Give newlines precedence over literal tokens when
parsing so newlines aren't "absorbed" by single-line comments.
Corrects the indentation of case blocks that have a comment on the
first line.
2010-07-14 22:34:47 -04:00
Katsumi Yamaoka
e859bbdae2 Make gnus-summary-bookmark-make-record work for Emacs 23 as well.
2010-07-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 * gnus-sum.el (gnus-summary-bookmark-make-record): Make it work for
 Emacs 23 as well.
2010-07-15 00:54:06 +00:00
Karl Fogel
077e075349 * lisp/bookmark.el (bookmark-load-hook): Fix doc string as suggested
by Drew Adams (Bug#5504).
2010-07-14 15:09:28 -04:00
Chong Yidong
f9d71b4284 Change clipboard/primary selection to X application standards.
* lisp/menu-bar.el (menu-bar-enable-clipboard): Don't overwrite
Cut/Copy/Paste menu bar items.

* lisp/mouse.el: Bind mouse-2 to mouse-yank-primary.
(mouse-drag-copy-region): Default to nil.

* lisp/simple.el (select-active-regions): Default to t.
(push-mark-command): Don't overwrite primary with empty string.

* lisp/term/x-win.el (x-select-enable-clipboard): Default to t.
(x-initialize-window-system): Don't overwrite Paste menu item.
2010-07-14 14:03:39 -04:00
Jan D
243881ed13 * xt-mouse.el (xterm-mouse-event-read): Fix for characters > 127
now that unicode is used (Bug#6594).
2010-07-14 19:53:42 +02:00
Thierry Volpiatto
8f2eaa8abd Allow C-w when setting a bookmark in a Gnus Article buffer (Bug#5975).
* lisp/bookmark.el (bookmark-set): Don't set `bookmark-yank-point' and
  `bookmark-current-buffer' if they have been already set in another
  buffer (e.g gnus-art).

* lisp/gnus/gnus-sum.el (gnus-summary-bookmark-make-record): Set
  `bookmark-yank-point' and `bookmark-current-buffer' to allow C-w.
2010-07-14 12:41:40 -04:00
Chong Yidong
5cbce271a6 * simple.el (push-mark-command): Set selection for select-active-regions. 2010-07-14 12:11:39 -04:00
Karl Fogel
33b4848367 Allow bookmarks to be set from Gnus Article buffers (Bug #5975).
Patch applied (with minor tweaks) by Karl Fogel.  Note this leaves
C-w still not working correctly from Article buffers; Thierry's
patch to fix that will be applied after this.

* lisp/gnus/gnus-art.el (bookmark-make-record-function): New local variable.

* lisp/gnus/gnus-sum.el (gnus-summary-bookmark-make-record): Allow setting
  from article buffer.
  (gnus-summary-bookmark-jump): Maybe jump to article buffer.
2010-07-14 12:02:53 -04:00
Karl Fogel
e44fa724e4 Preparation for setting bookmarks in Gnus article buffers (Bug#5975).
* lisp/bookmark.el (bookmark-make-record-default): Allow unneeded
  information to be omitted from the record.

Adjust declarations and calls:

* lisp/info.el (bookmark-make-record-default): Adjust declaration.
  (Info-bookmark-make-record): Adjust call.

* lisp/woman.el (bookmark-make-record-default): Adjust declaration.
  (woman-bookmark-make-record): Adjust call.

* lisp/man.el (bookmark-make-record-default): Adjust declaration.
  (Man-bookmark-make-record): Adjust call.

* lisp/image-mode.el (bookmark-make-record-default): Adjust declaration.

* lisp/doc-view.el (bookmark-make-record-default): Adjust declaration.

* lisp/gnus/gnus-sum.el (bookmark-make-record-default): Adjust declaration.
2010-07-14 11:57:54 -04:00
Karl Fogel
2bb8db3ea7 Fix attribution in a ChangeLog entry. 2010-07-14 11:54:26 -04:00
Jan D
6b2c4bd94e Fix frame size when scroll bar width not an integral of column width.
xterm.c (x_set_window_size_1): scroll_bar_actual_width is always
SCROLL_BAR_COLS * COLUMN_WIDTH for the purpose of frame sizing.
2010-07-14 17:10:59 +02:00
Jan D
cf28cebc2e Fix menu bar activation with click for Motif/Lesstif.
* src/xdisp.c (pending_menu_activation): Remove extern declaration.
(prepare_menu_bars): Remove setting of pending_menu_activation.

* src/xmenu.c (pending_menu_activation): Remove.
(x_activate_menubar): Set popup_activated_flag for Xt also. Remove
setting of pending_menu_activation.
(set_frame_menubar): Remove check of pending_menu_activation.
Declare menubar_size before code.  Correct spelling in comment.

* src/xterm.c (xm_scroll_callback, x_process_timeouts): K&R => prototype.
(SET_SAVED_KEY_EVENT): Remove (not used).
(SET_SAVED_MENU_EVENT): Rename to SET_SAVED_BUTTON_EVENT and
remove size parameter.
(handle_one_xevent): Check popup_activated () for menu for Xt also.
Remove #ifdef USE_GTK around finish = X_EVENT_DROP.
Remove #ifdef USE_MOTIF code that did SET_SAVED_BUTTON_EVENT for
ButtonRelease.
2010-07-14 16:32:25 +02:00
Jan D
b78f97676f Fix menus as per bug 6499 and 6608.
* gtkutil.c (xg_event_is_for_menubar): New function (Bug#6499).

* gtkutil.h (xg_event_is_for_menubar): Declare.

* xfns.c (x_menubar_window_to_frame): Take XEvent as second parameter
instead of Window.  Call xg_event_is_for_menubar when
USE_GTK (Bug#6499).

* xmenu.c (x_activate_menubar): Revert previous fix for Bug#6499,
i.e. don't put back ButtonRelease (Bug#6608).

* xterm.c (handle_one_xevent): Pass event to x_menubar_window_to_frame.

* xterm.h (x_menubar_window_to_frame): Second parameter is XEvent*.
2010-07-14 12:05:53 +02:00
Eli Zaretskii
1f60c16a17 Fix bug #6609.
w32fns.c (x_set_foreground_color): Fix setting the cursor color
 when it's the same as the old foreground.
2010-07-14 10:40:52 +03:00
Kenichi Handa
ebd3d6afa4 Fix previous conflict. 2010-07-14 12:53:53 +09:00
Kenichi Handa
73a4405a35 merge trunk 2010-07-14 12:52:10 +09:00
Kenichi Handa
f6c1c771de Do not record a font-entity in the property of font-object. 2010-07-14 12:40:47 +09:00
Karl Fogel
0c4371fe36 * lisp/bookmark.el (bookmark-show-annotation): Use when' instead of if'.
This is also from Thierry Volpiatto's patch in bug #6444.  However,
  because it was extraneous to the functional change in that patch,
  and causes a re-indendation, I am committing it separately.
2010-07-13 18:17:51 -04:00
Karl Fogel
068a0233c7 [[[
* lisp/bookmark.el (bookmark-bmenu-switch-other-window,
  bookmark-bmenu-other-window, bookmark-bmenu-2-window): Don't override
  ambient binding of `bookmark-automatically-show-annotations'.  (Bug #6515)
]]]

=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el	2010-04-14 15:07:53 +0000
+++ lisp/bookmark.el	2010-06-27 03:40:14 +0000
@@ -1860,8 +1860,7 @@
         (pop-up-windows t))
     (delete-other-windows)
     (switch-to-buffer (other-buffer))
-    (let ((bookmark-automatically-show-annotations nil)) ;FIXME: needed?
-      (bookmark--jump-via bmrk 'pop-to-buffer))
+    (bookmark--jump-via bmrk 'pop-to-buffer)
     (bury-buffer menu)))
 
 
@@ -1875,8 +1874,7 @@
   "Select this line's bookmark in other window, leaving bookmark menu visible."
   (interactive)
   (let ((bookmark (bookmark-bmenu-bookmark)))
-    (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
-      (bookmark--jump-via bookmark 'switch-to-buffer-other-window))))
+    (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))
 
 
 (defun bookmark-bmenu-switch-other-window ()
@@ -1887,8 +1885,7 @@
         (pop-up-windows t)
         same-window-buffer-names
         same-window-regexps)
-    (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
-      (bookmark--jump-via bookmark 'display-buffer))))
+    (bookmark--jump-via bookmark 'display-buffer)))
 
 (defun bookmark-bmenu-other-window-with-mouse (event)
   "Select bookmark at the mouse pointer in other window, leaving bookmark menu visible."

=== modified file 'lisp/saveplace.el'
--- lisp/saveplace.el	2010-01-13 08:35:10 +0000
+++ lisp/saveplace.el	2010-02-07 23:14:52 +0000
@@ -213,7 +213,7 @@
                       (symbol-name coding-system-for-write)))
       (let ((print-length nil)
             (print-level nil))
-        (print save-place-alist (current-buffer)))
+        (pp save-place-alist (current-buffer)))
       (let ((version-control
              (cond
               ((null save-place-version-control) nil)
2010-07-13 18:09:20 -04:00
Aleksei Gusev
c5622b6fd2 Add regexp tests for cucumber and ruby. 2010-07-13 17:33:02 -04:00
Chong Yidong
21bd02a62d * lisp/frame.el (make-frame): Fix typo in 2010-06-30 change (Bug#6625). 2010-07-13 13:02:27 -04:00
Eli Zaretskii
d5e7f8d025 Fix the MS-DOS build; remove more "#ifdef subprocesses".
process.c <inhibit_sentinels>: Move to the common part.
 (Fwaiting_for_user_input_p): Move to the common part; return nil
 if async subprocesses aren't supported.
 sysdep.c (wait_for_termination) [!MSDOS]: Don't compile on
 MS-DOS.  Remove "#ifdef subprocesses".
 (sys_subshell, sys_select): Remove "#ifdef subprocesses".
 (gettimeofday): Remove "#ifdef subprocesses".
 (wait_without_blocking): Remove function.
 (flush_pending_output, child_setup_tty): Don't compile on MS-DOS.
 Remove "#ifdef subprocesses".
 (child_setup_tty): Use WINDOWSNT instead of DOS_NT, since not
 compiled on MS-DOS.
 callproc.c (Fcall_process) [!MSDOS]: Don't call
 wait_for_termination on MS-DOS.
 emacs.c (shut_down_emacs): Remove "#ifndef subprocesses" from
 initialization of inhibit_sentinels.
 keyboard.c (record_asynch_buffer_change): Remove "#ifdef
 subprocesses" conditional.
 callproc.c (Fcall_process) [!subprocesses]: Don't call
 wait_for_termination, since `buffer' cannot be an integer when
 async subprocesses are not supported
 xdisp.c (decode_mode_spec): Use `MSDOS' instead of `subprocesses'
 for ifdefing away the call to Fprocess_status.
 process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef
 away the entire body of the function.
2010-07-13 14:03:42 +03:00
Eli Zaretskii
77defa9a25 Remove more "#ifdef subprocesses".
process.c <inhibit_sentinels>: Move to the common part.
 (Fwaiting_for_user_input_p): Move to the common part; return nil
 if async subprocesses aren't supported.
 sysdep.c (wait_for_termination) [!MSDOS]: Don't compile on
 MS-DOS.  Remove "#ifdef subprocesses".
 (sys_subshell, sys_select): Remove "#ifdef subprocesses".
 (gettimeofday): Remove "#ifdef subprocesses".
 (wait_without_blocking): Remove function.
 (flush_pending_output, child_setup_tty): Don't compile on MS-DOS.
 Remove "#ifdef subprocesses".
 (child_setup_tty): Use WINDOWSNT instead of DOS_NT, since not
 compiled on MS-DOS.
 callproc.c (Fcall_process) [!MSDOS]: Don't call
 wait_for_termination on MS-DOS.
 emacs.c (shut_down_emacs): Remove "#ifndef subprocesses" from
 initialization of inhibit_sentinels.
 keyboard.c (record_asynch_buffer_change): Remove "#ifdef
 subprocesses" conditional.
 callproc.c (Fcall_process) [!subprocesses]: Don't call
 wait_for_termination, since `buffer' cannot be an integer when
 async subprocesses are not supported
 xdisp.c (decode_mode_spec): Use `MSDOS' instead of `subprocesses'
 for ifdefing away the call to Fprocess_status.
2010-07-13 13:57:00 +03:00
Adrian Robert
79cb9c05a1 term/ns-win.el: Bind M-~ to 'ns-prev-frame (due to Matthew Dempsky; bug#5084). Remove incorrect binding for S-tab. (ns-alternatives-map): Change S-tab binding to backtab (bug#6616). * simple.el (normal-erase-is-backspace-setup-frame): Set mode on under ns. 2010-07-13 13:41:49 +03:00
Eli Zaretskii
2047750525 Fix the MS-DOS build (fallout from 2010-07-13T04:54:28Z!dann@ics.uci.edu).
process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef
 away the entire body of the function.
2010-07-13 13:03:22 +03:00
Dan Nicolaescu
01faa93498 Remove subprocesses #ifdefs from term.c.
* src/process.c (add_keyboard_wait_descriptor)
(delete_keyboard_wait_descriptor): Move to common section, do
nothing when subprocesses is not defined.
* src/term.c (Fsuspend_tty, Fresume_tty, init_tty): Remove subprocesses #ifdefs.
2010-07-12 21:54:28 -07:00
Dan Nicolaescu
b3ffc17c5d Convert maybe_fatal to standard C.
* src/lisp.h (verror): Declare.
* src/eval.c (verror): New function containing the code from ...
(error): ... this.  Call verror.
* src/term.c (vfatal): New function containing the code from ...
(fatal): ... this.  Call vfatal.
(maybe_fatal): Convert to standard C, use variable number of
arguments.  Declare as non-return.
(init_tty): Fix maybe_fatal call.
2010-07-12 21:47:45 -07:00
Dan Nicolaescu
0521f5806b Convert function definitions to standard C.
* src/xterm.c (x_scroll_bar_set_handle, x_scroll_bar_expose)
(_scroll_bar_note_movement): Convert definitions to standard C.
* src/xmenu.c (menu_help_callback, pop_down_menu, xmenu_show):
* src/xfns.c (hack_wm_protocols, x_window, x_window): Likewise.
2010-07-12 12:56:46 -07:00
Dan Nicolaescu
ababf90003 * oldXMenu/XMenu.h: Include <stdlib.h>. 2010-07-12 12:49:40 -07:00
Dan Nicolaescu
ebd156110c Convert function definitions to standard C.
* src/xterm.c (x_frame_of_widget, x_alloc_nearest_color_for_widget)
(x_alloc_lighter_color_for_widget, cvt_string_to_pixel)
(cvt_pixel_dtor, x_window_to_menu_bar, xt_action_hook)
(xaw_jump_callback, xaw_scroll_callback)
(x_create_toolkit_scroll_bar, x_set_toolkit_scroll_bar_thumb)
(x_wm_set_size_hint, x_activate_timeout_atimer): Convert
definitions to standard C.
* src/xmenu.c (menubar_id_to_frame, popup_get_selection)
(popup_activate_callback, popup_deactivate_callback)
(menu_highlight_callback, menubar_selection_callback)
(apply_systemfont_to_dialog, apply_systemfont_to_menu)
(free_frame_menubar, popup_selection_callback, as)
(create_and_show_popup_menu, dialog_selection_callback)
(create_and_show_dialog):
* src/xfns.c (hack_wm_protocols, x_window):
* src/xfaces.c (x_update_menu_appearance):
* src/widget.c (get_default_char_pixel_size, pixel_to_char_size)
(char_to_pixel_size, round_size_to_char, get_wm_shell)
(set_frame_size, update_wm_hints, setup_frame_gcs)
(update_various_frame_slots, update_from_various_frame_slots)
(EmacsFrameInitialize, EmacsFrameRealize, EmacsFrameResize)
(EmacsFrameSetValues, EmacsFrameQueryGeometry)
(EmacsFrameSetCharSize, widget_store_internal_border): Likewise.
2010-07-12 12:29:49 -07:00
Andreas Schwab
de06a2dd4d * dbusbind.c (xd_initialize): Don't compare boolean with a constant. 2010-07-12 21:03:53 +02:00
Eli Zaretskii
1408902e03 (wait_reading_process_output) [!subprocesses]: Convert arg list to ANSI C. 2010-07-12 21:44:35 +03:00
Eli Zaretskii
10a4499802 Fix the MS-DOS build (fallout from 2010-07-12T14:16:38Z!schwab@linux-m68k.org, 2010-07-12T17:04:38Z!dann@ics.uci.edu, 2010-07-12T17:21:11Z!dann@ics.uci.edu).
src/process.c (setup_process_coding_systems): Move to the part
 shared by non-subprocesses systems, and make its body empty when
 subprocesses is not defined.
 (close_process_descs): Move to the part shared by non-subprocesses
 systems.
 msdos/sed1v2.inp (C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
 Edit to empty.
 msdos/sed3v2.inp(C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
 Edit to empty.
2010-07-12 21:36:48 +03:00
Eli Zaretskii
fc549af9e0 Fix the MS-DOS build (fallout from 2010-07-12T14:16:38Z!schwab@linux-m68k.org, 2010-07-12T17:04:38Z!dann@ics.uci.edu, 2010-07-12T17:21:11Z!dann@ics.uci.edu).
msdos/sed1v2.inp (C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
 Edit to empty.
 msdos/sed3v2.inp(C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
 Edit to empty.
 src/process.c (setup_process_coding_systems): Move to the part
 shared by non-subprocesses systems, and make its body empty when
 subprocesses is not defined.
 (close_process_descs): Move to the part shared by non-subprocesses
 systems.
2010-07-12 21:23:00 +03:00
Dan Nicolaescu
5dddb7a8b1 * nt/config.nt (volatile): Remove definition. 2010-07-12 11:16:54 -07:00
Andreas Schwab
e9952282f8 * language/tai-viet.el ("TaiViet"): Try to fix re-encoding bugs. (Bug#5806) 2010-07-12 20:10:49 +02:00
Andreas Schwab
beb000f9bc * language/tv-util.el (tai-viet-re): Remove format. 2010-07-12 19:55:35 +02:00
Andreas Schwab
d5a3eaaf13 Convert old-style definitions
* editfns.c (transpose_markers): Convert old-style definition.
* emacs.c (abort, shut_down_emacs, fixup_locale)
(synchronize_system_time_locale)
(synchronize_system_messages_locale, syms_of_emacs): Likewise.
* floatfns.c (extract_float, matherr, init_floatfns)
(syms_of_floatfns): Likewise.
* fns.c (make_hash_table): Likewise.
* ftfont.c (ftfont_get_otf, ftfont_otf_features)
(ftfont_otf_capability, ftfont_get_glyph_id, ftfont_get_metrics)
(ftfont_drive_otf, ftfont_shape_by_flt, ftfont_shape)
(ftfont_variation_glyphs): Likewise.
* gtkutil.c (xg_create_widget, xg_modify_menubar_widgets): Likewise.
* keymap.c (describe_map_tree, describe_map, describe_vector): Likewise.
* lread.c (read_filtered_event): Likewise.
* minibuf.c (read_minibuf_noninteractive, read_minibuf): Likewise.
* process.c (wait_reading_process_output): Likewise.
* scroll.c (do_line_insertion_deletion_costs): Likewise.
* search.c (search_buffer, boyer_moore): Likewise.
* syntax.c (scan_sexps_forward): Likewise.
* xdisp.c (try_scrolling): Likewise.
* xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Likewise.
* xfns.c (x_default_scroll_bar_color_parameter): Likewise.
* xselect.c (x_get_window_property, receive_incremental_selection)
(x_get_window_property_as_lisp_data, lisp_data_to_selection_data):
Likewise.
* xterm.c (x_draw_relief_rect, x_draw_box_rect): Likewise.
2010-07-12 19:47:17 +02:00
Dan Nicolaescu
ded80a25b7 Cleanups for src/callproc.c.
* src/callproc.c (child_setup): Remove subprocesses conditional.
Remove code dealing with SET_EMACS_PRIORITY, unused.
2010-07-12 10:21:11 -07:00