stil not compiling

17 files changed, 672 insertions, 219 deletions

diff --git a/ChangeLog b/ChangeLog
index 57f1bec65ac..30a431363cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-19  Tassilo Horn  <tsdh@gnu.org>
+
+        * doc/emacs/misc.texi (DocView Slicing): Document new slice from
+        BoundingBox feature.
+
 2012-09-18  Jan Djärv  <jan.h.d@swipnet.se>
 
         * configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.
diff --git a/autogen/configure b/autogen/configure
index 4c6fa8b5cf7..3c53c7f1538 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -10567,6 +10567,7 @@ $as_echo "#define HAVE_GTK3 1" >>confdefs.h
 
      GTK_OBJ=emacsgtkfixed.o
      term_header=gtkutil.h
+     USE_GTK_TOOLKIT="GTK3"
   else
      check_gtk2=yes
      gtk3_pkg_errors="$GTK_PKG_ERRORS "
@@ -10634,6 +10635,7 @@ $as_echo "no" >&6; }
   then
     as_fn_error "$gtk3_pkg_errors$GTK_PKG_ERRORS" "$LINENO" 5
   fi
+  test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2"
 fi
 
 if test x"$pkg_check_gtk" = xyes; then
@@ -24293,7 +24295,7 @@ fi
 #### It makes printing result more understandable as using GTK sets
 #### toolkit_scroll_bars to yes by default.
 if test "${HAVE_GTK}" = "yes"; then
-  USE_X_TOOLKIT=GTK
+  USE_X_TOOLKIT="$USE_GTK_TOOLKIT"
 fi
 
 echo "
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 35e635eec28..29c0b3cd1be 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-19  Chong Yidong  <cyd@gnu.org>
+
+        * killing.texi (Yanking): Minor clarification (Bug#12469).
+
 2012-09-17  Chong Yidong  <cyd@gnu.org>
 
         * building.texi (GDB User Interface Layout): Remove reference to
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index a034c6168aa..1eb53d0d2ec 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -289,7 +289,7 @@ e.g. @kbd{C-u 4 C-y} reinserts the fourth most recent kill.
 
   On graphical displays, @kbd{C-y} first checks if another application
 has placed any text in the system clipboard more recently than the
-last Emacs kill.  If so, it inserts the text in the clipboard instead.
+last Emacs kill.  If so, it inserts the clipboard's text instead.
 Thus, Emacs effectively treats ``cut'' or ``copy'' clipboard
 operations performed in other applications like Emacs kills, except
 that they are not recorded in the kill ring.  @xref{Cut and Paste},
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 90072d19a69..5d7a51a01f5 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -411,6 +411,10 @@ m} (@code{doc-view-set-slice-using-mouse}), where you use the mouse to
 select the slice.
 @c ??? How does this work?
 
+  The most convenient way is to set the optimal slice by using
+BoundingBox information automatically determined from the document by
+typing @kbd{s b} (@code{doc-view-set-slice-using-mouse}).
+
 @findex doc-view-reset-slice
   To cancel the selected slice, type @kbd{s r}
 (@code{doc-view-reset-slice}).  Then DocView shows the entire page
diff --git a/etc/NEWS b/etc/NEWS
index 15c06181a9a..b63430b0803 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -439,6 +439,9 @@ Use `Buffer-menu-name-width' and `Buffer-menu-size-width' instead.
 
 ** Calendar
 
+*** You can customize the header text that appears above each calendar month.
+See the variable `calendar-month-header'.
+
 *** The calendars produced by cal-html include holidays.
 Customize cal-html-holidays to change this.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8036e819d4d..d2266f9952f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,47 @@
+2012-09-19  Juri Linkov  <juri@jurta.org>
+
+        * dired-aux.el (dired-diff): Add (require 'diff) because
+        `diff-latest-backup-file' is not autoloaded.
+        (dired-do-chxxx, dired-do-chmod): Set `no-error-if-not-filep' arg
+        of `dired-get-filename' to t to not report error when there is
+        no default file on the current line.
+
+2012-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/macroexp.el (macroexp--funcall-if-compiled): Rename from
+        macroexp--eval-if-compile.
+        (macroexp--funcall-and-return, macroexp--warn-and-return): New funs.
+        (macroexp--expand-all): Use them (bug#12371).
+
+        * doc-view.el (doc-view-guess-paper-size)
+        (doc-view-scale-bounding-box): Fix unbound `caddr'.
+
+2012-09-19  Tassilo Horn  <tsdh@gnu.org>
+
+        New feature: set optimal slice from BoundingBox information.
+        * doc-view.el (doc-view-mode-map): Add keybinding.
+        (doc-view-menu): Add menu entry.
+        (doc-view-set-slice): Adapt docstring.
+        (doc-view-get-bounding-box, doc-view-guess-paper-size)
+        (doc-view-scale-bounding-box)
+        (doc-view-set-slice-from-bounding-box): New functions.
+        (doc-view-paper-sizes): New defvar.
+
+2012-09-19  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/macroexp.el (byte-compile-warn-obsolete)
+        (byte-compile-log-warning): Autoload.  (Bug#12371)
+
+        * calendar/calendar.el (calendar-american-month-header)
+        (calendar-european-month-header, calendar-iso-month-header)
+        (calendar-month-header): New options.
+        (calendar-set-date-style): Set calendar-month-header.  Redraw calendar.
+        (calendar-generate-month): Use calendar-month-header.  (Bug#9510)
+
+2012-09-19  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * startup.el (command-line-ns-option-alist): Add -g and --geometry.
+
 2012-09-18  Juri Linkov  <juri@jurta.org>
 
         * dired-aux.el (dired-diff): Restore original functionality of
@@ -143,8 +187,8 @@
         (display-buffer-function): Mark as obsolete.
 
         * progmodes/compile.el (compilation-parse-errors): Accept list
-        values similar to font-lock-keywords (Bug#12136).  Suggested by
-        Oleksandr Manzyuk.
+        values similar to font-lock-keywords (Bug#12136).
+        Suggested by Oleksandr Manzyuk.
         (compilation-error-regexp-alist): Doc fix.
 
 2012-09-15  Glenn Morris  <rgm@gnu.org>
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index cdbf8d7aa86..93ef440541e 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -921,6 +921,64 @@ styles."
                                    calendar-american-date-display-form)
   :group 'calendar)
 
+(defcustom calendar-american-month-header
+  '(propertize (format "%s %d" (calendar-month-name month) year)
+               'font-lock-face 'font-lock-function-name-face)
+  "Default format for calendar month headings with the American date style.
+Normally you should not customize this, but `calender-month-header'."
+  :group 'calendar
+  :risky t
+  :type 'sexp
+  :version "24.3")
+
+(defcustom calendar-european-month-header
+  '(propertize (format "%s %d" (calendar-month-name month) year)
+               'font-lock-face 'font-lock-function-name-face)
+  "Default format for calendar month headings with the European date style.
+Normally you should not customize this, but `calender-month-header'."
+  :group 'calendar
+  :risky t
+  :type 'sexp
+  :version "24.3")
+
+(defcustom calendar-iso-month-header
+  '(propertize (format "%d %s" year (calendar-month-name month))
+               'font-lock-face 'font-lock-function-name-face)
+  "Default format for calendar month headings with the ISO date style.
+Normally you should not customize this, but `calender-month-header'."
+  :group 'calendar
+  :risky t
+  :type 'sexp
+  :version "24.3")
+
+(defcustom calendar-month-header
+  (cond ((eq calendar-date-style 'iso)
+         calendar-iso-month-header)
+        ((eq calendar-date-style 'european)
+         calendar-european-month-header)
+        (t calendar-american-month-header))
+  "Expression to evaluate to return the calendar month headings.
+When this expression is evaluated, the variables MONTH and YEAR are
+integers appropriate to the relevant month.  The result is padded
+to the width of `calendar-month-digit-width'.
+
+For examples of three common styles, see `calendar-american-month-header',
+`calendar-european-month-header', and `calendar-iso-month-header'.
+
+Changing this variable without using customize has no effect on
+pre-existing calendar windows."
+  :group 'calendar
+  :initialize 'custom-initialize-default
+  :risky t
+  :set (lambda (sym val)
+         (set sym val)
+         (calendar-redraw))
+  :set-after '(calendar-date-style calendar-american-month-header
+                                   calendar-european-month-header
+                                   calendar-iso-month-header)
+  :type 'sexp
+  :version "24.3")
+
 (defun calendar-set-date-style (style)
   "Set the style of calendar and diary dates to STYLE (a symbol).
 The valid styles are described in the documentation of `calendar-date-style'."
@@ -934,8 +992,11 @@ The valid styles are described in the documentation of `calendar-date-style'."
         calendar-date-display-form
         (symbol-value (intern-soft
                        (format "calendar-%s-date-display-form" style)))
+        calendar-month-header
+        (symbol-value (intern-soft (format "calendar-%s-month-header" style)))
         diary-date-forms
         (symbol-value (intern-soft (format "diary-%s-date-forms" style))))
+  (calendar-redraw)
   (calendar-update-mode-line))
 
 (defun european-calendar ()
@@ -1463,9 +1524,8 @@ line."
    (goto-char (point-min))
    (calendar-move-to-column indent)
    (insert
-    (calendar-string-spread
-     (list (format "%s %d" (calendar-month-name month) year))
-     ?\s calendar-month-digit-width))
+    (calendar-string-spread (list calendar-month-header)
+                            ?\s calendar-month-digit-width))
    (calendar-ensure-newline)
    (calendar-insert-at-column indent calendar-intermonth-header trunc)
    ;; Use the first two characters of each day to head the columns.
