* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Record unwind with clean_up_file_dialog.

* xterm.h: Declare x_menu_in_use, x_menu_set_in_use,
x_menu_wait_for_event.

* xmenu.c (x_menu_in_use, x_menu_set_in_use): New functions.

Add BLOCK_INPUT in pop_down_file_dialog.

* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
(xg_file_sel_destroy): Removed.
(xg_file_response_cb, pop_down_file_dialog,
xg_get_file_name_from_chooser, xg_get_file_name_from_selector):
New functions.
(xg_get_file_with_chooser, xg_get_file_with_selection): Take
new argument func, set it to xg_get_file_name_from_chooser/selector.
Move common code to xg_get_file_name.  Return widget created.
(xg_get_file_name): Set name, transient for, modal and destroy
with parent here.  Connect response signal to xg_file_response_cb,
connect delete-event to gtk_true.  Record pop_down_file_dialog
for unwind.  Do event loop and call x_menu_wait_for_event in loop.
(xg_create_widget): Make dialogs modal.

*** empty log message ***

(c-basic-common-initc-font-lock-init, c-font-lock-init): Eliminate obsolete make-local-hook.
(c-mode, c++-mode, objc-mode, java-mode, idl-mode, pike-mode, awk-mode): Use run-mode-hooks.

* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Lisp_Object.
(popup_get_selection): Move unwind protect ...
(create_and_show_popup_menu, create_and_show_dialog): ... to here.
Move destroy of widget to pop_down_menu.
(popup_widget_loop): Move unwind protect ...
(create_and_show_popup_menu, create_and_show_dialog): ... to here.
Move destroy of widget to pop_down_menu.
(pop_down_menu): BLOCK_INPUT and destroy widget/window.
(xmenu_show): record unwind pop_down_menu.  Move XMenuDestroy,
x_mouse_leave and grabbed = 0 to pop_down_menu.

Add bug:

** Partial highlighting of wrapped overlay

Fixed these problems:

** Clicking on partially visible lines fails

From: David Kastrup <dak@gnu.org>
Date: 27 Apr 2004 16:42:58 +0200

I had gnus display a mouse-highlighted line (a URL from browse-url)
partially at the bottom of its window.  If I click with middle mouse
key on it, the window gets recentered while I hold the mouse key
pressed.  If I release it, the window returns into its old position
(cursor in top row) and nothing happens, presumably because the click
was not registered on the line itself, but on the magically
recentered version.

That is a nuisance.  Recentering of even partially visible click
targets should only happen if window-point moves there, but not at
the time of the click.  From the moment I hold down a key until it
gets released, the displayed window portion should not change, with
the sole exception of scrolling when dragging at the edge of the
screen.

(progn
  (setq line-spacing 4)
  (dotimes (i (window-height))
    (insert "\n" (int-to-string i)))
  (forward-line -2)
  (recenter -1))

** Can't drag modeline when mouse-autoselect-window is set

From: Klaus Zeitler <kzeitler@lucent.com>
Date: Mon, 11 Oct 2004 11:14:49 +0200

1. start emacs -q --no-site-file
2. set variable mouse-autoselect-window to t
3. split-window-vertically

now I can drag the modeline only upwards but not downwards

(mouse-drag-copy-region): Add :version.
(mouse-drag-mode-line-1): Let bind mouse-autoselect-window to nil
while dragging mode line, so mode line can be dragged downwards.
(mouse-drag-region-1): Let bind make-cursor-line-fully-visible
while pressing mouse button so window doesn't scroll until we
release the mouse if clicking on partially visible line.

*** empty log message ***

(make_cursor_line_fully_visible_p): New variable.
(syms_of_xdisp): DEFVAR_BOOL it.
(make_cursor_line_fully_visible, try_cursor_movement)
(try_window_id): Use it.

*** empty log message ***

run-mode-hooks instead of run-hooks

(calc-dumb-map):  Declared it.
(calc-graph-show-dumb):  Check if calc-dumb-map is non-nil rather than
unbound.

(calc-graph-name):  Made `end' a local variable.

(calc-graph-lookup):  Made `varname' a local variable.

(var-DUMMY, var-DUMMY2, var-PlotRejects, calc-gnuplot-trail-mark):
Declared them.
(calc-graph-format-data):  Don't check if var-PlotRejects is bound.

(calc-graph-plot, calc-graph-compute-3d):  Removed references to the
unused variable y3vec.

(calc-graph-show-dumb):  Removed reference to unused variable found-pt.

