Merge changes from emacs-23 branch

20 files changed, 99 insertions, 46 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 61e05aaf332..71de76e4d91 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-12  Glenn Morris  <rgm@gnu.org>
+
+        * sc.texi (Getting Connected): Remove old index entries.
+
+2011-02-12  Ulrich Mueller <ulm@gentoo.org>
+
+        * url.texi: Remove duplicate @dircategory (Bug#7942).
+
 2011-02-09  Paul Eggert  <eggert@cs.ucla.edu>
 
         * texinfo.tex: Update to version 2011-02-07.16.
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index 621d78b962f..a05eefc3371 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -751,8 +751,6 @@ interface specifications, or if you are writing or maintaining an MUA,
 @cindex .emacs file
 @findex sc-cite-original
 @findex cite-original (sc-)
-@findex sc-submit-bug-report
-@findex submit-bug-report (sc-)
 The first thing that everyone should do, regardless of the MUA you are
 using is to set up Emacs so it will load Supercite at the appropriate
 time.  This happens automatically if Supercite is distributed with your
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 5bfa96ec673..d337c82494c 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -12,7 +12,6 @@
 \overfullrule=0pt
 %\global\baselineskip 30pt      % for printing in double space
 @end tex
-@dircategory World Wide Web
 @dircategory Emacs
 @direntry
 * URL: (url).                   URL loading package.
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 142ece63f36..4b02d9b1d08 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -386,7 +386,7 @@
         * srecode/doc-default.srt (section-comment, function-comment)
         (variable-same-line-comment, group-comment-start, group-comment-end):
         * srecode/doc-java.srt (function-comment, variable-same-line-comment)
-        (group-comment-start, gropu-comment-end):
+        (group-comment-start, group-comment-end):
         Fix typos in template docstrings.
 
 2010-01-14  Kenichi Handa  <handa@m17n.org>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0529bc00f1..a3fa53b1b7a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2011-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/cl-seq.el (union, nunion, intersection)
+        (nintersection, set-difference, nset-difference)
+        (set-exclusive-or, nset-exclusive-or): Doc fix.
+
+        * ediff-ptch.el (ediff-fixup-patch-map): Doc fix.
+
+2011-02-08  Glenn Morris  <rgm@gnu.org>
+
+        * faces.el (face-attr-match-p): Handle the obsolete :bold and
+        :italic props, so that frame-set-background-mode works.  (Bug#7966)
+
+2011-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * simple.el (next-error): Doc fix.
+
 2011-02-12  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
         * dired-aux.el (dired-create-files): Adapt destination name to
@@ -1651,7 +1668,7 @@
         (rmail-mime-insert-text): Call rmail-mime-insert-decoded-text.
         (rmail-mime-insert-image): Argument changed.  Caller changed.
         (rmail-mime-image): Call rmail-mime-toggle-hidden.
-        (rmail-mime-set-bulk-data): New funciton.
+        (rmail-mime-set-bulk-data): New function.
         (rmail-mime-insert-bulk): Argument changed.
         (rmail-mime-multipart-handler): Return t.
         (rmail-mime-process-multipart): Argument changed.
@@ -4145,7 +4162,7 @@
         is indented differently if it is after a begin..end clock.
         (verilog-in-attribute-p, verilog-skip-backward-comments)
         (verilog-skip-forward-comment-p): Support proper treatment of
-        attributes by indent code. Reported by Jeff Steele.
+        attributes by indent code.  Reported by Jeff Steele.
         (verilog-in-directive-p): Fix comment to correctly describe function.
         (verilog-backward-up-list, verilog-in-struct-region-p)
         (verilog-backward-token, verilog-in-struct-p)
@@ -4156,9 +4173,9 @@
         (verilog-property-re, verilog-endcomment-reason-re)
         (verilog-beg-of-statement, verilog-set-auto-endcomments)
         (verilog-calc-1 ): Fix for assert a; else b; indentation (new form
-        of if). Reported by Max Bjurling and
+        of if).  Reported by Max Bjurling and
         (verilog-calc-1): Fix for clocking block in modport
-        declaration. Reported by Brian Hunter.
+        declaration.  Reported by Brian Hunter.
 
 2010-10-24  Wilson Snyder  <wsnyder@wsnyder.org>
 
@@ -4174,7 +4191,7 @@
         (verilog-read-always-signals-recurse, verilog-read-decls): Fix not
         treating `elsif similar to `endif inside AUTOSENSE.
         (verilog-do-indent): Implement correct automatic or static task or
-        function end comment highlight. Reported by Steve Pearlmutter.
+        function end comment highlight.  Reported by Steve Pearlmutter.
         (verilog-font-lock-keywords-2): Fix highlighting of single
         character pins, bug264.  Reported by Michael Laajanen.
         (verilog-auto-inst, verilog-read-decls, verilog-read-sub-decls)
@@ -4185,7 +4202,7 @@
         Reported by Mark Johnson.
         (verilog-auto-tieoff, verilog-auto-tieoff-ignore-regexp):
         Add 'verilog-auto-tieoff-ignore-regexp' for AUTOTIEOFF,
-        bug269. Suggested by Gary Delp.
+        bug269.  Suggested by Gary Delp.
         (verilog-mode-map, verilog-preprocess, verilog-preprocess-history)
         (verilog-preprocessor, verilog-set-compile-command):
         Create verilog-preprocess and verilog-preprocessor to show
@@ -4193,7 +4210,7 @@
         (verilog-get-beg-of-line, verilog-get-end-of-line)
         (verilog-modi-file-or-buffer, verilog-modi-name)
         (verilog-modi-point, verilog-within-string): Move defmacro's
-        before first use to avoid warning. Reported by Steve Pearlmutter.
+        before first use to avoid warning.  Reported by Steve Pearlmutter.
         (verilog-colorize-buffer, verilog-colorize-include-files-buffer)
         (verilog-colorize-region, verilog-highlight-buffer)
         (verilog-highlight-includes, verilog-highlight-modules)
@@ -4225,7 +4242,7 @@
         (verilog-alw-get-temps, verilog-auto-reset)
         (verilog-auto-sense-sigs, verilog-read-always-signals)
         (verilog-read-always-signals-recurse): Fix loop indexes being
-        AUTORESET. AUTORESET now assumes any variables in the
+        AUTORESET.  AUTORESET now assumes any variables in the
         initialization section of a for() should be ignored.
         Reported by Dan Dever.
         (verilog-error-font-lock-keywords)
diff --git a/lisp/dired.el b/lisp/dired.el
index 3a76398e956..debf539ddb9 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3570,7 +3570,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 ;;;;;;  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 --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 2d3b228cbd4..9880e2918b0 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1797,7 +1797,7 @@ Replace with \"%s\"? " original replace)
        (let ((found nil) (start (point)) (msg nil) (ms nil))
          (while (and (not msg)
                      (re-search-forward
-                      ;; Ignore manual page refereces like
+                      ;; Ignore manual page references like
                       ;; git-config(1).
                       "[^-([`':a-zA-Z]\\(\\w+[:-]\\(\\w\\|\\s_\\)+\\)[^](']"
                       e t))
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index e10dc10447c..8e192a18459 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -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" "\
@@ -1080,7 +1080,7 @@ Keywords supported:  :key
 
 (autoload 'union "cl-seq" "\
 Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 
@@ -1090,7 +1090,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'nunion "cl-seq" "\
 Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 
@@ -1100,7 +1100,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'intersection "cl-seq" "\
 Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 
@@ -1110,7 +1110,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'nintersection "cl-seq" "\
 Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 
@@ -1120,7 +1120,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'set-difference "cl-seq" "\
 Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 
@@ -1130,7 +1130,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'nset-difference "cl-seq" "\
 Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 
@@ -1140,7 +1140,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'set-exclusive-or "cl-seq" "\
 Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 
@@ -1150,7 +1150,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'nset-exclusive-or "cl-seq" "\
 Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index fcd21b73de7..1c578556835 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -770,7 +770,7 @@ Return the sublist of LIST whose car matches.
 ;;;###autoload
 (defun union (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 \nKeywords supported:  :test :test-not :key
@@ -791,7 +791,7 @@ to avoid corrupting the original LIST1 and LIST2.
 ;;;###autoload
 (defun nunion (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 \nKeywords supported:  :test :test-not :key
@@ -802,7 +802,7 @@ whenever possible.
 ;;;###autoload
 (defun intersection (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 \nKeywords supported:  :test :test-not :key
@@ -825,7 +825,7 @@ to avoid corrupting the original LIST1 and LIST2.
 ;;;###autoload
 (defun nintersection (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 \nKeywords supported:  :test :test-not :key
@@ -835,7 +835,7 @@ whenever possible.
 ;;;###autoload
 (defun set-difference (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 \nKeywords supported:  :test :test-not :key
@@ -855,7 +855,7 @@ to avoid corrupting the original LIST1 and LIST2.
 ;;;###autoload
 (defun nset-difference (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 \nKeywords supported:  :test :test-not :key
@@ -866,7 +866,7 @@ whenever possible.
 ;;;###autoload
 (defun set-exclusive-or (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 \nKeywords supported:  :test :test-not :key
@@ -879,7 +879,7 @@ to avoid corrupting the original LIST1 and LIST2.
 ;;;###autoload
 (defun nset-exclusive-or (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 \nKeywords supported:  :test :test-not :key
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 3bdd9565fb5..267317594b1 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -246,7 +246,7 @@
 ;; [C-d] Moves (i.e. deletes and inserts) a single character to the
 ;;       global mark.
 ;; [backspace] deletes the character before the global mark, while
-;; [delete] deltes the character after the global mark.
+;; [delete] deletes the character after the global mark.
 
 ;; [S-C-space] Jumps to and cancels the global mark.
 ;; [C-u S-C-space] Cancels the global mark (stays in current buffer).
diff --git a/lisp/faces.el b/lisp/faces.el
index 2a0badab370..11c4108644a 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1577,13 +1577,25 @@ Optional parameter FRAME is the frame whose definition of FACE
 is used.  If nil or omitted, use the selected frame."
   (unless frame
     (setq frame (selected-frame)))
-  (let ((list face-attribute-name-alist)
-        (match t))
+  (let* ((list face-attribute-name-alist)
+         (match t)
+         (bold (and (plist-member attrs :bold)
+                    (not (plist-member attrs :weight))))
+         (italic (and (plist-member attrs :italic)
+                      (not (plist-member attrs :slant))))
+         (plist (if (or bold italic)
+                    (copy-sequence attrs)
+                  attrs)))
+    ;; Handle the Emacs 20 :bold and :italic properties.
+    (if bold
+        (plist-put plist :weight (if bold 'bold 'normal)))
+    (if italic
+        (plist-put plist :slant (if italic 'italic 'normal)))
     (while (and match list)
       (let* ((attr (caar list))
              (specified-value
-              (if (plist-member attrs attr)
-                  (plist-get attrs attr)
+              (if (plist-member plist attr)
+                  (plist-get plist attr)
                 'unspecified))
              (value-now (face-attribute face attr frame)))
         (setq match (equal specified-value value-now))
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 381ae544b24..4882032f284 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -6088,7 +6088,7 @@
         (nntp-retrieve-groups): Ditto for groups.
         (nntp-retrieve-articles): Ditto for articles.
         (*): Replaced nntp-possibly-change-group calls to
-        nntp-with-open-group forms in all, but one, occurrance.
+        nntp-with-open-group forms in all, but one, occurrence.
         (nntp-accept-process-output): Bug fix.  Detect when called with
         null process.
 
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 2abfea9ac6b..69ca927d5e7 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -3499,7 +3499,7 @@
 
 2003-05-08  Satyaki Das  <satyakid@stanford.edu>
 
-        * mh-seq.el (mh-translate-range): Take into account differnt
+        * mh-seq.el (mh-translate-range): Take into account different
         semantics of split-string in Emacs and XEmacs.
         (mh-read-pick-regexp, mh-narrow-to-from, mh-narrow-to-cc)
         (mh-narrow-to-to, mh-narrow-to-header-field)
diff --git a/lisp/simple.el b/lisp/simple.el
index f19525aba4c..4d2a0e69836 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -304,8 +304,8 @@ runs `next-error-hook' with `run-hooks', and stays with that buffer
 until you use it in some other buffer which uses Compilation mode
 or Compilation Minor mode.
 
-See variables `compilation-parse-errors-function' and
-\`compilation-error-regexp-alist' for customization ideas."
+To control which errors are matched, customize the variable
+`compilation-error-regexp-alist'."
   (interactive "P")
   (if (consp arg) (setq reset t arg nil))
   (when (setq next-error-last-buffer (next-error-find-buffer))
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index f75d8b57909..79df6135806 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1957,7 +1957,7 @@ both ends."
                          ((equal char ?\C-g)
                           (keyboard-quit))
                          ((member char '(?o ?O))
-                          ;; Select a differnt macro
+                          ;; Select a different macro
                           (let* ((nc (reftex-index-select-phrases-macro 2))
                                  (macro-data
                                   (cdr (assoc nc reftex-index-phrases-macro-data)))
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 2aea75aa427..cadcdec29b4 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -306,7 +306,7 @@ buffers."
   (nth 3 elt))
 (defsubst ediff-get-session-objC (elt)
   (nth 4 elt))
-;; Take the "name" component of the object into acount. ObjA/C/B is of the form
+;; Take the "name" component of the object into account. ObjA/C/B is of the form
 ;; (name . equality-indicator)
 (defsubst ediff-get-session-objA-name (elt)
   (car (nth 2 elt)))
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 468d12057ab..d930a1bec69 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -417,7 +417,7 @@ Ediff has inferred that
 are two possible targets for applying the patch.
 Both files seem to be plausible alternatives.
 
-Please advice:
+Please advise:
     Type `y' to use %s as the target;
     Type `n' to use %s as the target.
 "
diff --git a/src/ChangeLog b/src/ChangeLog
index 4469297e32f..c677288ad3e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+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__.
@@ -1610,7 +1627,7 @@
 
         * gtkutil.c (menubar_map_cb): New function (Bug#7425).
         (xg_update_frame_menubar): Connect signal map to menubar_map_cb.
-        Use 23 as menubar height if 0. (Bug#7425).
+        Use 23 as menubar height if 0.  (Bug#7425).
 
 2010-11-26  Eli Zaretskii  <eliz@gnu.org>
 
@@ -2617,7 +2634,7 @@
         is more portable.
 
         * keyboard.c (gobble_input): Move call of xd_read_queued_messages ...
-        (kbd_buffer_get_event): ... here. This is needed for cygwin, which
+        (kbd_buffer_get_event): ... here.  This is needed for cygwin, which
         has not defined SIGIO.
 
 2010-10-08  Chong Yidong  <cyd@stupidchicken.com>
diff --git a/src/nsterm.m b/src/nsterm.m
index e83b14748df..590a76ba16d 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5783,6 +5783,7 @@ ns_term_shutdown (int sig)
   win = nwin;
   condemned = NO;
   pixel_height = NSHeight (r);
+  if (pixel_height == 0) pixel_height = 1;
   min_portion = 20 / pixel_height;
 
   frame = XFRAME (XWINDOW (win)->frame);
@@ -5812,6 +5813,7 @@ ns_term_shutdown (int sig)
   NSTRACE (EmacsScroller_setFrame);
 /*  BLOCK_INPUT; */
   pixel_height = NSHeight (newRect);
+  if (pixel_height == 0) pixel_height = 1;
   min_portion = 20 / pixel_height;
   [super setFrame: newRect];
   [self display];
diff --git a/src/window.c b/src/window.c
index abf01758c3f..b158073a3db 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3517,7 +3517,7 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap)
       record_buffer (w->buffer);
     }
 
-  if (EQ (window, selected_window))
+  if (EQ (window, selected_window) && !inhibit_point_swap)
     return window;
 
   sf = SELECTED_FRAME ();