Merged from miles@gnu.org--gnu-2005 (patch 76-78)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-76
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-77
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-78
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-288

17 files changed, 136 insertions, 44 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7ab3fb44ae..81daee7d7b5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2005-02-04  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-embed.el (calc-embedded-update): Don't put in
+        unnecessary newlines. Adjust the end of formula marker.
+
+        * calc/calc-lang.el (math-latex-parse-frac): Don't use arguments.
+        (math-latex-parse-two-args): New function.
+
+2005-02-03  Lute Kamstra  <lute@gnu.org>
+
+        * help-fns.el (help-with-tutorial): Make sure that users cannot
+        remove the entire text of the tutorial by means of `undo'.
+
+2005-02-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/ispell.el (ispell-internal-change-dictionary): Fix problem
+        in recent changes, where the ispell process was repeatedly
+        killed & restarted.
+
+        * international/mule-cmds.el (set-locale-environment): Set file-name
+        coding system to utf-8 on Darwin systems.
+        (set-default-coding-systems): Don't set default-file-name-coding-system
+        on Darwin systems.
+
 2005-02-03  Richard M. Stallman  <rms@gnu.org>
 
         * hi-lock.el (hi-lock-mode): Turning on Hi-Lock turns on Font-Lock.
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index 4c6311c9a5b..e3b3b6b5b19 100644
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -967,19 +967,24 @@ The command \\[yank] can retrieve it from there."
                   (calc-embedded-original-buffer t info)
                   (or (equal str (aref info 6))
                       (let ((delta (- (aref info 5) (aref info 3)))
+                            (adjbot 0)
                             (buffer-read-only nil))
                         (goto-char (aref info 2))
                         (delete-region (point) (aref info 3))
                         (and (> (nth 1 entry) (1+ extra))
                              (aref info 7)
                              (progn
-                               (aset info 7 nil)
                                (delete-horizontal-space)
-                               (insert "\n\n")
-                               (delete-horizontal-space)
-                               (backward-char 1)))
+                               (if (looking-at "\n")
+                                   ;; If there's a newline there, don't add one
+                                   (insert "\n")
+                                 (insert "\n\n")
+                                 (delete-horizontal-space)
+                                 (setq adjbot 1)
+;                               (setq delta (1+ delta))
+                                 (backward-char 1))))
                         (insert str)
-                        (set-marker (aref info 3) (point))
+                        (set-marker (aref info 3) (+ (point) adjbot))
                         (set-marker (aref info 5) (+ (point) delta))
                         (aset info 6 str))))))
           (if (eq (car-safe val) 'calcFunc-evalto)
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index d91d78fc461..63d24bb76d5 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -469,12 +469,12 @@
 (put 'latex 'math-function-table
      (append
       (get 'tex 'math-function-table)
-      '(( \\frac      . (math-latex-parse-frac /))
-        ( \\tfrac     . (math-latex-parse-frac /))
-        ( \\dfrac     . (math-latex-parse-frac /))
-        ( \\binom     . (math-latex-parse-frac calcFunc-choose))
-        ( \\tbinom    . (math-latex-parse-frac calcFunc-choose))
-        ( \\dbinom    . (math-latex-parse-frac calcFunc-choose))
+      '(( \\frac      . (math-latex-parse-frac))
+        ( \\tfrac     . (math-latex-parse-frac))
+        ( \\dfrac     . (math-latex-parse-frac))
+        ( \\binom     . (math-latex-parse-two-args calcFunc-choose))
+        ( \\tbinom    . (math-latex-parse-two-args calcFunc-choose))
+        ( \\dbinom    . (math-latex-parse-two-args calcFunc-choose))
         ( \\phi       . calcFunc-totient )
         ( \\mu        . calcFunc-moebius ))))
 
@@ -487,12 +487,23 @@
 
 (put 'latex 'math-complex-format 'i)
 
+
 (defun math-latex-parse-frac (f val)
   (let (numer denom)
-    (setq args (math-read-expr-list))
+    (setq numer (car (math-read-expr-list)))
+    (math-read-token)
+    (setq denom (math-read-factor))
+    (if (and (Math-num-integerp numer)
+             (Math-num-integerp denom))
+        (list 'frac numer denom)
+      (list '/ numer denom))))
+
+(defun math-latex-parse-two-args (f val)
+  (let (first second)
+    (setq first (car (math-read-expr-list)))
     (math-read-token)
-    (setq margs (math-read-factor))
-    (list (nth 2 f) (car args) margs)))
+    (setq second (math-read-factor))
+    (list (nth 2 f) first second)))
 
 (defun math-latex-print-frac (a fn)
   (list 'horiz (nth 1 fn) "{" (math-compose-expr (nth 1 a) -1)
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 9acadaa2fa6..4bf0a4775a0 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -97,6 +97,7 @@ With ARG, you are asked to choose which language."
           (forward-line 1)
           (newline (- n (/ n 2)))))
       (goto-char (point-min))
+      (setq buffer-undo-list nil)
       (set-buffer-modified-p nil))))
 
 ;;;###autoload
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index e101b7c5f33..338a6025e18 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -327,7 +327,8 @@ This also sets the following values:
         (or (local-variable-p 'buffer-file-coding-system buffer)
             (ucs-set-table-for-input buffer))))
 
-  (if default-enable-multibyte-characters
+  (if (and default-enable-multibyte-characters (not (eq system-type 'darwin)))
+      ;; The file-name coding system on Darwin systems is always utf-8.
       (setq default-file-name-coding-system coding-system))
   ;; If coding-system is nil, honor that on MS-DOS as well, so
   ;; that they could reset the terminal coding system.
@@ -1694,6 +1695,8 @@ The default status is as follows:
 
   (set-default-coding-systems nil)
   (setq default-sendmail-coding-system 'iso-latin-1)
+  ;; On Darwin systems, this should be utf-8, but when this file is loaded
+  ;; utf-8 is not yet defined, so we set it in set-locale-environment instead.
   (setq default-file-name-coding-system 'iso-latin-1)
   ;; Preserve eol-type from existing default-process-coding-systems.
   ;; On non-unix-like systems in particular, these may have been set
@@ -2489,6 +2492,10 @@ See also `locale-charset-language-names', `locale-language-names',
           (set-keyboard-coding-system code-page-coding)
           (set-terminal-coding-system code-page-coding))))
 