@@ -2222,9 +2282,12 @@ Negative years are interpreted as years BC; -1 being 1 BC, and so on."
      (- mon2 mon1)))
 
 (defvar calendar-font-lock-keywords
+  ;; Month and year.  Not really needed now that calendar-month-header
+  ;; contains propertize, and not correct for non-american forms
+  ;; of that variable.
   `((,(concat (regexp-opt (mapcar 'identity calendar-month-name-array) t)
               " -?[0-9]+")
-     . font-lock-function-name-face) ; month and year
+     . font-lock-function-name-face)
     (,(regexp-opt
        (list (substring (aref calendar-day-name-array 6)
                         0 calendar-day-header-width)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 7ba67050337..3d3fe491899 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -70,7 +70,7 @@ the string of command switches for the third argument of `diff'."
   (interactive
    (let* ((current (dired-get-filename t))
           ;; Get the latest existing backup file.
-          (oldf (diff-latest-backup-file current))
+          (oldf (progn (require 'diff) (diff-latest-backup-file current)))
           ;; Get the file at the mark.
           (file-at-mark (if (and transient-mark-mode mark-active)
                             (save-excursion (goto-char (mark t))
@@ -248,7 +248,7 @@ List has a form of (file-name full-file-name (attribute-list))."
   ;; ARG describes which files to use, as in `dired-get-marked-files'.
   (let* ((files (dired-get-marked-files t arg))
          ;; The source of default file attributes is the file at point.
-         (default-file (dired-get-filename t))
+         (default-file (dired-get-filename t t))
          (default (when default-file
                     (cond ((eq op-symbol 'touch)
                            (format-time-string
@@ -300,7 +300,7 @@ into the minibuffer."
   (interactive "P")
   (let* ((files (dired-get-marked-files t arg))
          ;; The source of default file attributes is the file at point.
-         (default-file (dired-get-filename t))
+         (default-file (dired-get-filename t t))
          (modestr (when default-file
                     (nth 8 (file-attributes default-file))))
          (default
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 72b36feb1d8..65bf26e5eca 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -3,8 +3,8 @@
 
 ;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
 ;;
-;; Author: Tassilo Horn <tassilo@member.fsf.org>
-;; Maintainer: Tassilo Horn <tassilo@member.fsf.org>
+;; Author: Tassilo Horn <tsdh@gnu.org>
+;; Maintainer: Tassilo Horn <tsdh@gnu.org>
 ;; Keywords: files, pdf, ps, dvi
 
 ;; This file is part of GNU Emacs.
@@ -57,16 +57,21 @@
 ;; pages won't be displayed before conversion of the document finished
 ;; completely.
 ;;
-;; DocView lets you select a slice of the displayed pages.  This slice will be
-;; remembered and applied to all pages of the current document.  This enables
-;; you to cut away the margins of a document to save some space.  To select a
-;; slice you can use `doc-view-set-slice' (bound to `s s') which will query you
-;; for the coordinates of the slice's top-left corner and its width and height.
-;; A much more convenient way to do the same is offered by the command
-;; `doc-view-set-slice-using-mouse' (bound to `s m').  After invocation you
-;; only have to press mouse-1 at the top-left corner and drag it to the
-;; bottom-right corner of the desired slice.  To reset the slice use
-;; `doc-view-reset-slice' (bound to `s r').
+;; DocView lets you select a slice of the displayed pages.  This slice
+;; will be remembered and applied to all pages of the current
+;; document.  This enables you to cut away the margins of a document
+;; to save some space.  To select a slice you can use
+;; `doc-view-set-slice' (bound to `s s') which will query you for the
+;; coordinates of the slice's top-left corner and its width and
+;; height.  A much more convenient way to do the same is offered by
+;; the command `doc-view-set-slice-using-mouse' (bound to `s m').
+;; After invocation you only have to press mouse-1 at the top-left
+;; corner and drag it to the bottom-right corner of the desired slice.
+;; Even more accurate and convenient is to use
+;; `doc-view-set-slice-from-bounding-box' (bound to `s b') which uses
+;; the BoundingBox information of the current page to set an optimal
+;; slice.  To reset the slice use `doc-view-reset-slice' (bound to `s
+;; r').
 ;;
 ;; You can also search within the document.  The command `doc-view-search'
 ;; (bound to `C-s') queries for a search regexp and initializes a list of all
@@ -103,7 +108,6 @@
 ;; - share more code with image-mode.
 ;; - better menu.
 ;; - Bind slicing to a drag event.
-;; - doc-view-fit-doc-to-window and doc-view-fit-window-to-doc?
 ;; - zoom the region around the cursor (like xdvi).
 ;; - get rid of the silly arrow in the fringe.
 ;; - improve anti-aliasing (pdf-utils gets it better).
@@ -340,6 +344,7 @@ Can be `dvi', `pdf', or `ps'.")
     ;; Slicing the image
     (define-key map (kbd "s s")       'doc-view-set-slice)
     (define-key map (kbd "s m")       'doc-view-set-slice-using-mouse)
+    (define-key map (kbd "s b")       'doc-view-set-slice-from-bounding-box)
     (define-key map (kbd "s r")       'doc-view-reset-slice)
     ;; Searching
     (define-key map (kbd "C-s")       'doc-view-search)
@@ -381,6 +386,7 @@ Can be `dvi', `pdf', or `ps'.")
      )
     "---"
     ["Set Slice"                doc-view-set-slice-using-mouse]
+    ["Set Slice (BoundingBox)"  doc-view-set-slice-from-bounding-box]
     ["Set Slice (manual)"       doc-view-set-slice]
     ["Reset Slice"              doc-view-reset-slice]
     "---"
@@ -991,8 +997,9 @@ You can use this function to tell doc-view not to display the
 margins of the document.  It prompts for the top-left corner (X
 and Y) of the slice to display and its WIDTH and HEIGHT.
 
-See `doc-view-set-slice-using-mouse' for a more convenient way to
-do that.  To reset the slice use `doc-view-reset-slice'."
+See `doc-view-set-slice-using-mouse' and
+`doc-view-set-slice-from-bounding-box' for more convenient ways
+to do that.  To reset the slice use `doc-view-reset-slice'."
   (interactive
    (let* ((size (image-size (doc-view-current-image) t))
           (a (read-number (format "Top-left X (0..%d): " (car size))))
@@ -1023,6 +1030,79 @@ dragging it to its bottom-right corner.  See also
           (setq done t))))
     (doc-view-set-slice x y w h)))
 
+(defun doc-view-get-bounding-box ()
+  "Get the BoundingBox information of the current page."
+  (let* ((page (doc-view-current-page))
+         (o (shell-command-to-string
+             (concat doc-view-ghostscript-program
+                     " -dSAFER -dBATCH -dNOPAUSE -q -sDEVICE=bbox "
+                     (format "-dFirstPage=%s -dLastPage=%s %s"
+                             page page
+                             doc-view-buffer-file-name)))))
+    (save-match-data
+      (when (string-match (concat "%%BoundingBox: "
+                                  "\\([[:digit:]]+\\) \\([[:digit:]]+\\) "
+                                  "\\([[:digit:]]+\\) \\([[:digit:]]+\\)") o)
+        (mapcar #'string-to-number
+                (list (match-string 1 o)
+                      (match-string 2 o)
+                      (match-string 3 o)
+                      (match-string 4 o)))))))
+
+(defvar doc-view-paper-sizes
+  '((a4 595 842)
+    (a4-landscape 842 595)
+    (letter 612 792)
+    (letter-landscape 792 612)
+    (legal 612 1008)
+    (legal-landscape 1008 612)
+    (a3 842 1191)
+    (a3-landscape 1191 842)
+    (tabloid 792 1224)
+    (ledger 1224 792))
+  "An alist from paper size names to dimensions.")
+
+(defun doc-view-guess-paper-size (iw ih)
+  "Guess the paper size according to the aspect ratio."
+  (cl-labels ((div (x y)
+                   (round (/ (* 100.0 x) y))))
+    (let ((ar (div iw ih))
+          (al (mapcar (lambda (l)
+                        (list (div (nth 1 l) (nth 2 l)) (car l)))
+                      doc-view-paper-sizes)))
+      (cadr (assoc ar al)))))
+
+(defun doc-view-scale-bounding-box (ps iw ih bb)
+  (list (/ (* (nth 0 bb) iw) (nth 1 (assoc ps doc-view-paper-sizes)))
+        (/ (* (nth 1 bb) ih) (nth 2 (assoc ps doc-view-paper-sizes)))
+        (/ (* (nth 2 bb) iw) (nth 1 (assoc ps doc-view-paper-sizes)))
+        (/ (* (nth 3 bb) ih) (nth 2 (assoc ps doc-view-paper-sizes)))))
+
+(defun doc-view-set-slice-from-bounding-box (&optional force-paper-size)
+  "Set the slice from the document's BoundingBox information.
+The result is that the margins are almost completely cropped,
+much more accurate than could be done manually using
+`doc-view-set-slice-using-mouse'."
+  (interactive "P")
+  (let ((bb (doc-view-get-bounding-box)))
+    (if (not bb)
+        (message "BoundingBox couldn't be determined")
+      (let* ((is (image-size (doc-view-current-image) t))
+             (iw (car is))
+             (ih (cdr is))
+             (ps (or (and (null force-paper-size) (doc-view-guess-paper-size iw ih))
+                     (intern (completing-read "Paper size: "
+                                              (mapcar #'car doc-view-paper-sizes)
+                                              nil t))))
+             (bb (doc-view-scale-bounding-box ps iw ih bb))
+             (x1 (nth 0 bb))
+             (y1 (nth 1 bb))
+             (x2 (nth 2 bb))
+             (y2 (nth 3 bb)))
+        ;; We keep a 2 pixel margin.
+        (doc-view-set-slice (- x1 2) (- ih y2 2)
+                            (+ (- x2 x1) 4) (+ (- y2 y1) 4))))))
+
 (defun doc-view-reset-slice ()
   "Reset the current slice.
 After calling this function whole pages will be visible again."
@@ -1095,7 +1175,9 @@ have the page we want to view."
                                    "page-[0-9]+\\.png" t)
                   'doc-view-sort))
       (dolist (win (or (get-buffer-window-list buffer nil t)
-                       (list (selected-window))))
+                       (list (let ((w (selected-window)))
+                               (set-window-buffer w buffer)
+                               w))))
         (let* ((page (doc-view-current-page win))
                (pagefile (expand-file-name (format "page-%d.png" page)
                                            (doc-view-current-cache-dir))))
@@ -1103,8 +1185,8 @@ have the page we want to view."
                     (and (not (member pagefile prev-pages))
                          (member pagefile doc-view-current-files)))
             (with-selected-window win
-                                  (cl-assert (eq (current-buffer) buffer))
-                                  (doc-view-goto-page page))))))))
+              (cl-assert (eq (current-buffer) buffer) t)
+              (doc-view-goto-page page))))))))
 
 (defun doc-view-buffer-message ()
   ;; Only show this message initially, not when refreshing the buffer (in which
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 394225d697e..6a84be06728 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -100,17 +100,35 @@ each clause."
     (error (message "Compiler-macro error for %S: %S" (car form) err)
            form)))
 