(calc-graph-kill-hook, calc-graph-plot):  Removed reference to
calc-graph-prev-kill-hook.

(calc-graph-yvalue, calc-graph-yvec, calc-graph-numsteps,
calc-graph-numsteps3, calc-graph-xvalue, calc-graph-xvec,
calc-graph-xname, calc-graph-yname, calc-graph-xstep,
calc-graph-ycache, calc-graph-ycacheptr, calc-graph-refine,
calc-graph-keep-file, calc-graph-xval, calc-graph-xlow,
calc-graph-xhigh, calc-graph-yval, calc-graph-yp, calc-graph-xp,
calc-graph-zp, calc-graph-yvector, calc-graph-resolution,
calc-graph-y3value, calc-graph-y3name,
calc-graph-y3step, calc-graph-y3step, calc-graph-zval,
calc-graph-stepcount, calc-graph-is-splot, calc-graph-surprise-splot,
calc-graph-blank, calc-graph-non-blank, calc-graph-curve-num):  New
variables.
(calc-graph-plot, calc-graph-compute-2d, calc-graph-refine-2d)
(calc-graph-recompute-2d, calc-graph-compute-3d, calc-graph-format-data):
Replaced undeclared variables with the above declared variables.

ChangeLog

Add a test for DECL_ALIGN support, and add a trivial definition to
src/config.h if 8-byte alignment is not supported.

(rmail-get-new-mail): Use the renamed variables `rsf-beep' and
`rsf-sleep-after-message'.

(rmail-spam-filter): Only check white list if `message-sender' is non-nil.

(desktop-create-buffer, desktop-save): Avoid some consing by using mapc
instead of mapcar.

ChangeLog

Don't require djecho.exe for the v1.x build.

Fixed this bug:

** line-spacing and (recenter -1)

From: SAITO Takuya <tabmore@rivo.mediatti.net>
Date: Mon, 31 May 2004 02:07:57 +0900 (JST)

(recenter -1) does not show point at the bottom of the window
if line-spacing is set to positive integer.

Start emacs -Q, and evaluate below:

(progn
  (setq line-spacing 1)
  (dotimes (i (window-height))
    (insert "\n" (int-to-string i)))
  (recenter -1))

Then, point is displayed at the center of the window.
But point should be displayed at the bottom of the window like Emacs-21.3.

(init_iterator): Clear it.max_extra_line_spacing.
(move_it_vertically_backward): Don't recure to move further back.
(move_it_vertically): Remove superfluous condition.
(move_it_by_lines): Clear last_height when moved 0 lines.
(resize_mini_window): use it.max_extra_line_spacing.
(display_tool_bar_line): Clear row->extra_line_spacing.
(try_scrolling): Use move_it_vertically_backward directly.
(redisplay_window): Likewise.
(compute_line_metrics): Set row->extra_line_spacing.
(display_line, display_string): Likewise.
(x_produce_glyphs): Update it->max_extra_line_spacing.

(window_scroll_pixel_based, Frecenter): Use
move_it_vertically_backward directly.
(Frecenter): Fix calculation of new start pos for negative arg.
Before, the new start pos was sometimes chosen too far back, so
the last line became only partially visible, and thus would be
either only semi-visible or automatically scrolled to the middle
of the window by redisplay.

(struct glyph_row): New member extra_line_spacing.
(struct it): New member max_extra_line_spacing.
(MR_PARTIALLY_VISIBLE, MR_PARTIALLY_VISIBLE_AT_TOP)
(MR_PARTIALLY_VISIBLE_AT_BOTTOM): New helper macros.
(MATRIX_ROW_PARTIALLY_VISIBLE_P): Fix to return false if invisible
part of last line is only extra line spacing (so the text on the
line is fully visible). Use helper macros.
Add W arg (to use them).  All callers changed.
(MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P)
(MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P): Use helper macros.

*** empty log message ***

(pop_down_menu): Return nil.

(pop_down_menu): New function.
(popup_get_selection, popup_widget_loop): Unwind protect to
pop_down_menu.
(popup_widget_loop): Add argument widget.
(create_and_show_popup_menu, create_and_show_dialog): Pass new
argument widget to popup_widget_loop.

(popup_widget_loop): Add argument do_timers.
(create_and_show_popup_menu, create_and_show_dialog): Pass 1 for
do_timers to popup_widget_loop.
(create_and_show_popup_menu): Pass 1 for do_timers to
popup_get_selection.

* xmenu.c (x_menu_wait_for_event): New function.
(popup_get_selection, popup_widget_loop):  Call x_menu_wait_for_event
to handle timers.
(xmenu_show): Call XMenuActivateSetWaitFunction so that
x_menu_wait_for_event is called by XMenuActivate.

* XMenu.h (XMenuActivateSetWaitFunction): New function.

* Activate.c (XMenuActivateSetWaitFunction): New function.
(XMenuActivate): Call wait_func if set, before XNextEvent.

*** empty log message ***

(byte-compile-inline-expand): Understand the
new byte-compile-function-environment binding to t.

fix to use new easymenu

(require): Explain why CL is needed.

*** empty log message ***

(font-lock-fontify-syntactically-region):
Don't forget to highlight the last char when we hit `end'.

