Merge from emacs-23; up to 2010-06-22T07:41:10Z!rgm@gnu.org

Fix some portability problems with 'inline'.

* dispextern.h (window_box, window_box_height, window_text_bottom_y)
(window_box_width, window_box_left, window_box_left_offset)
(window_box_right, window_box_right_offset): Declare extern.
Otherwise, these inline functions do not conform to C99 and
are miscompiled by Microsoft compilers.  Reported by Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00084.html>.
* intervals.c (adjust_intervals_for_insertion)
(adjust_intervals_for_deletion): Now extern, because otherwise the
extern inline functions 'offset_intervals' couldn't refer to it.
(static_offset_intervals): Remove.
(offset_intervals): Rewrite using the old contents of
static_offset_intervals.  The old version didn't conform to C99
because an extern inline function contained a reference to an
identifier with static linkage.

* src/keyboard.c (interrupt_signal): Don't call kill-emacs while in
GC.

Fix bug #9963 with abort in "temacs -nw".

 src/xdisp.c (init_iterator, reseat_to_string): Don't set the
 iterator's bidi_p flag if Vpurify_flag is non-nil.
 (Fcurrent_bidi_paragraph_direction): If Vpurify_flag is non-nil,
 return Qleft_to_right.

Manual updates for window changes.

* doc/emacs/windows.texi (Basic Window): Add xref to Cursor Display.
(Split Window): Document negative arg for splitting commands.
(Other Window): Document mouse-1 in text area of window.
(Change Window): Don't mention window attributes, since they
aren't defined.  C-x 1 can't be used with minibuffer windows.
Windows are no longer auto-deleted.
(Window Choice): Add xref to Choosing Window in Lisp manual.
(Window Convenience): Note that windmove disables shift-selection.
Move M-x compare-windows here from Other Window node.

* doc/emacs/custom.texi (Mouse Buttons):
* doc/emacs/search.texi (Isearch Scroll):
* doc/emacs/windows.texi (Split Window): Use new names split-window-below
and split-window-right.

* doc/lispref/windows.texi (Basic Windows): Clarify various definitions.
Treat window-normalize-* as internal; don't document them.
(Windows and Frames): Various clarifications, e.g. non-live
windows also belong to frames.  Fix window-list description.
Simplify window nesting example.
(Splitting Windows, Window Configurations): Use
split-window-below.

Delete window-combination-p; tweaks to window-top-child and window-left-child.

* lisp/window.el (window-combination-p): Function deleted; its
side-effect is not used in any existing code.
(window-combinations, window-combined-p): Call window-*-child
directly.

* window.c (Fwindow_live_p, Fwindow_frame, Fframe_root_window)
(Fminibuffer_window, Fwindow_buffer, Fwindow_splits)
(Fset_window_splits, Fwindow_nest, Fset_window_nest)
(Fwindow_use_time, Fwindow_total_size, Fwindow_normal_size)
(Fwindow_new_normal, Fwindow_left_column, Fwindow_top_line)
(Fwindow_margins, Fwindow_fringes, Fwindow_scroll_bars)
(Fwindow_vscroll): Doc fix.
(Fwindow_top_child, Fwindow_left_child): Eliminate a nil default
argument, since it makes no sense to pass a live window and for
consistency with window-child.

* src/makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to
  support MSVC.

* inc/stdint.h (UINT64_MAX, UINT64_MIN, INT64_MIN, UINTMAX_MAX)
(UINTMAX_MIN, INTMAX_MAX, INTMAX_MIN, UINT32_MIN, UINT32_MAX)
(INT32_MIN, UINTMAX_MAX, UINTMAX_MIN, INTMAX_MAX, INTMAX_MIN)
(intmax_t, INT64_MAX): Add for MSVC.

* src/w32font.c (font_matches_spec): Filter out non-Japanese kana fonts.
(add_font_entity_to_list): Filter out non-Japanese Shift-JIS
fonts.
(add_font_entity_to_list): Fix logic errors in mixed boolean and
bitwise arithmetic preventing use of unicode-sip and non-truetype
opentype fonts.

Fixes: debbugs:6029