+    ;; On Darwin, file names are always encoded in utf-8, no matter the locale.
+    (when (eq system-type 'darwin)
+      (setq default-file-name-coding-system 'utf-8))
+
     ;; Default to A4 paper if we're not in a C, POSIX or US locale.
     ;; (See comments in Flocale_info.)
     (let ((locale locale)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index c403422801f..d5171125ae8 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1,6 +1,7 @@
 ;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2
 
-;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
+;;           Free Software Foundation, Inc.
 
 ;; Author:           Ken Stevens <k.stevens@ieee.org>
 ;; Maintainer:       Ken Stevens <k.stevens@ieee.org>
@@ -2449,7 +2450,7 @@ With prefix argument, set the default dictionary."
   "Update the dictionary actually used by Ispell.
 This may kill the Ispell process; if so,
 a new one will be started when needed."
-  (let ((dict (or ispell-local-dictionary ispell-dictionary "default")))
+  (let ((dict (or ispell-local-dictionary ispell-dictionary)))
     (unless (equal ispell-current-dictionary dict)
       (setq ispell-current-dictionary dict)
       (ispell-kill-ispell t))))
diff --git a/man/ChangeLog b/man/ChangeLog
index ca46664fe39..8f123098ec4 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-03  Lute Kamstra  <lute@gnu.org>
+
+        * frames.texi (Frames, Drag and Drop): Fix typos.
+
 2005-02-03  Richard M. Stallman  <rms@gnu.org>
 
         * windows.texi (Basic Window): Mention color-change in mode line.
diff --git a/man/frames.texi b/man/frames.texi
index 1e403adf3e3..603dfdea252 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -813,12 +813,12 @@ buffers are scrolled.
 @section Drag and Drop
 @cindex drag and drop
 
-  Emacs supports drag and drop using the mouse.  For instance, dropping
-text onto an Emacs frame inserts the text where it is dropped.  Dropping
-a file onto an Emacs frame visits that file.  As a special case,
-dropping the file on a Dired buffer moves or copies the file (according
-to the conventions of the application it came from) into the directory
-displayed in that buffer.
+  Emacs supports @dfn{drag and drop} using the mouse.  For instance,
+dropping text onto an Emacs frame inserts the text where it is dropped.
+Dropping a file onto an Emacs frame visits that file.  As a special
+case, dropping the file on a Dired buffer moves or copies the file
+(according to the conventions of the application it came from) into the
+directory displayed in that buffer.
 
 @vindex x-dnd-open-file-other-window
   Dropping a file normally visits it in the window you drop it on.  If
diff --git a/src/ChangeLog b/src/ChangeLog
index 6dd4211364f..eb8bab64362 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,34 @@
+2005-02-03  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (menubar_selection_callback): Force out GTK buffered
+        events so the menu event comes after them.  This is to prevent sit-for
+        from exiting on buffered events directly after a menu selection,
+        lisp code for Help => About Emacs uses sit-for.
+
+        * gtkutil.c (create_menus): Connect selection-done event instead of
+        the deactivate event to deactivate_cb.  This will make the last
+        leave event come before the call to deactivate_cb, so the leave
+        event does not make sit-for exit after a menu selection.
+
+2005-02-03  Kim F. Storm  <storm@cua.dk>
+
+        * dispnew.c (build_frame_matrix_from_leaf_window)
+         [!GLYPH_DEBUG]: Fix xassert.
+
+        * xfaces.c (x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
+
+        * xfns.c (unwind_create_frame) [!GLYPH_DEBUG]: Fix xassert.
+
+2005-02-03  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mac.c: Use MAC_OS_X_VERSION_MAX_ALLOWED to conditionalize by
+        the compiling OS version.
+
+        * macfns.c (x_create_tip_frame): Likewise.
+
+        * macterm.c (mac_draw_string_common, x_make_frame_visible):
+        Likewise.
+
 2005-02-03  Richard M. Stallman  <rms@gnu.org>
 
         * xterm.c (x_error_quitter): On GCC 3 and up, specify noinline.
diff --git a/src/dispnew.c b/src/dispnew.c
index 47e36aa991c..606e8331347 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1,6 +1,6 @@
 /* Updating of data structures for redisplay.
-   Copyright (C) 1985,86,87,88,93,94,95,97,98,1999,2000,01,02,03,04
-       Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
+     2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2775,7 +2775,6 @@ build_frame_matrix_from_leaf_window (frame_matrix, w)
           /* If rows are in sync, we don't have to copy glyphs because
              frame and window share glyphs.  */
 
-#if GLYPH_DEBUG
           strcpy (w->current_matrix->method, w->desired_matrix->method);
           add_window_display_history (w, w->current_matrix->method, 0);
 #endif
diff --git a/src/gtkutil.c b/src/gtkutil.c
index aecc4e2eaea..6bf0c25f350 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1905,7 +1905,7 @@ create_menus (data, f, select_cb, deactivate_cb, highlight_cb,
 
       if (deactivate_cb)
         g_signal_connect (G_OBJECT (wmenu),
-                          "deactivate", deactivate_cb, 0);
+                          "selection-done", deactivate_cb, 0);
 
       g_signal_connect (G_OBJECT (wmenu),
                         "grab-notify", G_CALLBACK (menu_grab_callback), 0);
diff --git a/src/mac.c b/src/mac.c
index 99e0d44830b..cce1b858cb3 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -2858,7 +2858,7 @@ select_and_poll_event (n, rfds, wfds, efds, timeout)
   return r;
 }
 
-#ifndef MAC_OS_X_VERSION_10_2
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1020
 #undef SELECT_INVALIDATE_CFSOCKET
 #endif
 
diff --git a/src/macfns.c b/src/macfns.c
index 416522b49b9..26d63ec99af 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -3882,7 +3882,7 @@ x_create_tip_frame (dpyinfo, parms, text)
     SetRect (&r, 0, 0, 1, 1);
 #if TARGET_API_MAC_CARBON
     if (CreateNewWindow (kHelpWindowClass,
-#ifdef MAC_OS_X_VERSION_10_2
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
                          kWindowIgnoreClicksAttribute |
 #endif
                          kWindowNoUpdatesAttribute |
diff --git a/src/macterm.c b/src/macterm.c
index 16878f9a45a..21effb23cfa 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -729,7 +729,7 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode,
      int nchars, mode, bytes_per_char;
 {
   SetPortWindowPort (w);
-#ifdef MAC_OS_X_VERSION_10_2
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
   UInt32 textFlags, savedFlags;
   if (!NILP(Vmac_use_core_graphics)) {
     textFlags = kQDUseCGTextRendering;
@@ -746,7 +746,7 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode,
 
   MoveTo (x, y);
   DrawText (buf, 0, nchars * bytes_per_char);
-#ifdef MAC_OS_X_VERSION_10_2
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
   if (!NILP(Vmac_use_core_graphics))
     SwapQDTextFlags(savedFlags);
 #endif
@@ -5451,7 +5451,7 @@ x_make_frame_visible (f)
           else
             RepositionWindow (FRAME_MAC_WINDOW (f),
                               FRAME_MAC_WINDOW (sf),
-#ifdef MAC_OS_X_VERSION_10_2
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
                               kWindowCascadeStartAtParentWindowScreen
 #else
                               kWindowCascadeOnParentWindowScreen
diff --git a/src/xfaces.c b/src/xfaces.c
index 0c4665a4cb6..a0ac3867ef6 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1,5 +1,5 @@
 /* xfaces.c -- "Face" primitives.
-   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation.
 
 This file is part of GNU Emacs.
@@ -741,9 +741,7 @@ x_free_gc (f, gc)
      GC gc;
 {
   BLOCK_INPUT;
-#if GLYPH_DEBUG
-  xassert (--ngcs >= 0);
-#endif
+  IF_DEBUG (xassert (--ngcs >= 0));
   XFreeGC (FRAME_X_DISPLAY (f), gc);
   UNBLOCK_INPUT;
 }
@@ -776,7 +774,7 @@ x_free_gc (f, gc)
      GC gc;
 {
   BLOCK_INPUT;
-  xassert (--ngcs >= 0);
+  IF_DEBUG (xassert (--ngcs >= 0));
   xfree (gc);
   UNBLOCK_INPUT;
 }
diff --git a/src/xfns.c b/src/xfns.c
index eaae071ef26..48967575f0c 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1,6 +1,6 @@
 /* Functions for the X window system.
-   Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000,01,02,03,04
-     Free Software Foundation.
+   Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+     2001, 2002, 2003, 2004, 2005  Free Software Foundation.
 
 This file is part of GNU Emacs.
 
@@ -4108,7 +4108,7 @@ Value is VALUE.  */)
 
   if (! NILP (outer_p)) w = FRAME_OUTER_WINDOW (f);
   else w = FRAME_X_WINDOW (f);
- 
+
   XChangeProperty (FRAME_X_DISPLAY (f), w,
                    prop_atom, target_type, element_format, PropModeReplace,
                    data, nelements);
@@ -5293,7 +5293,7 @@ or directory must exist.  ONLY-DIR-P is ignored."  */)
           if (keysym == XK_g && (event.xkey.state & ControlMask) != 0)
             XtUnmanageChild (dialog);
         }
-  
+
       (void) x_dispatch_event (&event, FRAME_X_DISPLAY (f));
     }
 
diff --git a/src/xmenu.c b/src/xmenu.c
index f6e0523378f..b6a5186f1f1 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1445,9 +1445,9 @@ menu_highlight_callback (widget, id, call_data)
 /* Find the menu selection and store it in the keyboard buffer.
    F is the frame the menu is on.
    MENU_BAR_ITEMS_USED is the length of VECTOR.
-   VECTOR is an array of menu events for the whole menu.
- */
-void
+   VECTOR is an array of menu events for the whole menu.  */
+
+static void
 find_and_call_menu_selection (f, menu_bar_items_used, vector, client_data)
      FRAME_PTR f;
      int menu_bar_items_used;
@@ -1554,6 +1554,17 @@ menubar_selection_callback (widget, client_data)
   if (! cb_data || ! cb_data->cl_data || ! cb_data->cl_data->f)
     return;
 
+  /* When a menu is popped down, X generates a focus event (i.e. focus
+     goes back to the frame below the menu).  Since GTK buffers events,
+     we force it out here before the menu selection event.  Otherwise
+     sit-for will exit at once if the focus event follows the menu selection
+     event.  */
+
+  BLOCK_INPUT;
+  while (gtk_events_pending ())
+    gtk_main_iteration ();
+  UNBLOCK_INPUT;
+
   find_and_call_menu_selection (cb_data->cl_data->f,
                                 cb_data->cl_data->menu_bar_items_used,
                                 cb_data->cl_data->menu_bar_vector,