(mouse-wheel-progressive-speed): Fix typo in name.
(mwheel-scroll): Adjust accordingly.

Reduce spurious warnings.
(cvs-status-checkout): Remove.
(cvs-status-mode-map): Use cvs-mode-checkout instead.

(cvs-mode-checkout): New command.

*** empty log message ***

(iso-cvt-define-menu): Fix typo.

Require CL.

Use push.
(byte-compile-file-form-defalias): Rename from byte-compile-defalias.
(defalias): Remove the `byte-compile' property and add a `byte-hunk-handler'.

(Info-search): Save match data for isearch.  Skip Tag Table node.

(magic-mode-alist): Use optimization for SGML mode too.
(set-auto-mode): Doc fix.  Remove unused variable `xml'.

(describe-char): Replace syntax-after with code
from its previous version.

(sgml-html-meta-auto-coding-function):
Remove > after <html to allow HTML attributes.

Restore iso-2022-7bit coding in commented out code.

Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71
   Update from CVS

2004-11-10  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-emphasis-alist): Don't hide asterisks by
   default; improve customization type.
   (gnus-emphasis-custom-with-format): New macro.
   (gnus-emphasis-custom-value-to-external): New function.
   (gnus-emphasis-custom-value-to-internal): New function.

*** empty log message ***

(math-prime-factors-finished):  Declared it as a variable.

(calcFunc-dfac):  Replaced max by n.

(math-stirling-local-cache):  New variable.
(math-stirling-number, math-stirling-1, math-stirling-2):  Replaced
the variable `cache' by the declared variable math-stirling-local-cache.

(var-RandSeed):  Declared it.
(math-init-random-base, math-random-digit):  Don't check to see if
var-RandSeed is bound.

(math-random-cache, math-gaussian-cache, calc-verbose-nextprime):
Declared them instead of just setting them.

(math-init-random-base):  Made i a local variable.

(math-random-digit):  Made math-random-last a local variable.

(math-prime-test-cache):  Moved declaration to before it is used.

(math-prime-test-cache-k, math-prime-test-cache-q,
math-prime-test-cache-nm1, math-prime-factors-finished):  Declared
them as variables.

(math-defcache):  Use defvar for the new variables it creates.

Update entry 2003-04-06  Lars Hansen  <larsh@math.ku.dk>

(desktop-buffer-mode-handlers, desktop-after-read-hook,
desktop-clear-preserve-buffers-regexp, desktop-file-name-format,
desktop-globals-to-clear, desktop-no-desktop-file-hook, desktop-path,
desktop-save): Add :version.

url-mailto.el (url-mailto): Fix a typo in the comment.

(pr-get-symbol): Don't downcase.

Comment change.

*** empty log message ***

(math-read-brackets, math-check-for-commas):  Use declared variable
math-exp-pos.

(math-check-for-commas):  Use declared variable math-exp-str.

(math-read-brackets):  Use declared variables math-exp-old-pos,
math-exp-keep-spaces.

(math-read-brackets, math-read-vector, math-read-matrix):  Use
declared variable math-exp-token.

(math-parse-tex-sum):  Use declared variable math-exp-old-pos.

(math-parse-fortran-vector, math-parse-fortran-vector-end)
(math-parse-eqn-prime):  Use declared variable math-exp-token.

(math-read-angle-bracket):  Use declared variables math-exp-pos,
math-exp-str.

(math-read-expr):  Use declared variables math-exp-pos,
math-exp-old-pos, math-exp-str, math-exp-token,
math-exp-keep-spaces.

(calc-do-quick-calc):  Use kill-new to append string to kill-ring.

(calc-alg-exp, math-toks, math-exp-pos,math-exp-old-pos)
(math-exp-token, math-exp-keep-spaces, math-exp-str):  New variables.