Fix definition of `mode_t'.

Fix MSVC build in lib-src.

 src/s/ms-w32.h (fstat, stat, utime): Move redirections to
 "emacs"-only part.

Fixes: debbugs:99690

Modify w32fns.c similarly to 2011-11-05T12:04:34Z!jan.h.d@swipnet.se.

 src/w32fns.c (x_create_tip_frame, Fx_create_frame): Rearrange
 initialization code to keep similarity to xfns.c after changes
 from 2011-11-05.

Fixes: debbugs:9943

* nt/config.nt: (mode_t) [!__GNUC__]: Define mode_t for MSVC.

Fix compilation with MSVC in lib/.

 nt/config.nt (inline) [!__GNUC__]: Define to __inline for MSVC.

* nsfns.m: Declare image_cache_refcount if GLYPH_DEBUG.
(unwind_create_frame): New function.
(Fx_create_frame): Restructure code to be more similar to the one in
xfns.c.  Call record_unwind_protect with unwind_create_frame (Bug#9943).
Initialize image_cache_refcount if GLYPH_DEBUG (Bug#9943).
Move terminal->reference_count++ just before making the frame official
(Bug#9943).

* nsterm.m (x_free_frame_resources): New function.
(x_destroy_window): Move code to x_free_frame_resources.

* xfns.c (unwind_create_frame): Fix comment.
(Fx_create_frame, x_create_tip_frame): Move
terminal->reference_count++ just before making the frame
official. Move initialization of image_cache_refcount and
dpyinfo_refcount before calling init_frame_faces.

Fixes: debbugs:9943

Support MSVC build with newer versions of Visual Studio.

Small portions of the changes by Fabrice Popineau <fabrice.popineau@supelec.fr>.

 src/makefile.w32-in (TAGS-gmake): Don't use $(patsubst ...), as
 Nmake barfs on that.  Use $(OBJ*_c) variables instead, defined on
 nt/gmake.defs.
 src/lisp.h (ENUM_BF): New macro, for enumerated types in bitfields,
 which are not supported by MSVC.
 (Lisp_Symbol, Lisp_Misc_Any, Lisp_Marker, Lisp_Misc_Overlay)
 (Lisp_Save_Value, Lisp_Free): Use ENUM_BF for enumerated types in
 bitfields.
 (Lisp_Object) [USE_LISP_UNION_TYPE]: Use ENUM_BF for enumerated
 types in bitfields.
 (DEFUN) [_MSC_VER]: Define in a different way for MSVC.
 src/w32fns.c [_MSC_VER]: DECLARE_HANDLE for any MSVC version.
 src/w32.c: Don't include w32api.h for MSVC.
 (init_environment) [_MSC_VER]: Call sys_access, not _access.
 src/s/ms-w32.h <sigset_t, ssize_t> [_MSC_VER]: Typedefs for MSVC.
 [_MSC_VER]: Include sys/timeb.h, sys/stat.h, and signal.h.
 (fstat, stat, utime) [_MSC_VER]: Redirect to their sys_* cousins.
 (malloc, free, realloc, calloc) [_MSC_VER]: Always redirect to the
 e_* cousins.
 (alloca) [_MSC_VER]: Define to _alloca.
 src/lisp.h (DECL_ALIGN) [_MSC_VER]: Define for MSVC.
 src/regex.c <re_char> [_MSC_VER]: A separate definition for MSVC.
 nt/makefile.w32-in (clean-other-dirs-nmake)
 (distclean-other-dirs-nmake, maintainer-clean-other-dirs-nmake):
 Update for current structure of doc/ subdirectories.
 nt/gmake.defs (OBJ0_c, OBJ1_c, OBJ2_c): New variables.
 nt/INSTALL: Update for newer versions of MSVC.
 lib/makefile.w32-in (FRC): New dummy target.
 (TAGS): Depend on FRC.

Fixes: debbugs:9960

Auto-commit of generated files.

* window.el (window-normalize-window): Rename from window-normalize-any-window.
New arg LIVE-ONLY, replacing window-normalize-live-window.
(window-normalize-live-window): Deleted.
(window-combination-p, window-combined-p, window-combinations)
(walk-window-subtree, window-atom-root, window-min-size)
(window-sizable, window-sizable-p, window-size-fixed-p)
(window-min-delta, window-max-delta, window-resizable)
(window-resizable-p, window-full-height-p, window-full-width-p)
(window-current-scroll-bars, window-point-1, set-window-point-1)
(window-at-side-p, window-in-direction, window-resize)
(adjust-window-trailing-edge, maximize-window, minimize-window)
(window-deletable-p, delete-window, delete-other-windows)
(record-window-buffer, unrecord-window-buffer)
(switch-to-prev-buffer, switch-to-next-buffer, window--delete)
(quit-window, split-window, window-state-put)
(set-window-text-height, fit-window-to-buffer)
(shrink-window-if-larger-than-buffer): Callers changed.

* lisp/window.el (window-valid-p): Rename from window-any-p.
(window-normalize-any-window, window-size-ignore)
(window-state-get): Callers changed.

Increase required GnuTLS version (bug#9929)

* configure.in: Increase minimum GnuTLS version to 2.6.6.
Do not include GnuTLS version info in final summary message.

* etc/NEWS: Add FIXME related to GnuTLS version.

Fix rmail-next/prev-same-subject.

 lisp/mail/rmail.el (rmail-simplified-subject): Decode subject with
 rfc2047-decode-string.
 (rmail-mime-toggle-hidden): Declare to avoid byte-compilation
 warnings.

Last part of fix for bug #8562 with Emacs on Windows 9X.

 nt/runemacs.c (ensure_unicows_dll): New function, tries to load
 UNICOWS.DLL on Windows 9X.
 (WinMain): If ensure_unicows_dll fails to find UNICOWS.DLL,
 display a dialog to the effect that Emacs cannot be started.

Fix bug #9955 with mouse-highlight that starts at beginning of window.

 src/xdisp.c (note_mouse_highlight): If either of
 previous/next-single-property-change returns nil, treat that as
 the beginning or the end of the buffer.

* gtkutil.c (xg_make_tool_item): Add callbacks of one of wimage or
label is not null.
(xg_tool_item_stale_p): Handle the fact that wimage and/or wlbl
may be NULL.

Fixes: debbugs:9951

Fix documentation per bug #9949.

 src/window.c (Fwindow_body_size): Mention in the doc string that the
 return value is in frame's canonical units.
 lisp/window.el (window-body-height, window-body-width): Mention in
 the doc string that the return values are in frame's canonical
 units.
 doc/lispref/windows.texi (Window Sizes): Mention in the doc string that the
 return values of `window-body-height' and `window-body-width' are
 in frame's canonical units.

