Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 866-879)

   - Merge multi-tty branch
   - Update from CVS
   - Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257

2 files changed, 8 insertions, 9 deletions

diff --git a/lisp/obsolete/hilit19.el b/lisp/obsolete/hilit19.el
index c29d4fad3dd..9221753a864 100644
--- a/lisp/obsolete/hilit19.el
+++ b/lisp/obsolete/hilit19.el
@@ -665,9 +665,9 @@ The optional 5th arg, PROP is a property to set instead of 'hilit."
   (or quietly hilit-quietly (message "Unhighlighting"))
   (let ((lstart 0))
     (while (and start (> start lstart) (< start end))
-      (mapcar (function (lambda (ovr)
-			  (and (overlay-get ovr 'hilit) (delete-overlay ovr))))
-	      (overlays-at start))
+      (mapc (function (lambda (ovr)
+			(and (overlay-get ovr 'hilit) (delete-overlay ovr))))
+	    (overlays-at start))
       (setq lstart start start (next-overlay-change start))))
   (or quietly hilit-quietly (message "Done unhighlighting")))
 
@@ -1023,11 +1023,11 @@ See the variable hilit-mode-enable-list.
 
 Takes optional arguments PARSE-FN and CASE-FOLD."
   ;; change pattern
-  (mapcar (function (lambda (p)
-		      (and (stringp (car p))
-			   (null (nth 1 p))
-			   (setcar (cdr p) 0))))
-	  patterns)
+  (mapc (function (lambda (p)
+		    (and (stringp (car p))
+			 (null (nth 1 p))
+			 (setcar (cdr p) 0))))
+	patterns)
   (setq patterns (cons case-fold patterns))
 
   (or (consp modelist) (setq modelist (list modelist)))
diff --git a/lisp/obsolete/sun-fns.el b/lisp/obsolete/sun-fns.el
index 2f95d5011c1..1b6a5d239bd 100644
--- a/lisp/obsolete/sun-fns.el
+++ b/lisp/obsolete/sun-fns.el
@@ -385,7 +385,6 @@ relative X divided by window width."
   )
 
 (defmenu emacs-quit-menu
-  ("Suspend" suspend-emacstool)
   ("Quit" save-buffers-kill-emacs))
 
 (defmenu emacs-menu