]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk
authorMartin Rudalics <rudalics@gmx.at>
Mon, 15 Nov 2010 10:46:04 +0000 (11:46 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Mon, 15 Nov 2010 10:46:04 +0000 (11:46 +0100)
1  2 
doc/lispref/ChangeLog
doc/lispref/display.texi
lisp/ChangeLog
lisp/frame.el
lisp/gnus/ChangeLog
lisp/shell.el
lisp/simple.el
src/ChangeLog
src/w32fns.c
src/xdisp.c
src/xfns.c

index 16d45c34a22cf23ac98c564ad122f914e8ed37af,d6853e0066d60832a5e119b9f0bc2f84088c970b..8a5a0e15cfdacacfd170115e9b49832a217101ac
@@@ -1,21 -1,8 +1,26 @@@
+ 2010-11-13  Eli Zaretskii  <eliz@gnu.org>
+       * display.texi (Usual Display): Characters with no fonts are not
+       necessarily displayed as empty boxes.
 +2010-11-10  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * display.texi (Temporary Displays): Describe
 +      temp-buffer-show-specifiers.
 +
 +2010-11-04  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * windows.texi (Resizing Windows): Explain OVERRIDE argumet for
 +      fit-window-to-buffer.
 +      (Displaying Buffers): Describe even-window-sizes, adjust-height
 +      and adjust-width buffer display specifiers.
 +
 +2010-11-02  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * windows.texi (Displaying Buffers): Describe special handling
 +      of `not-this-window' and `not-this-frame' specifiers for
 +      `display-buffer'.
 +
  2010-10-31  Glenn Morris  <rgm@gnu.org>
  
        * maps.texi (Standard Keymaps): Update File menu description.
Simple merge
diff --cc lisp/ChangeLog
index 1920cdea49fb276f5351d0cf5e490738a4c4b9cb,99eca11ee4c3a8691326f313f3fa317fb8b4a3f3..0ce03b5988e644736e51a3a9ee425b50ec5c4918
 +2010-11-15  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-split-window-1): Remove max-size
 +      argument and corresponding code.
 +      (display-buffer-split-window): Remove handling of max-height and
 +      max-width specifiers.  Restore the pre Emacs 24 behavior where a
 +      single-window frame could be split ignoring the min-height
 +      specifier (then split-height-threshold value).  For the
 +      horizontal splitting, side equalling nil case call
 +      display-buffer-split-window-1 with side argument set to 'right
 +      instead of 'below, fixing a bug spotted by Štěpán Němec.
 +
+ 2010-11-14  Chong Yidong  <cyd@stupidchicken.com>
+       * startup.el (command-line): If the cursorColor resource is set,
+       change the cursor face-spec (Bug#7392).
+ 2010-11-13  Ken Manheimer  <ken.manheimer@gmail.com>
+       The main features of the following allout.el changes are:
+       - implement user customization for the allout key bindings
+       - add a customization control by which the user can inhibit use of
+         a trailing Ctrl-H, so by default it's reserved for use with
+         describe-prefix-bindings
+       - adapt to new version of called-interactively-p, while
+         maintaining backwards compatibility with old version
+       - fix hotspot navigation so i works properly with meta-modified keys
+       * allout.el (allout-keybindings, allout-bind-keys)
+       (allout-keybindings-binding, allout-prefixed-keybindings)
+       (allout-unprefixed-keybindings, allout-preempt-trailing-ctrl-h)
+       (allout-keybindings-list, allout-mode-map-adjustments)
+       (allout-setup-mode-map): Establish allout-mode keymaps as user
+       customizable settings, and also establish a customizable setting which
+       regulates whether or not a trailing control-h is reserved for use with
+       describe-prefix-bindings - and inhibit it by default, so that control-h
+       *is* reserved for describe-prefix-bindings unless the user changes it.
+       * allout.el (allout-hotspot-key-handler): Distinguish more explicitly
+       and accurately between modified and unmodified events, and handle
+       modified events more comprehensively.
+       * allout.el (allout-substring-no-properties):
+       Alias to use or provide version of `substring-no-properties'.
+       (allout-solicit-alternate-bullet): Use `allout-substring-no-properties'.
+       * allout.el (allout-next-single-char-property-change):
+       Alias to use or provide version of `next-single-char-property-change'.
+       (allout-annotate-hidden, allout-hide-by-annotation):
+       Use `allout-next-single-char-property-change'.
+       * allout.el (allout-select-safe-coding-system):
+       Alias to use or provide version of `select-safe-coding-system'.
+       (allout-toggle-subtree-encryption):
+       Use `allout-select-safe-coding-system'.
+       * allout.el (allout-set-buffer-multibyte):
+       Alias to use or provide version of `set-buffer-multibyte'.
+       (allout-encrypt-string): Use `allout-set-buffer-multibyte'.
+       * allout.el (allout-called-interactively-p): Macro for using the
+       different versions of called-interactively-p identically, depending on
+       the subroutine's argument signature.
+       (allout-back-to-current-heading, allout-beginning-of-current-entry):
+       Use `(interactive "p")' instead of `(called-interactively-p)'.
+       * allout.el (allout-init, allout-ascend, allout-end-of-level)
+       (allout-previous-visible-heading, allout-forward-current-level)
+       (allout-backward-current-level, allout-show-children):
+       Use `allout-called-interactively-p' instead of `called-interactively-p'.
+       * allout.el (allout-before-change-handler):
+       Exempt edits to the (overlaid) character after the allout outline
+       bullet from edit confirmation prompt.
+       * allout.el (allout-add-resumptions):
+       Ensure that it respects correct buffer for keybindings.
+       * allout.el (allout-beginning-of-line):
+       Use `allout-previous-single-char-property-change' alias for the sake of
+       diverse compatibility.
+       * allout.el (allout-end-of-line):
+       Use `allout-mark-active-p' to encapsulate respect for mark activity.
+ 2010-11-13  Chong Yidong  <cyd@stupidchicken.com>
+       * frame.el (frame-notice-user-settings): Don't clobber other
+       user-set parameters when calling face-set-after-frame-default in
+       response to background-color parameter (Bug#7373).
+ 2010-11-13  Eli Zaretskii  <eliz@gnu.org>
+       * international/characters.el (glyphless-char-display-control):
+       Renamed from glyphless-char-control; all users changed.  Doc fix.
+       Signal an error if display method is not one of the recognized
+       symbols.
+ 2010-11-13  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp-compat.el (tramp-compat-line-beginning-position)
+       (tramp-compat-line-end-position): Remove them.
+       * net/tramp.el (tramp-parse-rhosts-group)
+       (tramp-parse-shosts-group, tramp-parse-sconfig-group)
+       (tramp-parse-hosts-group, tramp-parse-passwd-group)
+       (tramp-parse-netrc-group, tramp-parse-putty-group)
+       * net/tramp-cmds.el (tramp-append-tramp-buffers)
+       * net/tramp-sh.el (tramp-do-file-attributes-with-ls)
+       (tramp-sh-handle-file-selinux-context)
+       (tramp-sh-handle-file-name-all-completions)
+       (tramp-sh-handle-insert-directory)
+       (tramp-sh-handle-expand-file-name, tramp-find-executable)
+       (tramp-wait-for-output, tramp-send-command-and-read)
+       * net/tramp-smb.el (tramp-smb-read-file-entry)
+       (tramp-smb-get-cifs-capabilities): Use `point-at-eol'.
+       * net/tramp-sh.el (tramp-sh-handle-insert-directory) Use
+       `point-at-bol'.
+       (tramp-remote-coding-commands): Add an alternative using "base64
+       -d -i".  This is needed for older base64 versions from GNU
+       coreutils.  Reported by Klaus Reichl
+       <Klaus.Reichl@thalesgroup.com>.
+ 2010-11-13  Hrvoje Niksic  <hniksic@xemacs.org>
+       * simple.el (count-words-region): New function.
 +2010-11-12  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer): Write check for dedicatedness
 +      correctly in the same-window section.
 +      (get-mru-window): Fix doc-string typo.
 +
+ 2010-11-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * shell.el (shell-dir-cookie-re): New custom variable.
+       (shell-dir-cookie-watcher): New function.
+       * vc/vc.el (vc-deduce-backend): Use default-directory in shell-mode
+       and compilation-mode (bug#7350).
+       * vc/smerge-mode.el (smerge-refine): Choose better default part to
+       highlight when one of them is empty.
+       * skeleton.el (skeleton-read): Don't use `newline' since it may strip
+       trailing space.
+       (skeleton-newline): New function.
+       (skeleton-internal-1): Use it.
+       * simple.el (open-line): `newline' may strip trailing space.
+ 2010-11-12  Kevin Ryde  <user42@zip.com.au>
+       * international/mule-cmds.el (princ-list): Use mapc.
  2010-11-12  Glenn Morris  <rgm@gnu.org>
  
        * emacs-lisp/bytecomp.el (byte-compile-log-buffer): New constant.
diff --cc lisp/frame.el
Simple merge
Simple merge
diff --cc lisp/shell.el
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc src/ChangeLog
index 987459fb1957b5c80356790405aee94dad720a4d,912e9ae27cdd5d221505f0086c47d5adcf8aad69..9c0a189e1ebe64243bdf88b483fb33f43816ec4d
+ 2010-11-15  Dan Nicolaescu  <dann@ics.uci.edu>
+       * process.c: Include <sys/ioctl.h> unconditionally,
+       keyboard.c already does it.
+       * keyboard.c (pending_malloc_warning): Add const to match
+       definition in alloc.c.
+       (Fset_input_interrupt_mode): Simplify #ifdefs.
+ 2010-11-15  Dan Nicolaescu  <dann@ics.uci.edu>
+       Clean up systty.h macros.
+       * systty.h (EMACS_GET_TTY_PGRP, EMACS_SET_TTY_PGRP, EMACS_GET_TTY)
+       (EMACS_SET_TTY): Remove unneeded abstraction, instead inline the
+       definition in all uses.
+       (EMACS_TTY_TABS_OK): Remove, it has a single user.
+       * sysdep.c (discard_tty_input, child_setup_tty)
+       (init_sys_modes, tabs_safe_p, reset_sys_modes):
+       * emacs.c (shut_down_emacs):
+       * callproc.c (child_setup):
+       * term.c (dissociate_if_controlling_tty): Inline removed macros.
+       * data.c (sign_extend_temp, sign_extend_lisp_int): Remove, unused.
+ 2010-11-14  Chong Yidong  <cyd@stupidchicken.com>
+       * w32fns.c (Fx_create_frame):
+       * nsfns.m (Fx_create_frame): Don't check for the cursorColor
+       resource here; it's now done at startup.
+ 2010-11-14  Jan Djärv  <jan.h.d@swipnet.se>
+       * xterm.c (set_wm_state): Add Qnil to final cons.
+       * xselect.c (x_send_client_event): Remove unused variables cons and
+       size.
+ 2010-11-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+       * keyboard.c (modify_event_symbol) : Add const to array elements of
+       arg NAME_TABLE.
+       (lispy_accent_keys, lispy_function_keys, lispy_multimedia_keys)
+       (lispy_kana_keys, iso_lispy_function_keys, lispy_wheel_names)
+       (lispy_wheel_names, lispy_drag_n_drop_names, modifier_names):
+       Add const to array elements.
+       (scroll_bar_parts): Make static.  Fix position of const.
+       * w32fns.c (lispy_function_keys): Add const to extern.
+       * w32inevt.c (lispy_function_keys): Likewise.
+ 2010-11-14  Chong Yidong  <cyd@stupidchicken.com>
+       * xfns.c (Fx_create_frame): Don't check for the cursorColor
+       resource here; it's now done at startup.
+ 2010-11-13  Dan Nicolaescu  <dann@ics.uci.edu>
+       * xmenu.c: Make it clear that ../lwlib/lwlib.h is only needed for Motif.
+       Fix compilation on Solaris.
+       * sysdep.c: Do not #include <term.h>.
+       (tputs): Add declaration, similar to what cm.c does.  (Bug#7178)
+       * s/ms-w32.h (HAVE_TERMIOS_H): Do not undef, not used anymore.
+ 2010-11-13  Jan Djärv  <jan.h.d@swipnet.se>
+       * xterm.c (set_wm_state): Don't put Atom in cons, call
+       make_fixnum_or_float on them first.
+       (x_term_init): Initialize Xatom_net_supporting_wm_check and
+       Xatom_net_supported correctly.
+       * xselect.c (x_send_client_event): Move CHECK_STRING ...
+       (Fx_send_client_event): to here.
+ 2010-11-13  Martin Rudalics  <rudalics@gmx.at>
+       * window.c (Fwindow_use_time): New function.
+ 2010-11-13  Eli Zaretskii  <eliz@gnu.org>
+       * xdisp.c (set_cursor_from_row): Fix cursor positioning on
+       zero-width characters.
+       * .gdbinit (pgx): Adapt to latest changes in `struct glyph'.
+       * w32term.c (x_draw_glyphless_glyph_string_foreground): Draw the
+       box before drawing the glyphs inside it.
+       * xdisp.c (syms_of_xdisp) <glyphless-char-display>: Doc fix.
+       * dispextern.h (enum glyphless_display_method): Rename
+       GLYPHLESS_DISPLAY_HEXA_CODE to GLYPHLESS_DISPLAY_HEX_CODE.  All
+       users changed.
+       * term.c (append_glyphless_glyph, produce_glyphless_glyph): Fix
+       comments.
+       (produce_glyphless_glyph): Enclose "U+nnnn" and "empty box"
+       whitespace in "[]", to simulate a box.  Don't use uninitialized
+       variable `width'.
 +2010-11-11  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.c (syms_of_window): Add Qsafe and intern it.
 +      (resize_frame_windows): Check whether the actual new size of the
 +      root window matches the requested size.  Also try one more round
 +      with safe minimum sizes.  Simplify code.
 +
+ 2010-11-11  Julien Danjou  <julien@danjou.info>
+       * xsettings.c (init_xsettings): Use already fetch atoms.
+       * xsmfns.c (create_client_leader_window): Use SM_CLIENT_ID atom
+       from dpyinfo.
+       * xselect.c (Fx_send_client_event): Split and create
+       x_send_client_event.
+       * lisp.h: Do not EXFUN Fx_send_client_event.
+       * xterm.c (x_set_frame_alpha): Use _NET_WM_WINDOW_OPACITY atom
+       from dpyinfo.
+       (wm_supports): Use atoms from dpyinfo.
+       (do_ewmh_fullscreen): Use atoms from dpyinfo.
+       (x_ewmh_activate_frame): Use atoms from dpyinfo.
+       (xembed_set_info): Use atoms from dpyinfo.
+       (x_term_init): Fetch _XEMBED_INFO, _NET_SUPPORTED,
+       _NET_SUPPORTING_WM_CHECK, _NET_WM_WINDOW_OPACITY and
+       _NET_ACTIVE_WINDOW, XSETTINGS  atoms.
+       Get all atoms in one round-trip.
+       (set_wm_state): Use x_send_client_event rather than
+       Fx_send_client_event, using Atom directly.
+       (x_ewmh_activate_frame): Ditto.
+       (x_set_sticky): Pass atoms to set_wm_state.
+       (do_ewmh_fullscreen): Ditto.
+       * xterm.h (x_display_info): Add Xatom_net_supported,
+       Xatom_net_supporting_wm_check, Xatom_net_active_window,
+       Xatom_net_wm_window_opacity, Xatom_XEMBED_INFO, SM_CLIENT_ID.
+       * xfns.c (Fx_show_tip): Fix typo in docstring.
  2010-11-11  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * cmds.c (Fself_insert_command): Don't call XFASTINT without checking
diff --cc src/w32fns.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfns.c
Simple merge