gnus-sum.el (gnus-articles-to-read): Change wording in prompt to be slightly clearer.

Add c-nonlabel-token-2-key to cc-langs.el.

message.el (message-send-and-exit): Document `arg'.

Fix bug #9947 with referencing uninitialized variable.

 src/xdisp.c (note_mouse_highlight): Initialize `area'.

Edit lisp/ChangeLog

Merge.

Fix bug #9943 on X.

 src/xfns.c (unwind_create_frame): If needed, free the glyph
 matrices of the partially constructed frame.

Add c-nonlabel-token-2-key to cc-langs.el.

(url-cookie-expired-p): Protect against zero-length cookie expiry dates.

* srecode.el:
* srecode/texi.el:
* srecode/template.el:
* srecode/java.el:
* srecode/insert.el:
* srecode/document.el:
* srecode/dictionary.el:
* srecode/compile.el:
* semantic/wisent/java-tags.el:
* semantic/texi.el:
* semantic/sort.el:
* semantic/lex-spp.el:
* semantic/idle.el:
* semantic/html.el:
* semantic/db-typecache.el:
* semantic/analyze/complete.el:
* ede/generic.el:
* ede/custom.el:
* ede/cpp-root.el:
* ede/base.el: Fix filenames in comments and headers.

* semantic/db-find.el:
* srecode/insert.el (srecode-insert-include-lookup):
* ede/proj-comp.el (ede-compilation-program): Fix it's -> its in
comments and docstrings.

* semantic/ctxt.el (semantic-end-of-context-default):
* semantic/find.el (semantic-find-tags-by-scope-protection):
* semantic/java.el (semantic-documentation-for-tag): Fix typos in
docstrings.

