From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 13 Feb 2011 00:16:28 +0000 (-0500)
Subject: Merge changes from emacs-23 branch
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~908
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e730aabed55f3b65020672f1d58afc55fda4eef2;p=emacs.git

Merge changes from emacs-23 branch
---

e730aabed55f3b65020672f1d58afc55fda4eef2
diff --cc lisp/dired.el
index 3a76398e956,3a76398e956..debf539ddb9
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@@ -3570,7 -3570,7 +3570,7 @@@ Ask means pop up a menu for the user t
  ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
  ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
  ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
--;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "9f5fc434fa6c2607b6e66060862c9caf")
++;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "e66465bcd1687d66cfb1202c9963d567")
  ;;; Generated autoloads from dired-aux.el
  
  (autoload 'dired-diff "dired-aux" "\
diff --cc lisp/emacs-lisp/cl-loaddefs.el
index e10dc10447c,4ce8e9eec65..8e192a18459
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@@ -754,7 -754,7 +754,7 @@@ surrounded by (block NAME ...)
  ;;;;;;  find nsubstitute-if-not nsubstitute-if nsubstitute substitute-if-not
  ;;;;;;  substitute-if substitute delete-duplicates remove-duplicates
  ;;;;;;  delete-if-not delete-if delete* remove-if-not remove-if remove*
--;;;;;;  replace fill reduce) "cl-seq" "cl-seq.el" "43e0c1183e738e1e1038cdd84fde8366")
++;;;;;;  replace fill reduce) "cl-seq" "cl-seq.el" "df375ddc313f0c1c262cacab5cffd3e4")
  ;;; Generated autoloads from cl-seq.el
  
  (autoload 'reduce "cl-seq" "\
diff --cc src/ChangeLog
index 4469297e32f,4e6dd9e1de1..c677288ad3e
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,26 +1,20 @@@
 -2011-02-12  Eli Zaretskii  <eliz@gnu.org>
 -
 -	* terminal.c (create_terminal): Use default-keyboard-coding-system
 -	and default-terminal-coding-system to initialize coding systems of
 -	the new terminal.  (Bug#7840)
 -
+ 2011-02-12  Martin Rudalics  <rudalics@gmx.at>
+ 
+ 	* window.c (select_window): Check inhibit_point_swap argument when
+ 	deciding whether to return immediately.
+ 
+ 2011-02-12  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+ 	* nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
+ 	zero (Bug#7348).
+ 
+ 2011-02-12  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* config.in (TERMINFO): New definition.
+ 
+ 	* s/netbsd.h: Use it to choose between terminfo and termcap
+ 	(Bug#7642).
+ 
  2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
  
  	* md5.c (md5_process_bytes): Use sizeof, not __alignof__.