]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorMartin Rudalics <rudalics@gmx.at>
Sat, 31 Jul 2010 15:45:44 +0000 (17:45 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Sat, 31 Jul 2010 15:45:44 +0000 (17:45 +0200)
1  2 
doc/lispref/ChangeLog
doc/lispref/frames.texi
lisp/ChangeLog
src/ChangeLog
src/buffer.c
src/frame.c
src/window.c
src/xfns.c

index 0fd84492f07d7c2443097d5f10d5e8b290fa5c63,f5c66806764d0c1328e10795020e2a2b2fe30195..4b0305e393b2a2079d7803ac7228623ab7b87208
@@@ -1,9 -1,11 +1,18 @@@
 +2010-07-31  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * windows.texi (Buffers and Windows): Describe lists of previous
 +      and next buffers for windows.  Describe new commands
 +      switch-to-prev-buffer and switch-to-next-buffer and their impact
 +      on replace-buffer-in-windows.
++
+ 2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
+       * frames.texi (Layout Parameters): Add doc for tool-bar-position.
+ 2010-07-29  Michael Albinus  <michael.albinus@gmx.de>
+       * processes.texi (Process Information): Explain process property
+       `remote-tty'.
  
  2010-07-27  Juanma Barranquero  <lekktu@gmail.com>
  
Simple merge
diff --cc lisp/ChangeLog
index 290b2dc052292e4697ae73a93a7405110c6ed25b,f0332db2c9ff4ef627f85fa28005a1cf90e2ada1..d6f449203adc76c4aa244c3b66da37fc855be328
@@@ -1,40 -1,36 +1,73 @@@
 +2010-07-30  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * help.el (temp-buffer-max-height, temp-buffer-resize-mode)
 +      (resize-temp-buffer-window): Move back from window.el to avoid
 +      calling define-minor-mode in window.el and choke in bootstrap.
 +
 +2010-07-29  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * loadup.el (top-level): Load window before files for the sake
 +      of replace-buffer-in-windows.
 +
 +      * simple.el (get-next-valid-buffer, last-buffer, next-buffer)
 +      (previous-buffer): Move to window.el.
 +
 +      * bindings.el (unbury-buffer): Move to window.el.
 +
 +      * window.el (display-buffer): Move group definition to front of
 +      display buffer section.
 +      (record-window-buffer, unrecord-window-buffer)
 +      (set-window-buffer-start-and-point, switch-to-prev-buffer)
 +      (switch-to-next-buffer): New functions.
 +      (get-next-valid-buffer, last-buffer): Move here from simple.el.
 +      (next-buffer): Move here from simple.el.  Call
 +      switch-to-next-buffer.
 +      (previous-buffer): Move here from simple.el.  Call
 +      switch-to-prev-buffer.
 +      (bury-buffer, quit-restore-window): Switch to previous buffer
 +      when window cannot be deleted.
 +      (unbury-buffer): Move here from bindings.el.
 +      (delete-windows-on): Switch to previous buffer if window cannot
 +      be deleted.  Unrecord buffer argument in all live windows.
 +      (replace-buffer-in-windows): Move here from window.c.  Switch to
 +      previous buffer if window cannot be deleted.  Unrecord argument
 +      buffer in all live windows.
 +      (switch-to-buffer): In doc-string warning suggest using
 +      with-current-buffer instead of set-buffer.
 +
+ 2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
+       * menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
+       (menu-bar-showhide-tool-bar-menu-customize-disable)
+       (menu-bar-showhide-tool-bar-menu-customize-enable-right)
+       (menu-bar-showhide-tool-bar-menu-customize-enable-top)
+       (menu-bar-showhide-tool-bar-menu-customize-enable-bottom): New functions
+       (menu-bar-showhide-tool-bar-menu): If tool bar is moveable,
+       make a menu for Options => toolbar that can move it.
+ 2010-07-29  Chong Yidong  <cyd@stupidchicken.com>
+       * emacs-lisp/package-x.el (package--make-rss-entry):
+       (package-maint-add-news-item, package--update-news)
+       (package-upload-buffer-internal): New arg ARCHIVE-URL.
+       * emacs-lisp/package.el (package-archive-url): Rename from
+       package-archive-id.
+       (package-install): Doc fix.
+       (package-download-single, package-download-tar, package-install)
+       (package-menu-view-commentary): Callers changed.
+ 2010-07-29  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp.el (tramp-handle-start-file-process): Check only for
+       `remote-tty' process property.
+       (tramp-open-shell): Don't check for tty.
+       (tramp-open-connection-setup-interactive-shell): Set `remote-tty'
+       process property.
+       * progmodes/gdb-mi.el (gdb-init-1): Check also for tty on a remote
+       host.
  2010-07-28  Chong Yidong  <cyd@stupidchicken.com>
  
        * emacs-lisp/package.el (package-load-list, package-archives)
diff --cc src/ChangeLog
index eb4b1826e8f5ca8d19969432d172f8ebe99500e3,e2832c49bdeff6fe65727eae47c82b9f5e3cf09e..6ef541cb1a6439898f85ac28e4e2d06cee582a52
+ 2010-07-30  Dan Nicolaescu  <dann@ics.uci.edu>
+       * buffer.c (Qwindow): Do not define, already defined in data.c.
+       (syms_of_buffer): Do not intern and staticpro Qwindow.  (Bug#6760)
 +2010-07-29  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * buffer.c (Fbuffer_list): Rewrite doc-string, reformat.
 +      (Fother_buffer): Rewrite doc-string, restructure.
 +      (Fkill_buffer): Call replace_buffer_in_windows and
 +      replace_buffer_in_windows_safely.
 +      (record_buffer): Inhibit quitting and rewrite using quittable
 +      functions.
 +      (Funrecord_buffer): Inhibit quitting around buffer list
 +      manipulations.
 +
 +      * window.h (struct window): Add new members prev_buffers and
 +      next_buffers.
 +      (replace_buffer_in_all_windows): Remove extern.
 +      (replace_buffer_in_windows_safely): Add extern.
 +
 +      * window.c (Fwindow_prev_buffers, Fset_window_prev_buffers)
 +      (Fwindow_next_buffers, Fset_window_next_buffers): New functions.
 +      (windw_loop): Replace UNSHOW_BUFFER by
 +      REPLACE_BUFFER_IN_WINDOWS_SAFELY.
 +      (window_show_other_buffer): Remove.
 +      (window_loop): Replace UNSHOW_BUFFER case by
 +      REPLACE_BUFFER_IN_WINDOWS_SAFELY - the real work is done in
 +      replace-buffer-in-windows which is in window.el.
 +      (Freplace_buffer_in_windows): Move to window.el.
 +      (replace_buffer_in_all_windows): Remove.
 +      (replace_buffer_in_windows, replace_buffer_in_windows_safely):
 +      New functions.
 +      (Fset_window_buffer): Restructure and call
 +      Qrecord_window_buffer.
 +      (make_window): Initialize missing and new Lisp slots.
 +      (syms_of_window): Add Qreplace_buffer_in_windows and
 +      Qrecord_window_buffer.
 +
+ 2010-07-29  Chad Brown  <yandros@mit.edu>
+       Replace tests for SYSV_SYSTEM_DIR with HAVE_DIRENT_H, set via autoconf.
+       * dired.c, sysdep.c: Test HAVE_DIRENT_H instead of SYSV_SYSTEM_DIR.
+       * config.in: Undef HAVE_DIRENT_H.
+       * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/gnu-linux.h,
+       * s/msdos.h, s/usg5-4.h: Don't define SYSV_SYSTEM_DIR.
+ 2010-07-29  Dan Nicolaescu  <dann@ics.uci.edu>
+       Rename s/usg5-4.h -> s/usg5-4-common.h.
+       * s/usg5-4.h: Rename file to ...
+       * s/usg5-4-common.h: ... this for consistency with what we do for BSD.
+       * s/unixware.h:
+       * s/sol2-6.h:
+       * s/irix6-5.h: Update includes accordingly.
+ 2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
+       * xfns.c (x_set_tool_bar_position): Remove debug fprintf.
+       * xterm.h (struct x_output): Add toolbar_top_height,
+       toolbar_bottom_height, toolbar_left_width, toolbar_right_width.  Remove
+       toolbar_height.
+       if USE_GTK: Add hbox_widget and toolbar_in_hbox.
+       (FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT)
+       (FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros.
+       (FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
+       * xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
+       * xfns.c (x_set_tool_bar_position): New function.
+       (xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT.
+       (x_frame_parm_handlers): Add x_set_tool_bar_position.
+       (syms_of_xfns): if USE_GTK, provide move-toolbar.
+       * window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT
+       and FRAME_TOOLBAR_LEFT_WIDTH.
+       * gtkutil.h (xg_change_toolbar_position): Declare.
+       * gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro.
+       (xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
+       (xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH.
+       (xg_create_frame_widgets): Create a hobox for placing widgets
+       vertically.  Use gtk_box_pack_start.
+       (xg_height_or_width_changed): Renamed from xg_height_changed.
+       (x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width.
+       (xg_update_frame_menubar, free_frame_menubar): Change to
+       xg_height_or_width_changed.
+       (xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar
+       size correctly.  Remove hardcoded 4, instead use handlebox size -
+       toolbar size.
+       (xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar
+       size correctly.  Use handlebox size + toolbar size as additional
+       size.
+       (xg_pack_tool_bar): POS is a new parameter.
+       Set orientation of tool bar based on pos.
+       Only make handlebox_widget if NULL.
+       Check if tool bar goes to vbox or hbox depending on pos.
+       (xg_update_tool_bar_sizes): New function.
+       (update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar
+       height, call xg_update_tool_bar_sizes instead.
+       (free_frame_tool_bar): Remove from hbox or vbox depending on
+       toolbar_in_hbox,  Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
+       (xg_change_toolbar_position): New function.
+       * frame.h (struct frame): Add tool_bar_position.
+       (Qbottom): Declare.
+       * frame.c (Qtool_bar_position): New variable.
+       (make_frame): Set tool_bar_position to Qtop.
+       (frame_parms): Add tool-bar-position.
+       (x_report_frame_params): Store tool_bar_position.
+       (x_set_fringe_width): Reset wm size hint after fringe changes.
+ 2010-07-29  Dan Nicolaescu  <dann@ics.uci.edu>
+       Make lisp_time_argument declaration work on all systems.
+       * lisp.h (lisp_time_argument): Move declaration ...
+       * systime.h (lisp_time_argument): ... here
+       * editfns.c (lisp_time_argument): Remove declaration.  (Bug#6751)
  2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
  
        * vm-limit.c (POINTER): Add typedef for it.
diff --cc src/buffer.c
Simple merge
diff --cc src/frame.c
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xfns.c
Simple merge