* semantic/db.el (semanticdb-table, semanticdb-abstract-cache)
(semanticdb-abstract-db-cache):
* semantic/decorate/include.el
(semantic-decoration-unknown-include-describe): Fix filenames in
docstring.

* semantic/ede-grammar.el (semantic-ede-grammar-compiler-wisent):
(semantic-ede-grammar-compiler-bovine): Fix requires that are
added to the grammar-make-script.

* lisp/gnus/nnimap.el (nnimap-open-connection-1): Use tcp-keealive if possible.

src/ChangeLog: Fix entry for last commit.

Fix bug #9943 with abort at shutdown.

 src/w32fns.c (unwind_create_frame): If needed, free the glyph
 matrices of the partially constructed frame.

gnus-util.el (gnus-bound-and-true-p): Another comment to explain why we don't use `bound-and-true-p'.

* lisp/window.el (switch-to-buffer): Use `force-same-window' interactively.

In quit-window call unrecord-window-buffer later.  (Bug#9937)

* window.el (quit-window): Call unrecord-window-buffer after
showing another buffer in the window.  (Bug#9937)
(bury-buffer): Call switch-to-prev-buffer with second argument
'bury.

Rename `gnus-bound-and-true-dumber-p' to `gnus-bound-and-true-p'.

Fix typos.

Fix bug#9935
* lisp/vc/vc-bzr.el: Accept status with more than 9 shelves.
  Reported by Colin D Bennett <colin@gibibit.com>.

ChangeLog fixes.

Rename locals to match their nature.

 src/xdisp.c (mouse_face_from_buffer_pos, note_mouse_highlight): Rename
 cover_string to disp_string.

Fix mouse highlight in continued lines on a TTY.

 src/xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment.
 Don't stop backward scan on the continuation glyph, even though
 its CHARPOS is positive.

Remove unused variable temp-buffer-show-specifiers.

* window.c (temp_output_buffer_show): Don't use
Vtemp_buffer_show_specifiers.
(Vtemp_buffer_show_specifiers): Remove unused variable.
* help.el (with-help-window): Don't reference
temp-buffer-show-specifiers in doc-string.

gnus-bound-and-true-dumper-p to fix XEmacs build.

gnus.texi (Other Gnus Versions): Remove.

gnus-registry-enabled fixes to give default value.

Fix previous commit.

 config.bat: Use config.in and Makefile.in from src/ and lib/, if
 they exist there, else from autogen/.
 make-dist: Don't add `autogen'.

