Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-252
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-253
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-254
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-255
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-256
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-257
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-258
   Clean up lisp/gnus/ChangeLog a bit

 * emacs@sv.gnu.org/emacs--devo--0--patch-259
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-260
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-261
   lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t

 * emacs@sv.gnu.org/emacs--devo--0--patch-262
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-96
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-97
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-98
   Update from CVS

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

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term/mac-win.el
Simple merge

diff --cc lisp/tool-bar.el
index 023b90a,37d6044..e58114e
--- 1/lisp/tool-bar.el
--- 2/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@@ -228,62 -228,62 +228,67 @@@ holds a keymap.
  
  ;;; Set up some global items.  Additions/deletions up for grabs.
  
 -(defun tool-bar-setup ()
 -  ;; People say it's bad to have EXIT on the tool bar, since users
 -  ;; might inadvertently click that button.
 -  ;;(tool-bar-add-item-from-menu 'save-buffers-kill-emacs "exit")
 -  (tool-bar-add-item-from-menu 'find-file "new")
 -  (tool-bar-add-item-from-menu 'menu-find-file-existing "open")
 -  (tool-bar-add-item-from-menu 'dired "diropen")
 -  (tool-bar-add-item-from-menu 'kill-this-buffer "close")
 -  (tool-bar-add-item-from-menu 'save-buffer "save" nil
 -                             :visible '(or buffer-file-name
 -                                           (not (eq 'special
 -                                                    (get major-mode
 -                                                         'mode-class)))))
 -  (tool-bar-add-item-from-menu 'write-file "saveas" nil
 -                             :visible '(or buffer-file-name
 -                                           (not (eq 'special
 -                                                    (get major-mode
 -                                                         'mode-class)))))
 -  (tool-bar-add-item-from-menu 'undo "undo" nil
 -                             :visible '(not (eq 'special (get major-mode
 -                                                              'mode-class))))
 -  (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [cut])
 -                             "cut" nil
 -                             :visible '(not (eq 'special (get major-mode
 -                                                              'mode-class))))
 -  (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [copy])
 -                             "copy")
 -  (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [paste])
 -                             "paste" nil
 -                             :visible '(not (eq 'special (get major-mode
 -                                                              'mode-class))))
 -  (tool-bar-add-item-from-menu 'nonincremental-search-forward "search")
 -  ;;(tool-bar-add-item-from-menu 'ispell-buffer "spell")
 -
 -  ;; There's no icon appropriate for News and we need a command rather
 -  ;; than a lambda for Read Mail.
 +(defvar tool-bar-setup nil
 +  "t if the tool-bar has been set up by `tool-bar-setup'.")
 +
 +(defun tool-bar-setup (&optional frame)
 +  (unless tool-bar-setup
 +    (with-selected-frame (or frame (selected-frame))
 +      ;; People say it's bad to have EXIT on the tool bar, since users
 +      ;; might inadvertently click that button.
 +      ;;(tool-bar-add-item-from-menu 'save-buffers-kill-emacs "exit")
 +      (tool-bar-add-item-from-menu 'find-file "new")
 +      (tool-bar-add-item-from-menu 'menu-find-file-existing "open")
 +      (tool-bar-add-item-from-menu 'dired "diropen")
 +      (tool-bar-add-item-from-menu 'kill-this-buffer "close")
 +      (tool-bar-add-item-from-menu 'save-buffer "save" nil
 +                                 :visible '(or buffer-file-name
 +                                               (not (eq 'special
 +                                                        (get major-mode
 +                                                             'mode-class)))))
 +      (tool-bar-add-item-from-menu 'write-file "saveas" nil
 +                                 :visible '(or buffer-file-name
 +                                               (not (eq 'special
 +                                                        (get major-mode
 +                                                             'mode-class)))))
 +      (tool-bar-add-item-from-menu 'undo "undo" nil
 +                                 :visible '(not (eq 'special (get major-mode
 +                                                                  'mode-class))))
 +      (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [cut])
 +                                 "cut" nil
 +                                 :visible '(not (eq 'special (get major-mode
 +                                                                  'mode-class))))
 +      (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [copy])
 +                                 "copy")
 +      (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [paste])
 +                                 "paste" nil
 +                                 :visible '(not (eq 'special (get major-mode
 +                                                                  'mode-class))))
 +      (tool-bar-add-item-from-menu 'nonincremental-search-forward "search")
 +      ;;(tool-bar-add-item-from-menu 'ispell-buffer "spell")
 +
 +      ;; There's no icon appropriate for News and we need a command rather
 +      ;; than a lambda for Read Mail.
-       ;;(tool-bar-add-item-from-menu 'compose-mail "mail/compose")
+   ;;(tool-bar-add-item-from-menu 'compose-mail "mail/compose")
  
-       (tool-bar-add-item-from-menu 'print-buffer "print")
-       (tool-bar-add-item "preferences" 'customize 'customize
-                        :help "Edit preferences (customize)")
+   (tool-bar-add-item-from-menu 'print-buffer "print")
  
-       (tool-bar-add-item "help" (lambda ()
-                                 (interactive)
-                                 (popup-menu menu-bar-help-menu))
-                        'help
-                        :help "Pop up the Help menu")
+   ;; tool-bar-add-item-from-menu itself operates on
+   ;; (default-value 'tool-bar-map), but when we don't use that function,
+   ;; we must explicitly operate on the default value.
  
-       (setq tool-bar-setup t))))
+   (let ((tool-bar-map (default-value 'tool-bar-map)))
+     (tool-bar-add-item "preferences" 'customize 'customize
+                      :help "Edit preferences (customize)")
+ 
+     (tool-bar-add-item "help" (lambda ()
+                               (interactive)
+                               (popup-menu menu-bar-help-menu))
+                      'help
+                      :help "Pop up the Help menu"))
 -  )
++  (setq tool-bar-setup t))))
  
--(provide 'tool-bar)
  
++(provide 'tool-bar)
  ;;; arch-tag: 15f30f0a-d0d7-4d50-bbb7-f48fd0c8582f
  ;;; tool-bar.el ends here

diff --cc man/emacs.texi
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/macfns.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/macterm.h
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xmenu.c
Simple merge