-(defun macroexp--eval-if-compile (&rest _forms)
+(defun macroexp--funcall-if-compiled (_form)
   "Pseudo function used internally by macroexp to delay warnings.
 The purpose is to delay warnings to bytecomp.el, so they can use things
 like `byte-compile-log-warning' to get better file-and-line-number data
 and also to avoid outputting the warning during normal execution."
   nil)
-(put 'macroexp--eval-if-compile 'byte-compile
+(put 'macroexp--funcall-if-compiled 'byte-compile
      (lambda (form)
-       (mapc (lambda (x) (funcall (eval x))) (cdr form))
+       (funcall (eval (cadr form)))
        (byte-compile-constant nil)))
 
+(defun macroexp--funcall-and-return (when-compiled when-interpreted form)
+  ;; FIXME: ¡¡Major Ugly Hack!! To determine whether the output of this
+  ;; macro-expansion will be processed by the byte-compiler, we check
+  ;; circumstantial evidence.
+  (if (member '(declare-function . byte-compile-macroexpand-declare-function)
+              macroexpand-all-environment)
+      `(progn
+         (macroexp--funcall-if-compiled ',when-compiled)
+         ,form)
+    (funcall when-interpreted)
+    form))
+
+(defun macroexp--warn-and-return (msg form)
+  (macroexp--funcall-and-return
+   (lambda () (byte-compile-log-warning msg t))
+   (lambda () (message "%s" msg))
+   form))
+
 (defun macroexp--expand-all (form)
   "Expand all macros in FORM.
 This is an internal version of `macroexpand-all'.
@@ -130,9 +148,10 @@ Assumes the caller has bound `macroexpand-all-environment'."
                      (car-safe form)
                      (symbolp (car form))
                      (get (car form) 'byte-obsolete-info))
-                `(progn (macroexp--eval-if-compile
-                         (lambda () (byte-compile-warn-obsolete ',(car form))))
-                        ,new-form)
+                (macroexp--funcall-and-return
+                 (lambda () (byte-compile-warn-obsolete ',(car form)))
+                 #'ignore      ;FIXME: We should `message' something.
+                 new-form)
               new-form)))
     (pcase form
       (`(cond . ,clauses)
@@ -175,26 +194,16 @@ Assumes the caller has bound `macroexpand-all-environment'."
       ;; First arg is a function:
       (`(,(and fun (or `funcall `apply `mapcar `mapatoms `mapconcat `mapc))
          ',(and f `(lambda . ,_)) . ,args)
-       (byte-compile-log-warning
+       (macroexp--warn-and-return
         (format "%s quoted with ' rather than with #'"
                 (list 'lambda (nth 1 f) '...))
-        t)
-       ;; We don't use `macroexp--cons' since there's clearly a change.
-       (cons fun
-             (cons (macroexp--expand-all (list 'function f))
-                   (macroexp--all-forms args))))
+        (macroexp--expand-all `(,fun ,f . ,args))))
       ;; Second arg is a function:
       (`(,(and fun (or `sort)) ,arg1 ',(and f `(lambda . ,_)) . ,args)
-       (byte-compile-log-warning
+       (macroexp--warn-and-return
         (format "%s quoted with ' rather than with #'"
                 (list 'lambda (nth 1 f) '...))
-        t)
-       ;; We don't use `macroexp--cons' since there's clearly a change.
-       (cons fun
-             (cons (macroexp--expand-all arg1)
-                   (cons (macroexp--expand-all
-                          (list 'function f))
-                         (macroexp--all-forms args)))))
+        (macroexp--expand-all `(,fun ,arg1 ,f . ,args))))
       (`(,func . ,_)
        ;; Macro expand compiler macros.  This cannot be delayed to
        ;; byte-optimize-form because the output of the compiler-macro can
diff --git a/lisp/startup.el b/lisp/startup.el
index db5efb89eed..243c9621752 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -216,8 +216,8 @@ and VALUE is the value which is given to that frame parameter
     ("-fn" 1 x-handle-switch font)
     ("-font" 1 x-handle-switch font)
     ("-ib" 1 x-handle-numeric-switch internal-border-width)
-    ;;("-g" .               x-handle-geometry)
-    ;;("-geometry" .        x-handle-geometry)
+    ("-g" 1 x-handle-geometry)
+    ("-geometry" 1 x-handle-geometry)
     ("-fg" 1 x-handle-switch foreground-color)
     ("-foreground" 1 x-handle-switch foreground-color)
     ("-bg" 1 x-handle-switch background-color)
diff --git a/src/ChangeLog b/src/ChangeLog
index 8b47c52c23f..e8827c2de18 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,294 @@
+2012-09-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * w32inevt.c (w32_console_read_socket): Return -1 on failure, not 0.
+        Ignore 'expected'. See Eli Zaretskii in
+        <http://bugs.gnu.org/12471#8> (last line).
+
+        * frame.c (read_integer): Remove.  All uses replaced by strtol/strtoul.
+        (XParseGeometry): Now static.  Substitute extremal values for
+        values that are out of range.
+
+2012-09-19  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * w32xfns.c (read_integer, XParseGeometry): Move to frame.c.
+
+        * nsfns.m (XParseGeometry): Remove.
+        (Fx_create_frame): Call x_set_offset to correctly interpret
+        top_pos in geometry.
+
+        * frame.c (read_integer, XParseGeometry): Moved from w32xfns.c.
+        (Fx_parse_geometry): If there is a space in string, call
+        Qns_parse_geometry, otherwise do as on other terms (Bug#12368).
+
+2012-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * search.c (scan_buffer): Use character positions in calls to
+        region_cache_forward and region_cache_backward, not byte
+        positions.  (Bug#12196)
+
+        * w32term.c (w32_read_socket): Set pending_signals to 1, like
+        xterm.c does.  Reported by Daniel Colascione <dancol@dancol.org>.
+
+        * ralloc.c (r_alloc_init) [!SYSTEM_MALLOC]: Initialize
+        __malloc_extra_blocks to 32 instead of 64, like alloc.c did in
+        emacs_blocked_malloc, now deleted.
+
+2012-09-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove no-longer-needed Solaris 2.4 vfork bug workaround.
+        The workaround was for improving performance on Solaris 2.4, but
+        is getting in the way now.  Emacs will still work if someone is
+        still running Solaris 2.4 in a museum somewhere; Sun dropped
+        support for Solaris 2.4 in 2003.
+        * callproc.c (Fcall_process) [HAVE_WORKING_VFORK]:
+        * process.c (create_process) [HAVE_WORKING_VFORK]:
+        Omit now-unnecessary workaround for the Solaris 2.4 vfork bug,
+        since Emacs no longer uses vfork on that platform.
+
+2012-09-17  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.c: Use COPYRIGHT.
+
+2012-09-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove configure's --without-sync-input option (Bug#12450).
+        When auditing signal-handling in preparation for cleaning it up,
+        I found that SYNC_INPUT has race conditions and would be a real
+        pain to fix.  Since it's an undocumented and deprecated
+        configure-time option, now seems like a good time to remove it.
+        Also see <http://bugs.gnu.org/11080#16>.
+        * alloc.c (_bytes_used, __malloc_extra_blocks, _malloc_internal)
+        (_free_internal) [!DOUG_LEA_MALLOC]: Remove decls.
+        (alloc_mutex) [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]:
+        (malloc_hysteresis):
+        (check_depth) [XMALLOC_OVERRUN_CHECK]:
+        (MALLOC_BLOCK_INPUT, MALLOC_UNBLOCK_INPUT):
+        (__malloc_hook, __realloc_hook, __free_hook, BYTES_USED)
+        (dont_register_blocks, bytes_used_when_reconsidered)
+        (bytes_used_when_full, emacs_blocked_free, emacs_blocked_malloc)
+        (emacs_blocked_realloc, reset_malloc_hooks, uninterrupt_malloc):
+        [!SYSTEM_MALLOC && !SYNC_INPUT]:
+        Remove. All uses removed.
+        (MALLOC_BLOCK_INPUT, MALLOC_UNBLOCK_INPUT): Use a different
+        implementation, one that depends on whether the new macro
+        XMALLOC_BLOCK_INPUT_CHECK is defined, not on whether SYNC_INPUT
+        is defined.
+        * atimer.c (run_timers, handle_alarm_signal):
+        * keyboard.c (pending_signal, poll_for_input_1, poll_for_input)
+        (handle_async_input, process_pending_signals)
+        (handle_input_available_signal, init_keyboard):
+        * nsterm.m (ns_read_socket):
+        * process.c (wait_reading_process_output):
+        * regex.c (immediate_quit, IMMEDIATE_QUIT_CHECK):
+        * sysdep.c (emacs_sigaction_init) [SA_RESTART]:
+        (emacs_write):
+        * xterm.c (XTread_socket):
+        Assume SYNC_INPUT.
+        * conf_post.h (SA_RESTART) [IRIX6_5]: Do not #undef.
+        * eval.c (handling_signal): Remove.  All uses removed.
+        * lisp.h (ELSE_PENDING_SIGNALS): Remove.
+        All uses replaced with the SYNC_INPUT version.
+        (reset_malloc_hooks, uninterrupt_malloc, handling_signal):
+        Remove decls.
+        * sysdep.c, syssignal.h (main_thread) [FORWARD_SIGNAL_TO_MAIN_THREAD]:
+        Now static.
+
+        * font.c (Ffont_shape_gstring): Remove unused local.
+
+2012-09-16  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (clean): No longer run nextstep's clean.
+
+        * Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
+        (ns_frag): Remove.
+        (ns-app): Move here from ns.mk, and simplify.
+        (clean): Simplify nextstep entry.
+        * ns.mk: Remove file.
+
+2012-09-16  Kenichi Handa  <handa@gnu.org>
+
+        * font.c (Ffont_shape_gstring): Fix previous change; GLYPHs may
+        not covert the last few charactes.
+
+2012-09-16  Kenichi Handa  <handa@gnu.org>
+
+        * font.c (Ffont_shape_gstring): Don't adjust grapheme cluster
+        here, but just check the validity of glyphs in the glyph-string.
+
+2012-09-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fwindow_parameter, Fset_window_parameter): Accept
+        any window as argument (Bug#12452).
+
+2012-09-16  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m (Fx_open_connection): Move initialization of ns_*_types
+        to ns_term_init to avoid memory leak.
+
+        * nsterm.m (ns_update_begin): Initialize bp after lcokFocus, use
+        explicit retain/release.
+        (ns_term_init): Only allow one display.  Initialize outerpool and
+        ns_*_types.
+
+2012-09-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port _setjmp fix to POSIXish hosts as well as Microsoft.
+        * image.c (_setjmp) [!HAVE__SETJMP]: Restore definition, as
+        it's needed on POSIXish hosts that lack _setjmp.  Attempt to solve
+        the Microsoft problem in a different way, by altering ../nt/config.nt.
+
+2012-09-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32xfns.c:
+        * w32uniscribe.c:
+        * w32term.c:
+        * w32select.c:
+        * w32reg.c:
+        * w32proc.c:
+        * w32menu.c:
+        * w32inevt.c:
+        * w32heap.c:
+        * w32font.c:
+        * w32fns.c:
+        * w32console.c:
+        * w32.c:
+        * w16select.c: Remove inclusion of setjmp.h, as it is now included
+        by lisp.h.  This completes removal of setjmp.h inclusion
+        erroneously announced in the previous commit.  (Bug#12446)
+
+        * lisp.h [!HAVE__SETJMP, !HAVE_SIGSETJMP]: Make the commentary
+        more accurate.
+
+        * image.c (_setjmp) [!HAVE__SETJMP]: Define only if 'setjmp' is
+        not defined as a macro.  The latter happens on MS-Windows.
+        (Bug#12446)
+
+2012-09-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port better to POSIX hosts lacking _setjmp (Bug#12446).
+        * lisp.h: Include <setjmp.h> here, since we use its symbols here.
+        Some instances of '#include <setjmp.h>' removed, if the
+        only reason for the instance was because "lisp.h" was included.
+        (sys_jmp_buf, sys_setjmp, sys_longjmp): New symbols.
+        Unless otherwise specified, replace all uses of jmp_buf, _setjmp,
+        and _longjmp with the new symbols.  Emacs already uses _setjmp if
+        available, so this change affects only POSIXish hosts that have
+        sigsetjmp but not _setjmp, such as some versions of Solaris and
+        Unixware.  (Also, POSIX-2008 marks _setjmp as obsolescent.)
+        * image.c (_setjmp, _longjmp) [HAVE_PNG && !HAVE__SETJMP]: New macros.
+        (png_load_body) [HAVE_PNG]:
+        (PNG_LONGJMP) [HAVE_PNG && PNG_LIBPNG_VER < 10500]:
+        (PNG_JMPBUF) [HAVE_PNG && PNG_LIBPNG_VER >= 10500]:
+        Use _setjmp and _longjmp rather than sys_setjmp and sys_longjmp,
+        since PNG requires jmp_buf.  This is the only exception to the
+        general rule that we now use sys_setjmp and sys_longjmp.
+        This exception is OK since this code does not change the signal
+        mask or longjmp out of a signal handler.
+
+2012-09-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]:
+        Include "syssignal.h", for 'main_thread'.
+
+2012-09-14  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Avoid out-of-range marker position (Bug#12426).
+        * insdel.c (replace_range, replace_range_2): Adjust
+        markers before overlays, as suggested by comments.
+        (insert_1_both, insert_from_buffer_1, adjust_after_replace):
+        Remove redundant check before calling offset_intervals.
+
+2012-09-14  Martin Rudalics  <rudalics@gmx.at>
+
+        * xdisp.c (Fformat_mode_line): Unconditionally save/restore
+        current buffer (Bug#12387).
+
+2012-09-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/alloc.$(O)): Update dependencies.
+
+2012-09-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use a more backwards-compatible timer format (Bug#12430).
+        * keyboard.c (decode_timer): Get PSECS from the 8th (origin-0)
+        vector element, not from the 4th, since PSECS is now at the end.
+        (Fcurrent_idle_time): Doc fix.
+
+2012-09-13  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Function to mark objects and remove killed buffers at once.
+        * alloc.c (discard_killed_buffers): Rename to ...
+        (mark_discard_killed buffers) ... new name.  Add marking
+        of remaining objects.  Fix comment.  Adjust users.
+        (mark_object): Do not touch frame buffer lists here.
+        * frame.c (delete_frame): Reset frame buffer lists here.
+
+2012-09-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Better workaround for GNOME bug when --enable-gcc-warnings.
+        * emacsgtkfixed.c (G_STATIC_ASSERT): Remove, undoing last change.
+        Instead, disable -Wunused-local-typedefs.  See Dmitry Antipov in
+        <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00335.html>.
+
+        Simplify SIGIO usage (Bug#12408).
+        The code that dealt with SIGIO was crufty and confusing, e.g., it
+        played tricks like "#undef SIGIO" but these tricks were not used
+        consistently.  Simplify mostly by not #undeffing standard symbols,
+        e.g., use "defined USABLE_SIGIO" (our symbol, which we can define
+        or not as we please) rather than "defined SIGIO" (standard symbol
+        that we probably shouldn't #undef).
+        * conf_post.h [USG5_4]: Do not include <sys/wait.h> here.
+        Modules that need it can include it.
+        [USG5_4 && emacs]: Likewise, do not include the streams stuff here.
+        * dispextern.h (ignore_sigio): New decl.
+        * emacs.c (shut_down_emacs): Invoke unrequest_sigio
+        unconditionally, since it's now a no-op if !USABLE_SIGIO.
+        * emacs.c (shut_down_emacs):
+        * keyboard.c (kbd_buffer_store_event_hold):
+        Use ignore_sigio rather than invoking 'signal' directly.
+        * keyboard.c (USABLE_FIONREAD && USG5_4): Include <sys/filio.h>,
+        for FIONREAD.
+        (FIONREAD, SIGIO): Do not #undef.
+        (tty_read_avail_input): Use #error rather than a syntax error.
+        * process.c [USG5_4]: Include <sys/stream.h> and <sys/stropts.h>,
+        for I_PIPE, used by SETUP_SLAVE_PTY.
+        (DATAGRAM_SOCKETS): Simplify defn, based on USABLE_FIONREAD.
+        * sysdep.c (croak): Remove; no longer needed.  This bit of
+        temporary code, with Fred N. Fish's comment that it's temporary,
+        has been in Emacs since at least 1992!
+        (init_sigio, reset_sigio, request_sigio, unrequest_sigio):
+        Arrange for them to be no-ops in all cases when ! USABLE_SIGIO.
+        * syssignal.h (croak): Remove decl.
+        (SIGIO, SIGPOO, SIGAIO, SIGPTY): Do not #undef; that's too fragile.
+        * systty.h [!NO_TERMIO]: Do not include <termio.h>; no longer needed
+        now that we're termios-only.
+        (FIONREAD, ASYNC) [BROKEN_FIONREAD]: Do not #undef.
+        * term.c (dissociate_if_controlling_tty): Use #error rather than
+        a run-time error.
+
+        Work around GCC and GNOME bugs when --enable-gcc-warnings.
+        * emacsgtkfixed.c (G_STATIC_ASSERT): Redefine to use 'verify',
+        to work around GNOME bug 683906.
+        * image.c (jpeg_load_body) [HAVE_JPEG && lint]: Pacify gcc -Wclobber.
+        (struct my_jpeg_error_mgr) [HAVE_JPEG && lint]: New member fp.
+        This works around GCC bug 54561.
+
+2012-09-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        More fixes for 'volatile' and setjmp/longjmp.
+        * eval.c (Fdefvar, Fcondition_case): Remove unnecessary 'volatile's.
+        * image.c (struct png_load_context) [HAVE_PNG]: New type.
+        (png_load_body) [HAVE_PNG]:
+        (jpeg_load_body) [HAVE_JPEG]:
+        New function, with most of the old parent function's body.
+        (png_load) [HAVE_PNG]:
+        (jpeg_load) [HAVE_JPEG]:
+        Invoke the new function, to avoid longjmp munging our locals.
+        (struct my_jpeg_error_mgr) [HAVE_JPEG]: New members cinfo, failure_code.
+        (my_error_exit) [HAVE_JPEG]: Don't trust 'setjmp' to return 2 when
+        longjmp is passed 2, as the C standard doesn't guarantee this.
+        Instead, store the failure code into mgr->failure_code.
+
 2012-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * keyboard.c (read_char, requeued_events_pending_p, Finput_pending_p)
@@ -212,7 +503,7 @@
         (ns_maybe_dumpglyphs_background): Remove fringe/internal border
         adjustment.
         (ns_dumpglyphs_image): Ditto.
-        (ns_dumpglyphs_stretch): Fix coding style. Remove fringe/internal
+        (ns_dumpglyphs_stretch): Fix coding style.  Remove fringe/internal
         border adjustment.
         (ns_set_vertical_scroll_bar): Remove variables barOnVeryLeft/Right and
         their usage.  Add fringe_extended_p and its use as in other terms.
@@ -293,7 +584,7 @@
         * conf_post.h [SIGNAL_H_AHB]: Do not include <signal.h>;
         no longer needed here.
         * emacs.c (main): Inspect existing signal handler with sigaction,
-        so that there's no need to block and unblock SIGHUP.
+        so that there's no need to block and unblock SIGHUP.
         * sysdep.c (struct save_signal): New member 'action', replacing
         old member 'handler'.
         (save_signal_handlers, restore_signal_handlers):
@@ -820,18 +1111,18 @@
 2012-08-28  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsmenu.m (initWithContentRect:styleMask:backing:defer:): Initialize
-        button_values to NULL. Call setStykeMask so dialogs get a close button.
+        button_values to NULL.  Call setStykeMask so dialogs get a close button.
         (windowShouldClose:): Set window_closed.
         (dealloc): New member, free button_values.
-        (process_dialog:): Make member function. Remove window argument,
-        replace window with self. Count buttons and allocate and store values
+        (process_dialog:): Make member function.  Remove window argument,
+        replace window with self.  Count buttons and allocate and store values
         in button_values.
         (addButton:value:row:): value is int with the name tag.  Call setTag
-        with tag. Remove return self, declare return value as void.
+        with tag.  Remove return self, declare return value as void.
         (addString:row:): Remove return self, declare return value as void.
         (addSplit): Remove return self, declare return value as void.
         (clicked:): Remove return self, declare return value as void.
-        Set dialog_return to button_values[seltag]. Code formatting change.
+        Set dialog_return to button_values[seltag].  Code formatting change.
         (initFromContents:isQuestion:): Adjust call to process_dialog.
         Code formatting change.
         (timeout_handler:): Set timer_fired to YES.
@@ -1166,7 +1457,7 @@
 
         * fontset.c (FONTSET_ADD): Return void, not Lisp_Object.
         Otherwise, the compiler complains about (A?B:C) where B is void
-        and C is Lisp_Object.  This fixes an incompatibility with Sun C 5.12.
+        and C is Lisp_Object.  This fixes an incompatibility with Sun C 5.12.
         (fontset_add): Return void, for FONTSET_ADD.
 
 2012-08-21  Paul Eggert  <eggert@cs.ucla.edu>
@@ -1682,7 +1973,7 @@
         Start main loop and wait for application defined event.
         Inform select thread to stop selecting after main loop is exited.
         (ns_term_init): Create selfds pipe and set non-blocking.
-        Initialize select_mutex. Start the select thread (fd_handler).
+        Initialize select_mutex.  Start the select thread (fd_handler).
         (fd_handler:): Loop forever, wait for info from the main thread
         to either start or stop selecting.  When select returns, send
         and appdefined event.
@@ -1814,7 +2105,7 @@
         (xg_create_tool_bar): Allocate and initialize a xg_frame_tb_info
         if not present.
         (update_frame_tool_bar): Return early if data in xg_frame_tb_info
-        is up to date. Otherwise store new data.
+        is up to date.  Otherwise store new data.
         (free_frame_tool_bar): Free xg_frame_tb_info if present.
 
 2012-08-13  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -1841,7 +2132,7 @@
 2012-08-11  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (not_in_argv): New function.
-        (application:openFile,  application:openTempFile:):
+        (application:openFile, application:openTempFile:):
         (application:openFileWithoutUI:, application:openFiles:): Open file
         if not_in_argv returns non-zero (bug#12171).
 
@@ -3028,7 +3319,7 @@
 
 2012-07-21  Jan Djärv  <jan.h.d@swipnet.se>
 
-        * nsterm.m (accessibilityAttributeValue): New function. (Bug#11134).
+        * nsterm.m (accessibilityAttributeValue): New function.  (Bug#11134).
         (conversationIdentifier): Return value is NSInteger.
         * nsterm.m (accessibilityAttributeValue): Surround with NS_IMPL_COCOA.
 
@@ -5538,7 +5829,7 @@
         * lisp.h (struct vectorlike_header): New field `nbytes',
         adjust comment accordingly.
         * alloc.c (enum mem_type): New type `MEM_TYPE_VECTOR_BLOCK'
-        to denote vector blocks. Adjust users (live_vector_p,
+        to denote vector blocks.  Adjust users (live_vector_p,
         mark_maybe_pointer, valid_lisp_object_p) accordingly.
         (COMMON_MULTIPLE): Move outside #if USE_LSB_TAG.
         (VECTOR_BLOCK_SIZE, vroundup, VECTOR_BLOCK_BYTES),
@@ -5552,7 +5843,7 @@
         (allocate_vector_from_block, init_vectors, allocate_vector_from_block)
         (sweep_vectors): New functions.
         (allocate_vectorlike): Return `zero_vector' as the only vector of
-        0 items. Allocate new vector from block if vector size is less than
+        0 items.  Allocate new vector from block if vector size is less than
         or equal to VBLOCK_BYTES_MAX.
         (Fgarbage_collect): Move all vector sweeping code to sweep_vectors.
         (init_alloc_once): Add call to init_vectors.
@@ -5642,7 +5933,7 @@
         change it's type from Lisp_Object to bitfield.
         Change type of 'force_start', 'optional_new_start',
         'last_had_star', 'update_mode_line' and 'start_at_line_beg'
-        fields from Lisp_Object to bitfield. Adjust users accordingly.
+        fields from Lisp_Object to bitfield.  Adjust users accordingly.
 
 2012-05-31  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/src/frame.c b/src/frame.c
index 6930dac3ce8..f3d16171516 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3897,6 +3897,95 @@ x_default_parameter (struct frame *f, Lisp_Object alist, Lisp_Object prop,
 }
 
 
+#if !defined (HAVE_X_WINDOWS) && defined (NoValue)
+
+/*
+ *    XParseGeometry parses strings of the form
+ *   "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where
+ *   width, height, xoffset, and yoffset are unsigned integers.
+ *   Example:  "=80x24+300-49"
+ *   The equal sign is optional.
+ *   It returns a bitmask that indicates which of the four values
+ *   were actually found in the string.  For each value found,
+ *   the corresponding argument is updated;  for each value
+ *   not found, the corresponding argument is left unchanged.
+ */
+
+static int
+XParseGeometry (char *string,
+                int *x, int *y,
+                unsigned int *width, unsigned int *height)
+{
+  int mask = NoValue;
+  char *strind;
+  unsigned long int tempWidth, tempHeight;
+  long int tempX, tempY;
+  char *nextCharacter;
+
+  if (string == NULL || *string == '\0')
+    return mask;
+  if (*string == '=')
+    string++;  /* ignore possible '=' at beg of geometry spec */
+
+  strind = string;
+  if (*strind != '+' && *strind != '-' && *strind != 'x')
+    {
+      tempWidth = strtoul (strind, &nextCharacter, 10);
+      if (strind == nextCharacter)
+        return 0;
+      strind = nextCharacter;
+      mask |= WidthValue;
+    }
+
+  if (*strind == 'x' || *strind == 'X')
+    {
+      strind++;
+      tempHeight = strtoul (strind, &nextCharacter, 10);
+      if (strind == nextCharacter)
+        return 0;
+      strind = nextCharacter;
+      mask |= HeightValue;
+    }
+
+  if (*strind == '+' || *strind == '-')
+    {
+      if (*strind == '-')
+        mask |= XNegative;
+      tempX = strtol (strind, &nextCharacter, 10);
+      if (strind == nextCharacter)
+        return 0;
+      strind = nextCharacter;
+      mask |= XValue;
+      if (*strind == '+' || *strind == '-')
+        {
+          if (*strind == '-')
+            mask |= YNegative;
+          tempY = strtol (strind, &nextCharacter, 10);
+          if (strind == nextCharacter)
+            return 0;
+          strind = nextCharacter;
+          mask |= YValue;
+        }
+    }
+
+  /* If strind isn't at the end of the string then it's an invalid
+     geometry specification. */
+
+  if (*strind != '\0')
+    return 0;
+
+  if (mask & XValue)
+    *x = clip_to_bounds (INT_MIN, tempX, INT_MAX);
+  if (mask & YValue)
+    *y = clip_to_bounds (INT_MIN, tempY, INT_MAX);
+  if (mask & WidthValue)
+    *width = min (tempWidth, UINT_MAX);
+  if (mask & HeightValue)
+    *height = min (tempHeight, UINT_MAX);
+  return mask;
+}
+
+#endif /* !defined (HAVE_X_WINDOWS) && defined (NoValue) */
 
 
 /* NS used to define x-parse-geometry in ns-win.el, but that confused
@@ -3917,15 +4006,16 @@ or a list (- N) meaning -N pixels relative to bottom/right corner.
 On Nextstep, this just calls `ns-parse-geometry'.  */)
   (Lisp_Object string)
 {
-#ifdef HAVE_NS
-  return call1 (Qns_parse_geometry, string);
-#else
   int geometry, x, y;
   unsigned int width, height;
   Lisp_Object result;
 
   CHECK_STRING (string);
 
+#ifdef HAVE_NS
+  if (strchr (SSDATA (string), ' ') != NULL)
+    return call1 (Qns_parse_geometry, string);
+#endif
   geometry = XParseGeometry (SSDATA (string),
                              &x, &y, &width, &height);
   result = Qnil;
@@ -3961,7 +4051,6 @@ On Nextstep, this just calls `ns-parse-geometry'.  */)
     result = Fcons (Fcons (Qheight, make_number (height)), result);
 
   return result;
-#endif /* HAVE_NS */
 }
 
 
diff --git a/src/nsfns.m b/src/nsfns.m
index 072005d2d3d..e2c8c3722c0 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -870,16 +870,6 @@ x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 }
 
 
-/* Xism; we stub out (we do implement this in ns-win.el) */
-int
-XParseGeometry (char *string, int *x, int *y,
-                unsigned int *width, unsigned int *height)
-{
-  message1 ("Warning: XParseGeometry not supported under NS.\n");
-  return 0;
-}
-
-
 /* TODO: move to nsterm? */
 int
 ns_lisp_to_cursor_type (Lisp_Object arg)
@@ -1399,6 +1389,9 @@ This function is an internal primitive--use `make-frame' instead.  */)
 
   UNGCPRO;
 
+  if (window_prompting & USPosition)
+    x_set_offset (f, f->left_pos, f->top_pos, 1);
+
   /* Make sure windows on this frame appear in calls to next-window
      and similar functions.  */
   Vwindow_list = Qnil;
diff --git a/src/w32inevt.c b/src/w32inevt.c
index ee07db5335b..d4cc620335c 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -747,7 +747,7 @@ w32_console_read_socket (struct terminal *terminal,
                          int expected,
                          struct input_event *hold_quit)
 {
-  int nev, ret = 0, add;
+  int nev, add;
   int isdead;
 
   if (interrupt_input_blocked)
@@ -767,8 +767,7 @@ w32_console_read_socket (struct terminal *terminal,
           /* If nev == -1, there was some kind of error
              If nev == 0 then waitp must be zero and no events were available
              so return.  */
-          UNBLOCK_INPUT;
-          return nev;
+          break;
         }
 
       while (nev > 0)
@@ -812,9 +811,6 @@ w32_console_read_socket (struct terminal *terminal,
           queue_ptr++;
           nev--;
         }
-
-      if (ret > 0 || expected == 0)
-        break;
     }
 
   /* We don't get told about changes in the window size (only the buffer
@@ -824,5 +820,5 @@ w32_console_read_socket (struct terminal *terminal,
     maybe_generate_resize_event ();
 
   UNBLOCK_INPUT;
-  return ret;
+  return nev;
 }
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 33f40fc7c01..018dd14cb80 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -303,138 +303,6 @@ drain_message_queue (void)
     }
 }
 
-
-/*
- *    XParseGeometry parses strings of the form
- *   "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where
- *   width, height, xoffset, and yoffset are unsigned integers.
- *   Example:  "=80x24+300-49"
- *   The equal sign is optional.
- *   It returns a bitmask that indicates which of the four values
- *   were actually found in the string.  For each value found,
- *   the corresponding argument is updated;  for each value
- *   not found, the corresponding argument is left unchanged.
- */
-
-static int
-read_integer (register char *string, char **NextString)
-{
-  register int Result = 0;
-  int Sign = 1;
-
-  if (*string == '+')
-    string++;
-  else if (*string == '-')
-    {
-      string++;
-      Sign = -1;
-    }
-  for (; (*string >= '0') && (*string <= '9'); string++)
-    {
-      Result = (Result * 10) + (*string - '0');
-    }
-  *NextString = string;
-  if (Sign >= 0)
-    return (Result);
-  else
-    return (-Result);
-}
-
-int
-XParseGeometry (char *string,
-                int *x, int *y,
-                unsigned int *width, unsigned int *height)
-{
-  int mask = NoValue;
-  register char *strind;
-  unsigned int tempWidth, tempHeight;
-  int tempX, tempY;
-  char *nextCharacter;
-
-  if ((string == NULL) || (*string == '\0')) return (mask);
-  if (*string == '=')
-    string++;  /* ignore possible '=' at beg of geometry spec */
-
-  strind = (char *)string;
-  if (*strind != '+' && *strind != '-' && *strind != 'x')
-    {
-      tempWidth = read_integer (strind, &nextCharacter);
-      if (strind == nextCharacter)
-        return (0);
-      strind = nextCharacter;
-      mask |= WidthValue;
-    }
-
-  if (*strind == 'x' || *strind == 'X')
-    {
-      strind++;
-      tempHeight = read_integer (strind, &nextCharacter);
-      if (strind == nextCharacter)
-        return (0);
-      strind = nextCharacter;
-      mask |= HeightValue;
-    }
-
-  if ((*strind == '+') || (*strind == '-'))
-    {
-      if (*strind == '-')
-        {
-          strind++;
-          tempX = -read_integer (strind, &nextCharacter);
-          if (strind == nextCharacter)
-            return (0);
-          strind = nextCharacter;
-          mask |= XNegative;
-
-        }
-      else
-        {
-          strind++;
-          tempX = read_integer (strind, &nextCharacter);
-          if (strind == nextCharacter)
-            return (0);
-          strind = nextCharacter;
-        }
-      mask |= XValue;
-      if ((*strind == '+') || (*strind == '-'))
-        {
-          if (*strind == '-')
-            {
-              strind++;
-              tempY = -read_integer (strind, &nextCharacter);
-              if (strind == nextCharacter)
-                return (0);
-              strind = nextCharacter;
-              mask |= YNegative;
-            }
-          else
-            {
-              strind++;
-              tempY = read_integer (strind, &nextCharacter);
-              if (strind == nextCharacter)
-                return (0);
-              strind = nextCharacter;
-            }
-          mask |= YValue;
-        }
-    }
-
-  /* If strind isn't at the end of the string then it's an invalid
-     geometry specification. */
-
-  if (*strind != '\0') return (0);
-
-  if (mask & XValue)
-    *x = tempX;
-  if (mask & YValue)
-    *y = tempY;
-  if (mask & WidthValue)
-    *width = tempWidth;
-  if (mask & HeightValue)
-    *height = tempHeight;
-  return (mask);
-}
-
 /* x_sync is a no-op on W32.  */
 void
 x_sync (struct frame *f)