Fix distribution tarball for the MS-DOS build.

 make-dist (tempdir): Create `autogen'.
 (msdos): Add depfiles.bat and inttypes.h.
 (autogen): Put README, config.in, and Makefile.in ionto the
 distribution, they are needed for the MS-DOS build.
 msdos/sed3v2.inp (insrcdir): Comment out definition.
 $(insrcdir): Edit into MS-DOS existence test.

* lisp/subr.el (keymap--menu-item-with-binding): Ignore item if not a
menu-item.

Auto-commit of generated files.

Fix memory leak by y-or-n-p-with-timeout with GUI (Bug#9830).

* xmenu.c (cleanup_widget_value_tree): New function.
(xmenu_show, xdialog_show): Use it in record_unwind_protect instead of
calling free_menubar_widget_value_tree directly (Bug#9830).

Bump version to 24.0.91.
Regenerate AUTHORS and ldefs-boot.el.

Adjust comment.

Better code for whitespace-newline-mode.

* admin/grammars/bovine-grammar.el: Avoid using old-style backquotes.

Disable whitespace-newline-mode properly.

Fix random crashes while scrolling backwards.

 src/xdisp.c (try_cursor_movement): Make sure ROW isn't decremented
 past the beginning of the current glyph matrix.

Fix bug 9869.

xterm.c: Include X11/Xproto.h if HAVE_GTK3.
(x_error_handler): Ignore BadMatch for X_SetInputFocus for
HAVE_GTK3 (Bug#9869).

* gtkutil.c (xg_win_to_widget, xg_event_is_for_menubar): Initialize
type to GDK_NOTHING so valgrind does not complain.

Fixes: debbugs:9901

Fix hang after C-z in gnome-shell.

* xterm.c: Declare x_handle_net_wm_state to return int.
(handle_one_xevent): Check if we are iconified but don't have
_NET_WM_STATE_HIDDEN.  If do, treat as deiconify.
(get_current_wm_state): Return non-zero if not hidden,
check for _NET_WM_STATE_HIDDEN (Bug#9893).
(do_ewmh_fullscreen): Ignore return value from get_current_wm_state.
(x_handle_net_wm_state): Return what get_current_wm_state returns.
(x_term_init): Initialize dpyinfo->Xatom_net_wm_state_hidden.

* xterm.h (x_display_info): Add Xatom_net_wm_state_hidden (Bug#9893).

newsticker: Clean up newsticker--group-manage-orphan-feeds

2011-10-30  Ulf Jasper  <ulf.jasper@web.de>

* net/newst-treeview.el: Remove "Time-stamp".
(newsticker--group-manage-orphan-feeds): Do not call
newsticker--treeview-tree-update.
(newsticker-treeview-update, newsticker-treeview): Call
newsticker--treeview-tree-update if necessary.

2011-10-30  Ulf Jasper  <ulf.jasper@web.de>

* automated/newsticker-tests.el
(newsticker--group-manage-orphan-feeds): Removed fsetting of
newsticker--treeview-tree-update.

Remove "iso-" infix from window combination functions.

* window.el (window-iso-combination-p, window-iso-combined-p)
(window-iso-combinations): Remove "iso-" infix.  Suggested by
Chong Yidong.
(window-min-size-1, window-size-fixed-1, window-min-delta-1)
(window-max-delta-1, window-resize, window--resize-siblings)
(window--resize-this-window, adjust-window-trailing-edge)
(split-window, balance-windows-1)
(shrink-window-if-larger-than-buffer):
* calendar/calendar.el (calendar-generate-window):
* help.el (resize-temp-buffer-window): Adjust callers
accordingly.
* windows.texi (Windows and Frames): Remove "iso-" infix from
documentation of window-iso-combined-p.

* lisp/eshell/esh-cmd.el (eshell-rewrite-for-command): Fix last change.
(eshell-do-eval): Handle multiple expressions in `while' body.

Fixes: debbugs:9907

* lisp/eshell/esh-cmd.el (eshell-rewrite-for-command): Don't modify the list
in place.
(eshell-subcommand-arg-values, eshell-rewrite-named-command)
(eshell-rewrite-if-command, eshell-rewrite-for-command)
(eshell-structure-basic-command, eshell-rewrite-while-command)
(eshell-invokify-arg, eshell-parse-pipeline, eshell-parse-command)
(eshell-parse-subcommand-argument, eshell-parse-lisp-argument)
(eshell-trap-errors, eshell-do-pipelines, eshell-do-eval)
(eshell-do-pipelines-synchronously, eshell-eval-command):
Use backquotes and prefer setq to set.
(eshell-lookup-function, function-p-func, eshell-functionp): Remove.
(eshell-macrop): Use functionp.

Fixes: debbugs:9907

* viper-cmd.el (viper-exec-change): Use push-mark not set-mark.

Fixes: debbugs:9810

Rename split-window-{above-each-other|split-window-side-by-side}
to split-window-below and split-window-right.

* lisp/window.el (split-window-below, split-window-right): Rename from
split-window-above-each-other and split-window-side-by-side
respectively.  All callers changed.
(split-window-sensibly, split-window-sensibly): Use them.
(split-window-keep-point): Doc fix.

* lisp/isearch.el: Add isearch-scroll property to split-window-below
and split-window-right.

* lisp/follow.el (follow-mode):
* lisp/vc/pcvs-util.el (cvs-pop-to-buffer-same-frame):
* lisp/progmodes/ada-xref.el (ada-gdb-application):
* lisp/emulation/vip.el (vip-buffer-in-two-windows):
* lisp/image-dired.el (image-dired-dired-with-window-configuration):
* lisp/dired-x.el (dired-do-find-marked-files):
* lisp/dired.el (dired-pop-to-buffer):
* lisp/bs.el (bs--show-with-configuration):
* lisp/vc/emerge.el (emerge-setup-windows):
* lisp/textmodes/two-column.el (2C-two-columns):
* lisp/textmodes/reftex-toc.el (reftex-toc):
* lisp/progmodes/gdb-mi.el (gdb-setup-windows):
* lisp/progmodes/fortran.el (fortran-window-create):
* lisp/net/newst-treeview.el (newsticker--treeview-window-init):
* lisp/emulation/ws-mode.el (wordstar-C-o-map, wordstar-mode):
* lisp/emulation/tpu-edt.el (tpu-gold-map):
* lisp/emulation/crisp.el (crisp-mode-map):
* lisp/calendar/calendar.el (calendar-basic-setup): Callers changed.