(calc-do-alg-entry, calcAlg-equals, calcAlg-edit, calcAlg-enter):  Use
declared variable calc-alg-exp.

(math-build-parse-table, math-find-user-token):  Use declared variable
math-toks.

(math-read-exprs, math-read-token, calc-check-user-syntax,
calc-match-user-syntax, match-factor-after, math-read-factor):  Use
declared variables math-exp-pos math-exp-old-pos.

(math-read-exprs, math-read-token, math-read-expr-level)
(calc-check-user-syntax, calc-match-user-syntax, match-factor-after)
(math-read-factor):  Use declared variable math-exp-token.

(math-read-exprs, math-read-expr-list, math-read-token,
math-read-factor):  Use declared variable math-exp-keep-spaces.

(math-read-exprs, math-read-token):  Use declared variable
math-exp-str.

(calc-match-user-syntax):  Made m a local variable.

(magic-mode-alist): Reduce backtracking in the HTML regexp.

(Fkeymap_prompt): Accept symbol keymaps.

Emacs 21.4, not 20.4

magic-mode-alist & conf-mode.el

Revert last change.

(easy-menu-add-item): Use keymap-prompt.  Simplify.

(easy-menu-define-key): Understand the case where the keymap is a symbol.

(sgml-tag-text-p): New fun.
(sgml-parse-tag-backward): Use it to skip spurious < or >.

*** empty log message ***

Doc fixes throughout.
(electric-buffer-menu-mode-hook): New defvar.

Also do /etc/magic, hosts.allow, hosts.deny etc.

Don't require cl, comint, gud, gdb-ui for
compilation. The resulting compiler warnings appear to be
harmless.

*** empty log message ***

Changes from arch/CVS synchronization

*** empty log message ***

(auto-mode-alist, magic-mode-alist): Use conf-mode

*** empty log message ***

Rewrite the introduction about version systems, mentioning the new
ones that we support.  Thanks to Alex Ott, Karl Fogel, Stefan
Monnier, and David Kastrup for suggestions.

(iso-cvt-define-menu): Clean up namespace.

Add a note about VC-over-Tramp.

*** empty log message ***

(math-read-exprs, math-read-expr-list, math-read-expr-level,
math-read-token, calc-check-user-syntax, calc-match-user-syntax,
math-read-if, math-factor-after, math-read-factor):  Use
declared variable math-expr-data.

(math-parse-fortran-vector, math-parse-fortran-vector-end,
math-parse-tex-sum, math-parse-eqn-matrix, math-parse-eqn-prime,
math-read-math-subscr):  Use declared variable math-expr-data.

(math-read-brackets, math-read-vector, math-read-matrix):  Use
declared variable math-expr-data.

(math-rewrite, math-rewrite-phase):  Use declared variable math-mt-many.

(math-rewrite):  Use declared variable math-mt-func.

(math-expand-form):  Use declared variable math-mt-many.

(math-normalize-a):  New variable.

(math-normalize):  Use declared variable math-normalize-a.

(calc-init-extensions):  Remove old code.

(math-expr-data, math-mt-many, math-mt-func, calc-z-prefix-buf)
(calc-z-prefix-msgs):  New variables.

(calc-z-prefix-help, calc-user-function-list):  Use declared variables
calc-z-prefix-buf, calc-z-prefix-msgs.

(math-normalize-nonstandard):  Use declared variable math-normalize-a.

(math-map-tree, math-map-tree-rec):  Use declared variables
math-mt-many, math-mt-func.

(math-read-expression, math-read-string):  Use declared variable math-expr-data.

(diary-from-outlook, diary-from-outlook-gnus)
(diary-from-outlook-rmail): Use NOCONFIRM rather than DONOTASK for
argument name.

*** empty log message ***

(diary-from-outlook, diary-from-outlook-gnus)
(diary-from-outlook-rmail): Do not use interactive-p; but rather new
optional argument DONOTASK.

*** empty log message ***

(easy-menu-intern): Revert to no-downcasing.
(easy-menu-name-match): Revert correspondingly.

Include <sys/types.h> and <unistd.h> (for getpid).
Fix various comments referring to XEvents instead of input events.
(x_queue_event): Fix format strings.
(x_stop_queuing_selection_requests): Likewise.

(produce_image_glyph): Remove unused variable 'face_ascent'.
(pint2hrstr): Add extra braces to silence compiler.

(print_object): Fix format string.