* alloc.c (which_symbols): Declare EXTERNALLY_VISIBLE,

so that this new function doesn't get optimized away by a
whole-program optimizer.  Make the 2nd arg EMACS_INT, not int.

* src/frame.h (MOUSE_HL_INFO): Remove excess parens.

newsticker: Fixed bug#9763, again

2011-10-29  Ulf Jasper  <ulf.jasper@web.de>

* automated/newsticker-tests.el
(newsticker--group-manage-orphan-feeds): Use fset instead of flet.

newsticker: Fixed bug#9763

2011-10-29  Ulf Jasper  <ulf.jasper@web.de>

* trunk/test/automated/newsticker-tests.el
(newsticker--group-manage-orphan-feeds): Prevent updating
newsticker treeview. Fixed bug#9763.

etc/themes/wombat-theme.el: Add a coding cookie.  (Bug#9905)

Fix attribution for last commit in src/ChangeLog.

Fix the `xbytecode' user-defined command in .gdbinit.

 src/.gdbinit (xprintbytestr): New command.
 (xwhichsymbols): Renamed from `which'; all callers changed.
 (xbytecode): Print the byte-code string as well.
 src/alloc.c (which_symbols): New function.

Revert last commit.

Fix bug #9902 with crash caused by clearing mouse highlight.

 src/xdisp.c (note_mouse_highlight): Don't clear mouse highlight if
 hlinfo->mouse_face_window is nil.

Fixes: debbugs:9903
* src/minibuf.c (read_minibuf_noninteractive): Allow reading empty
line.

* lisp/subr.el (y-or-n-p): Add code for batch mode.

Fixes: debbugs:9818

* lisp/mouse.el (mouse-yank-primary): Push the mark.

Fixes: debbugs:9894

* flyspell.el (flyspell-word): Fix char offset for forged Ispell output.

Fixes: debbugs:7904

* emacs-lisp/package.el (package-refresh-contents): Add autoload.

* etc/NEWS: Document the disappearance of binding caches.

Fixes: debbugs:9899

* lisp/doc-view.el: Avoid ugly errors about not finding nil.
(doc-view-ghostscript-program, doc-view-dvipdfm-program)
(doc-view-dvipdf-program, doc-view-unoconv-program)
(doc-view-ps2pdf-program, doc-view-pdftotext-program):
Avoid nil or absolute file name as default value.
(doc-view-pdf->txt, doc-view-ps->pdf): Use executable-find here.

Revert problematic change to wait_reading_process_output.

* src/process.c (wait_reading_process_output): Revert 2009-08-30 change.
Not clear what it was for, and it causes various bugs.  (Bug#9839)

Fix use of uninitialized variable.

 src/xdisp.c (note_mouse_highlight): Initialize `part', to avoid a
 possible random value that matches one of those tested as
 condition to clear the mouse face.

Increment c-version to 5.32.2.

Add and entry to ChangeLog.

Merge.

* src/xdisp.c (note_mouse_highlight): Fix use of uninitialized var.

See:
http://lists.gnu.org/archive/html/emacs-devel/2011-10/msg01202.html

Document that UNICOWS.DLL is required to run Emacs on Windows 9X.

 nt/README.W32: Mention UNICOWS.DLL as prerequisite for running
 Emacs on Windows 9X.
 admin/nt/README-ftp-server: Mention UNICOWS.DLL as prerequisite for
 running Emacs on Windows 9X.

Fixes: debbugs:8562

* net/rcirc.el (rcirc-mode): Use hard newlines.

Boring merge.

Boring merge from savannah.

DTRT for c-beginning/end-of-defun in nested declaration scopes.

* src/window.c (make_window): Initialize phys_cursor_on_p.