upstream

31 files changed, 513 insertions, 232 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index ffd9f7d31f6..167910f782f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * PROBLEMS: Remove obsolete '#define static' cruft.
+
 2012-05-07  Glenn Morris  <rgm@gnu.org>
 
         * forms/forms-d2.el, forms/forms-pass.el: Move here from ../lisp.
diff --git a/etc/NEWS b/etc/NEWS
index 1ecc616f15d..ff662a70c1c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -60,12 +60,16 @@ name, group names known to the system (where possible).
 ** ImageMagick support, if available, is automatically enabled.
 It is no longer necessary to call `imagemagick-register-types'
 explicitly to install ImageMagick image types; that function is called
-automatically at startup or when customizing `imagemagick-types-inhibit'.
+automatically at startup, or when customizing imagemagick-types-enable
+or imagemagick-types-inhibit.
 
 *** Setting `imagemagick-types-inhibit' to t now disables the use of
 ImageMagick to view images.  You must call imagemagick-register-types
 afterwards if you do not use customize to change this.
 
+*** The new variable `imagemagick-types-enable' also affects which
+ImageMagick types are treated as images.
+
 ** String values for `initial-buffer-choice' also apply to emacsclient
 frames, if emacsclient is only told to open a new frame without
 specifying any file to visit or expression to evaluate.
@@ -118,6 +122,9 @@ The variable `diff-use-changed-face' defines whether to use
 the face `diff-changed', or `diff-removed' and `diff-added'
 to highlight changes in context diffs.
 
+** Ediff now uses the same color scheme as Diff mode
+on high color displays.
+
 ** `sh-script'
 *** Pairing of parens/quotes uses electric-pair-mode instead of skeleton-pair.
 *** `sh-electric-here-document-mode' now controls auto-insertion of here-docs.
@@ -296,6 +303,11 @@ still be supported for Emacs 24.x.
 
 * Lisp changes in Emacs 24.2
 
+** `defun' also accepts a (declare DECLS) form, like `defmacro'.
+The interpretation of the DECLS is determined by `defun-declarations-alist'.
+
+** `macro-declaration-function' is obsolete, use `macro-declarations-alist'.
+
 ** New function `set-temporary-overlay-map'.
 
 ** New macros `setq-local' and `defvar-local'.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index cc591d6e1fe..6d5ee0498c7 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2778,19 +2778,11 @@ build Emacs in a directory on a local disk.
 
 *** The dumped Emacs crashes when run, trying to write pure data.
 
-Two causes have been seen for such problems.
-
-1) On a system where getpagesize is not a system call, it is defined
+On a system where getpagesize is not a system call, it is defined
 as a macro.  If the definition (in both unex*.c and malloc.c) is wrong,
 it can cause problems like this.  You might be able to find the correct
 value in the man page for a.out (5).
 
-2) Some systems allocate variables declared static among the
-initialized variables.  Emacs makes all initialized variables in most
-of its files pure after dumping, but the variables declared static and
-not initialized are not supposed to be pure.  On these systems you
-may need to add "#define static" to config.h.
-
 * Runtime problems on legacy systems
 
 This section covers bugs reported on very old hardware or software.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d95137852e0..ff631d09fcd 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS)
+        instead of a literal -mwindows, which is not supported by MSVC.
+        (Bug#11405)
+
 2012-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * make-docfile.c: Improve comment style.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 83b818ed6c6..b727288351a 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -65,7 +65,7 @@ $(BLD)/emacsclient.exe:		$(ECLIENTOBJS)
 
 $(BLD)/emacsclientw.exe:        $(ECLIENTOBJS) $(CLIENTRES)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
-                $(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
+                $(LINK) $(LINK_OUT)$@ $(CLIENTRES) $(MWINDOWS) $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
 
 $(BLD)/emacsclient.$(O):        emacsclient.c
                 $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62405960593..c2c6e0da37b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,50 @@
+2012-05-31  Glenn Morris  <rgm@gnu.org>
+
+        * image.el: For clarity, call imagemagick-register-types at
+        top-level, rather than relying on a custom :initialize.
+        (imagemagick-types-enable): New option.  (Bug#11557)
+        (imagemagick-register-types): Respect imagemagick-types-inhibit.
+        If disabling support, remove elements altogether rather
+        than using an impossible regexp.
+        (imagemagick-types-inhibit): Give it the default init function.
+
+2012-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el (byte-compile-fix-header): Handle
+        arbitrary file name lengths (Bug#11585).
+
+2012-05-31  Martin Rudalics  <rudalics@gmx.at>
+
+        * desktop.el (desktop-read): Clear previous and next buffers for
+        all windows and bury *Messages* buffer (bug#11556).
+
+2012-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/sendmail.el (mail-yank-region): Recognize
+        rmail-yank-current-message in addition to insert-buffer.  Fixes
+        mail-mode's "C-c C-r" that otherwise does nothing when invoked in
+
+2012-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Add `declare' for `defun'.  Align `defmacro's with it.
+        * emacs-lisp/easy-mmode.el (define-minor-mode)
+        (define-globalized-minor-mode): Don't autoload the var definitions.
+        * emacs-lisp/byte-run.el: Use lexical-binding.
+        (defun-declarations-alist, macro-declarations-alist): New vars.
+        (defmacro, defun): Use them.
+        (make-obsolete, define-obsolete-function-alias)
+        (make-obsolete-variable, define-obsolete-variable-alias):
+        Use `declare'.
+        (macro-declaration-function): Mark obsolete.
+        * emacs-lisp/autoload.el: Use lexical-binding.
+        (make-autoload): Add `expansion' arg.  Rely more on macro expansion.
+
 2012-05-30  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
 
         * textmodes/ispell.el (ispell-with-no-warnings):
         Define as a macro.
-        (ispell-kill-ispell, ispell-change-dictionary): Use
-        `called-interactively-p' for Emacs instead of obsolete
+        (ispell-kill-ispell, ispell-change-dictionary):
+        Use `called-interactively-p' for Emacs instead of obsolete
         `interactive-p'.
 
 2012-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/lisp/desktop.el b/lisp/desktop.el
index f7a33f2b05d..5d9982940bf 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1020,6 +1020,18 @@ Using it may cause conflicts.  Use it anyway? " owner)))))
                          (format ", %d to restore lazily"
                                  (length desktop-buffer-args-list))
                        ""))
+            ;; Bury the *Messages* buffer to not reshow it when burying
+            ;; the buffer we switched to above.
+            (when (buffer-live-p (get-buffer "*Messages*"))
+              (bury-buffer "*Messages*"))
+            ;; Clear all windows' previous and next buffers, these have
+            ;; been corrupted by the `switch-to-buffer' calls in
+            ;; `desktop-restore-file-buffer' (bug#11556).  This is a
+            ;; brute force fix and should be replaced by a more subtle
+            ;; strategy eventually.
+            (walk-window-tree (lambda (window)
+                                (set-window-prev-buffers window nil)
+                                (set-window-next-buffers window nil)))
             t))
       ;; No desktop file found.
       (desktop-clear)
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 921b08b10a8..d9fc0fccf0e 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -1,4 +1,4 @@
-;; autoload.el --- maintain autoloads in loaddefs.el
+;; autoload.el --- maintain autoloads in loaddefs.el  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1991-1997, 2001-2012  Free Software Foundation, Inc.
 
@@ -86,28 +86,67 @@ that text will be copied verbatim to `generated-autoload-file'.")
 
 (defvar autoload-modified-buffers)      ;Dynamically scoped var.
 
-(defun make-autoload (form file)
+(defun make-autoload (form file &optional expansion)
   "Turn FORM into an autoload or defvar for source file FILE.
 Returns nil if FORM is not a special autoload form (i.e. a function definition
-or macro definition or a defcustom)."
+or macro definition or a defcustom).
+If EXPANSION is non-nil, we're processing the macro expansion of an
+expression, in which case we want to handle forms differently."
   (let ((car (car-safe form)) expand)
     (cond
+     ((and expansion (eq car 'defalias))
+      (pcase-let*
+          ((`(,_ ,_ ,arg . ,rest) form)
+           ;; `type' is non-nil if it defines a macro.
+           ;; `fun' is the function part of `arg' (defaults to `arg').
+           ((or (and (or `(cons 'macro ,fun) `'(macro . ,fun)) (let type t))
+                (and (let fun arg) (let type nil)))
+            arg)
+           ;; `lam' is the lambda expression in `fun' (or nil if not
+           ;; recognized).
+           (lam (if (memq (car-safe fun) '(quote function)) (cadr fun)))
+           ;; `args' is the list of arguments (or t if not recognized).
+           ;; `body' is the body of `lam' (or t if not recognized).
+           ((or `(lambda ,args . ,body)
+                (and (let args t) (let body t)))
+            lam)
+           ;; Get the `doc' from `body' or `rest'.
+           (doc (cond ((stringp (car-safe body)) (car body))
+                      ((stringp (car-safe rest)) (car rest))))
+           ;; Look for an interactive spec.
+           (interactive (pcase body
+                          ((or `((interactive . ,_) . ,_)
+                               `(,_ (interactive . ,_) . ,_)) t))))
+        ;; Add the usage form at the end where describe-function-1
+        ;; can recover it.
+        (when (listp args) (setq doc (help-add-fundoc-usage doc args)))
+        ;; (message "autoload of %S" (nth 1 form))
+        `(autoload ,(nth 1 form) ,file ,doc ,interactive ,type)))
+
+     ((and expansion (memq car '(progn prog1)))
+      (let ((end (memq :autoload-end form)))
+        (when end             ;Cut-off anything after the :autoload-end marker.
+          (setq form (copy-sequence form))
+          (setcdr (memq :autoload-end form) nil))
+        (let ((exps (delq nil (mapcar (lambda (form)
+                                        (make-autoload form file expansion))
+                                      (cdr form)))))
+          (when exps (cons 'progn exps)))))
+
      ;; For complex cases, try again on the macro-expansion.
      ((and (memq car '(easy-mmode-define-global-mode define-global-minor-mode
-                       define-globalized-minor-mode
+                       define-globalized-minor-mode defun defmacro
+                       ;; FIXME: we'd want `defmacro*' here as well, so as
+                       ;; to handle its `declare', but when autoload is run
+                       ;; CL is not loaded so macroexpand doesn't know how
+                       ;; to expand it!
                        easy-mmode-define-minor-mode define-minor-mode))
            (setq expand (let ((load-file-name file)) (macroexpand form)))
-           (eq (car expand) 'progn)
-           (memq :autoload-end expand))
-      (let ((end (memq :autoload-end expand)))
-        ;; Cut-off anything after the :autoload-end marker.
-        (setcdr end nil)
-        (cons 'progn
-              (mapcar (lambda (form) (make-autoload form file))
-                      (cdr expand)))))
+           (memq (car expand) '(progn prog1 defalias)))
+      (make-autoload expand file 'expansion)) ;Recurse on the expansion.
 
      ;; For special function-like operators, use the `autoload' function.
-     ((memq car '(defun define-skeleton defmacro define-derived-mode
+     ((memq car '(define-skeleton define-derived-mode
                    define-compilation-mode define-generic-mode
                    easy-mmode-define-global-mode define-global-minor-mode
                    define-globalized-minor-mode
@@ -124,40 +163,21 @@ or macro definition or a defcustom)."
                      (t)))
              (body (nthcdr (get car 'doc-string-elt) form))
              (doc (if (stringp (car body)) (pop body))))
-        (when (listp args)
-          ;; Add the usage form at the end where describe-function-1
-          ;; can recover it.
-          (setq doc (help-add-fundoc-usage doc args)))
-        (let ((exp
-               ;; `define-generic-mode' quotes the name, so take care of that
-               (list 'autoload (if (listp name) name (list 'quote name))
-                     file doc
-                     (or (and (memq car '(define-skeleton define-derived-mode
-                                           define-generic-mode
-                                           easy-mmode-define-global-mode
-                                           define-global-minor-mode
-                                           define-globalized-minor-mode
-                                           easy-mmode-define-minor-mode
-                                           define-minor-mode)) t)
-                         (eq (car-safe (car body)) 'interactive))
-                     (if macrop (list 'quote 'macro) nil))))
-          (when macrop
-            ;; Special case to autoload some of the macro's declarations.
-            (let ((decls (nth (if (stringp (nth 3 form)) 4 3) form))
-                  (exps '()))
-              (when (eq (car-safe decls) 'declare)
-                ;; FIXME: We'd like to reuse macro-declaration-function,
-                ;; but we can't since it doesn't return anything.
-                (dolist (decl decls)
-                  (case (car-safe decl)
-                    (indent
-                     (push `(put ',name 'lisp-indent-function ',(cadr decl))
-                           exps))
-                    (doc-string
-                     (push `(put ',name 'doc-string-elt ',(cadr decl)) exps))))
-                (when exps
-                  (setq exp `(progn ,exp ,@exps))))))
-          exp)))
+        ;; Add the usage form at the end where describe-function-1
+        ;; can recover it.
+        (when (listp args) (setq doc (help-add-fundoc-usage doc args)))
+        ;; `define-generic-mode' quotes the name, so take care of that
+        (list 'autoload (if (listp name) name (list 'quote name))
+              file doc
+              (or (and (memq car '(define-skeleton define-derived-mode
+                                    define-generic-mode
+                                    easy-mmode-define-global-mode
+                                    define-global-minor-mode
+                                    define-globalized-minor-mode
+                                    easy-mmode-define-minor-mode
+                                    define-minor-mode)) t)
+                  (eq (car-safe (car body)) 'interactive))
+              (if macrop (list 'quote 'macro) nil))))
 
      ;; For defclass forms, use `eieio-defclass-autoload'.
      ((eq car 'defclass)
@@ -190,6 +210,11 @@ or macro definition or a defcustom)."
            (if (member ',file loads) nil
              (put ',groupname 'custom-loads (cons ',file loads))))))
 
+     ;; When processing a macro expansion, any expression
+     ;; before a :autoload-end should be included.  These are typically (put
+     ;; 'fun 'prop val) and things like that.
+     ((and expansion (consp form)) form)
+
      ;; nil here indicates that this is not a special autoload form.
      (t nil))))
 
@@ -481,7 +506,7 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
                   (search-forward generate-autoload-cookie)
                   (skip-chars-forward " \t")
                   (if (eolp)
-                      (condition-case err
+                      (condition-case-unless-debug err
                           ;; Read the next form and make an autoload.
                           (let* ((form (prog1 (read (current-buffer))
                                          (or (bolp) (forward-line 1))))
@@ -671,9 +696,9 @@ file binds `generated-autoload-file' as a file-local variable,
 write its autoloads into the specified file instead."
   (interactive "DUpdate autoloads from directory: ")
   (let* ((files-re (let ((tmp nil))
-                     (dolist (suf (get-load-suffixes)
-                                  (concat "^[^=.].*" (regexp-opt tmp t) "\\'"))
-                       (unless (string-match "\\.elc" suf) (push suf tmp)))))
+                     (dolist (suf (get-load-suffixes))
+                       (unless (string-match "\\.elc" suf) (push suf tmp)))
+                     (concat "^[^=.].*" (regexp-opt tmp t) "\\'")))
          (files (apply 'nconc
                        (mapcar (lambda (dir)
                                  (directory-files (expand-file-name dir)
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 9b04e9889dd..df8f588ce01 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -1,4 +1,4 @@
-;;; byte-run.el --- byte-compiler support for inlining
+;;; byte-run.el --- byte-compiler support for inlining  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1992, 2001-2012  Free Software Foundation, Inc.
 
@@ -30,9 +30,8 @@
 
 ;;; Code:
 
-;; We define macro-declaration-function here because it is needed to
-;; handle declarations in macro definitions and this is the first file
-;; loaded by loadup.el that uses declarations in macros.
+;; `macro-declaration-function' are both obsolete (as marked at the end of this
+;; file) but used in many .elc files.
 
 (defvar macro-declaration-function #'macro-declaration-function
   "Function to process declarations in a macro definition.
@@ -66,6 +65,45 @@ The return value of this function is not used."
                      (message "Unknown declaration %s" d)))
             (message "Invalid declaration %s" d))))))
 
+;; We define macro-declaration-alist here because it is needed to
+;; handle declarations in macro definitions and this is the first file
+;; loaded by loadup.el that uses declarations in macros.
+
+(defvar defun-declarations-alist
+  ;; FIXME: Should we also add an `obsolete' property?
+  (list
+   ;; Too bad we can't use backquote yet at this stage of the bootstrap.
+   (list 'advertised-calling-convention
+         #'(lambda (f arglist when)
+             (list 'set-advertised-calling-convention
+                   (list 'quote f) (list 'quote arglist) (list 'quote when))))
+   (list 'doc-string
+         #'(lambda (f pos)
+             (list 'put (list 'quote f) ''doc-string-elt (list 'quote pos))))
+   (list 'indent
+         #'(lambda (f val)
+             (list 'put (list 'quote f)
+                   ''lisp-indent-function (list 'quote val)))))
+  "List associating function properties to their macro expansion.
+Each element of the list takes the form (PROP FUN) where FUN is
+a function.  For each (PROP . VALUES) in a function's declaration,
+the FUN corresponding to PROP is called with the function name
+and the VALUES and should return the code to use to set this property.")
+
+(defvar macro-declarations-alist
+  (cons
+   (list 'debug
+         #'(lambda (name spec)
+             (list 'progn :autoload-end
+                   (list 'put (list 'quote name)
+                         ''edebug-form-spec (list 'quote spec)))))
+   defun-declarations-alist)
+  "List associating properties of macros to their macro expansion.
+Each element of the list takes the form (PROP FUN) where FUN is
+a function.  For each (PROP . VALUES) in a macro's declaration,
+the FUN corresponding to PROP is called with the function name
+and the VALUES and should return the code to use to set this property.")
+
 (put 'defmacro 'doc-string-elt 3)
 (defalias 'defmacro
   (cons
@@ -76,21 +114,9 @@ When the macro is called, as in (NAME ARGS...),
 the function (lambda ARGLIST BODY...) is applied to
 the list ARGS... as it appears in the expression,
 and the result should be a form to be evaluated instead of the original.
-
-DECL is a declaration, optional, which can specify how to indent
-calls to this macro, how Edebug should handle it, and which argument
-should be treated as documentation.  It looks like this:
-  (declare SPECS...)
-The elements can look like this:
-  (indent INDENT)
-        Set NAME's `lisp-indent-function' property to INDENT.
-
-  (debug DEBUG)
-        Set NAME's `edebug-form-spec' property to DEBUG.  (This is
-        equivalent to writing a `def-edebug-spec' for the macro.)
-
-  (doc-string ELT)
-        Set NAME's `doc-string-elt' property to ELT."
+DECL is a declaration, optional, of the form (declare DECLS...) where
+DECLS is a list of elements of the form (PROP . VALUES).  These are
+interpreted according to `macro-declarations-alist'."
        (if (stringp docstring) nil
          (if decl (setq body (cons decl body)))
          (setq decl docstring)
@@ -104,28 +130,67 @@ The elements can look like this:
        (let* ((fun (list 'function (cons 'lambda (cons arglist body))))
               (def (list 'defalias
                          (list 'quote name)
-                         (list 'cons ''macro fun))))
-         (if decl
-             (list 'progn
-                   (list 'funcall 'macro-declaration-function
-                         (list 'quote name)
-                         (list 'quote decl))
-                   def)
+                         (list 'cons ''macro fun)))
+              (declarations
+               (mapcar
+                #'(lambda (x)
+                    (let ((f (cdr (assq (car x) macro-declarations-alist))))
+                      (if f (apply (car f) name (cdr x))
+                        (message "Warning: Unknown macro property %S in %S"
+                                 (car x) name))))
+                (cdr decl))))
+         (if declarations
+             (cons 'prog1 (cons def declarations))
            def)))))
 
 ;; Now that we defined defmacro we can use it!
 (defmacro defun (name arglist &optional docstring &rest body)
   "Define NAME as a function.
 The definition is (lambda ARGLIST [DOCSTRING] BODY...).
-See also the function `interactive'."
+See also the function `interactive'.
+DECL is a declaration, optional, of the form (declare DECLS...) where
+DECLS is a list of elements of the form (PROP . VALUES).  These are
+interpreted according to `defun-declarations-alist'.
+
+\(fn NAME ARGLIST &optional DOCSTRING DECL &rest BODY)"
+  ;; We can't just have `decl' as an &optional argument, because we need
+  ;; to distinguish
+  ;;    (defun foo (arg) (toto) nil)
+  ;; from
+  ;;    (defun foo (arg) (toto)).
   (declare (doc-string 3))
-  (if docstring (setq body (cons docstring body))
-    (if (null body) (setq body '(nil))))
-  (list 'defalias
-        (list 'quote name)
-        (list 'function
-              (cons 'lambda
-                    (cons arglist body)))))
+  (let ((decls (cond
+                ((eq (car-safe docstring) 'declare)
+                 (prog1 (cdr docstring) (setq docstring nil)))
+                ((eq (car-safe (car body)) 'declare)
+                 (prog1 (cdr (car body)) (setq body (cdr body)))))))
+    (if docstring (setq body (cons docstring body))
+      (if (null body) (setq body '(nil))))
+    (let ((declarations
+           (mapcar
+            #'(lambda (x)
+                (let ((f (cdr (assq (car x) defun-declarations-alist))))
+                  (cond
+                   (f (apply (car f) name (cdr x)))
+                   ;; Yuck!!
+                   ((and (featurep 'cl)
+                         (memq (car x)  ;C.f. cl-do-proclaim.
+                               '(special inline notinline optimize warn)))
+                    (if (null (stringp docstring))
+                        (push (list 'declare x) body)
+                      (setcdr body (cons (list 'declare x) (cdr body))))
+                    nil)
+                   (t (message "Warning: Unknown defun property %S in %S"
+                               (car x) name)))))
+                   decls))
+          (def (list 'defalias
+                     (list 'quote name)
+                     (list 'function
+                           (cons 'lambda
+                                 (cons arglist body))))))
+      (if declarations
+          (cons 'prog1 (cons def declarations))
+        def))))
 
 ;; Redefined in byte-optimize.el.
 ;; This is not documented--it's not clear that we should promote it.
@@ -158,7 +223,6 @@ See also the function `interactive'."
 ;;                       (list 'put x ''byte-optimizer nil)))
 ;;              fns)))
 
-;; This has a special byte-hunk-handler in bytecomp.el.
 (defmacro defsubst (name arglist &rest body)
   "Define an inline function.  The syntax is just like that of `defun'."
   (declare (debug defun) (doc-string 3))
@@ -172,7 +236,7 @@ See also the function `interactive'."
 
 (defvar advertised-signature-table (make-hash-table :test 'eq :weakness 'key))
 
-(defun set-advertised-calling-convention (function signature when)
+(defun set-advertised-calling-convention (function signature _when)
   "Set the advertised SIGNATURE of FUNCTION.
 This will allow the byte-compiler to warn the programmer when she uses
 an obsolete calling convention.  WHEN specifies since when the calling
@@ -187,15 +251,15 @@ If CURRENT-NAME is a string, that is the `use instead' message
 \(it should end with a period, and not start with a capital).
 WHEN should be a string indicating when the function
 was first made obsolete, for example a date or a release number."
+  (declare (advertised-calling-convention
+            ;; New code should always provide the `when' argument.
+            (obsolete-name current-name when) "23.1"))
   (interactive "aMake function obsolete: \nxObsoletion replacement: ")
   (put obsolete-name 'byte-obsolete-info
        ;; The second entry used to hold the `byte-compile' handler, but
        ;; is not used any more nowadays.
        (purecopy (list current-name nil when)))
   obsolete-name)
-(set-advertised-calling-convention
- ;; New code should always provide the `when' argument.
- 'make-obsolete '(obsolete-name current-name when) "23.1")
 
 (defmacro define-obsolete-function-alias (obsolete-name current-name
                                                    &optional when docstring)
@@ -209,14 +273,13 @@ is equivalent to the following two lines of code:
 \(make-obsolete 'old-fun 'new-fun \"22.1\")
 
 See the docstrings of `defalias' and `make-obsolete' for more details."
-  (declare (doc-string 4))
+  (declare (doc-string 4)
+           (advertised-calling-convention
+            ;; New code should always provide the `when' argument.
+            (obsolete-name current-name when &optional docstring) "23.1"))
   `(progn
      (defalias ,obsolete-name ,current-name ,docstring)
      (make-obsolete ,obsolete-name ,current-name ,when)))
-(set-advertised-calling-convention
- ;; New code should always provide the `when' argument.
- 'define-obsolete-function-alias
- '(obsolete-name current-name when &optional docstring) "23.1")
 
 (defun make-obsolete-variable (obsolete-name current-name &optional when access-type)
   "Make the byte-compiler warn that OBSOLETE-NAME is obsolete.
@@ -226,13 +289,13 @@ WHEN should be a string indicating when the variable
 was first made obsolete, for example a date or a release number.
 ACCESS-TYPE if non-nil should specify the kind of access that will trigger
   obsolescence warnings; it can be either `get' or `set'."
+  (declare (advertised-calling-convention
+            ;; New code should always provide the `when' argument.
+            (obsolete-name current-name when &optional access-type) "23.1"))
   (put obsolete-name 'byte-obsolete-variable
        (purecopy (list current-name access-type when)))
   obsolete-name)
-(set-advertised-calling-convention
- ;; New code should always provide the `when' argument.
- 'make-obsolete-variable
- '(obsolete-name current-name when &optional access-type) "23.1")
+
 
 (defmacro define-obsolete-variable-alias (obsolete-name current-name
                                                  &optional when docstring)
@@ -255,7 +318,10 @@ For the benefit of `custom-set-variables', if OBSOLETE-NAME has
 any of the following properties, they are copied to
 CURRENT-NAME, if it does not already have them:
 'saved-value, 'saved-variable-comment."
-  (declare (doc-string 4))
+  (declare (doc-string 4)
+           (advertised-calling-convention
+            ;; New code should always provide the `when' argument.
+            (obsolete-name current-name when &optional docstring) "23.1"))
   `(progn
      (defvaralias ,obsolete-name ,current-name ,docstring)
      ;; See Bug#4706.
@@ -264,10 +330,6 @@ CURRENT-NAME, if it does not already have them:
             (null (get ,current-name prop))
             (put ,current-name prop (get ,obsolete-name prop))))
      (make-obsolete-variable ,obsolete-name ,current-name ,when)))
-(set-advertised-calling-convention
- ;; New code should always provide the `when' argument.
- 'define-obsolete-variable-alias
- '(obsolete-name current-name when &optional docstring) "23.1")
 
 ;; FIXME This is only defined in this file because the variable- and
 ;; function- versions are too.  Unlike those two, this one is not used
@@ -348,4 +410,9 @@ In interpreted code, this is entirely equivalent to `progn'."
 ;;       (file-format emacs19))"
 ;;   nil)
 
+(make-obsolete-variable 'macro-declaration-function
+                        'macro-declarations-alist "24.2")
+(make-obsolete 'macro-declaration-function
+               'macro-declarations-alist "24.2")
+
 ;;; byte-run.el ends here
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index ce4d5d64ae2..bbf029700a3 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1937,7 +1937,7 @@ and will be removed soon.  See (elisp)Backquote in the manual."))
              (byte-compile-fix-header byte-compile-current-file))))
      byte-compile--outbuffer)))
 
-(defun byte-compile-fix-header (filename)
+(defun byte-compile-fix-header (_filename)
   "If the current buffer has any multibyte characters, insert a version test."
   (when (< (point-max) (position-bytes (point-max)))
     (goto-char (point-min))
@@ -1962,12 +1962,10 @@ and will be removed soon.  See (elisp)Backquote in the manual."))
        ;; don't try to check the version number.
        "     (< (aref emacs-version (1- (length emacs-version))) ?A)\n"
        (format "     (string-lessp emacs-version \"%s\")\n" minimum-version)
-       "     (error \"`"
-       ;; prin1-to-string is used to quote backslashes.
-       (substring (prin1-to-string (file-name-nondirectory filename))
-                  1 -1)
-       (format "' was compiled for Emacs %s or later\"))\n\n"
-               minimum-version))
+       ;; Because the header must fit in a fixed width, we cannot
+       ;; insert arbitrary-length file names (Bug#11585).
+       "     (error \"`%s' was compiled for "
+       (format "Emacs %s or later\" load-file-name))\n\n" minimum-version))
       ;; Now compensate for any change in size, to make sure all
       ;; positions in the file remain valid.
       (setq delta (- (point-max) old-header-end))
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index a11f213e646..d522f07249a 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -229,6 +229,7 @@ For example, you could write
          (variable nil)
          ((not globalp)
           `(progn
+             :autoload-end
              (defvar ,mode ,init-value ,(format "Non-nil if %s is enabled.
 Use the command `%s' to change this variable." pretty-name mode))
              (make-variable-buffer-local ',mode)))
@@ -366,8 +367,10 @@ call another major mode in their body."
                                 "-mode\\'" "" (symbol-name mode))))))
 
     `(progn
-       (defvar ,MODE-major-mode nil)
-       (make-variable-buffer-local ',MODE-major-mode)
+       (progn
+         :autoload-end
+         (defvar ,MODE-major-mode nil)
+         (make-variable-buffer-local ',MODE-major-mode))
        ;; The actual global minor-mode
        (define-minor-mode ,global-mode
          ;; Very short lines to avoid too long lines in the generated
diff --git a/lisp/image.el b/lisp/image.el
index 087cd148dd6..9da6085ee14 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -692,38 +692,59 @@ The minimum delay between successive frames is 0.01s."
 This is the extension installed into `auto-mode-alist' and
 `image-type-file-name-regexps' by `imagemagick-register-types'.")
 
+(defvar imagemagick-types-inhibit)
+(defvar imagemagick-types-enable)
+
 ;;;###autoload
 (defun imagemagick-register-types ()
   "Register file types that can be handled by ImageMagick.
 This function is called at startup, after loading the init file.
-It registers the ImageMagick types listed in `imagemagick-types',
-excluding those listed in `imagemagick-types-inhibit'.
+It registers the ImageMagick types returned by `imagemagick-types',
+including only those from `imagemagick-types-enable', and excluding
+those from `imagemagick-types-inhibit'.
 
 Registered image types are added to `auto-mode-alist', so that
 Emacs visits them in Image mode.  They are also added to
 `image-type-file-name-regexps', so that the `image-type' function
 recognizes these files as having image type `imagemagick'.
 
-If Emacs is compiled without ImageMagick support, do nothing."
+If Emacs is compiled without ImageMagick support, this does nothing."
   (when (fboundp 'imagemagick-types)
-    (let ((re (if (eq imagemagick-types-inhibit t)
-                  ;; Use a bogus regexp to inhibit matches.
-                  "\\'a"
-                (let ((types))
-                  (dolist (type (imagemagick-types))
-                    (unless (memq type imagemagick-types-inhibit)
-                      (push (downcase (symbol-name type)) types)))
-                  (concat "\\." (regexp-opt types) "\\'"))))
-          (ama-elt (car (member (cons imagemagick--file-regexp 'image-mode)
-                                auto-mode-alist)))
-          (itfnr-elt (car (member (cons imagemagick--file-regexp 'imagemagick)
-                                  image-type-file-name-regexps))))
-      (if ama-elt
-          (setcar ama-elt re)
-        (push (cons re 'image-mode) auto-mode-alist))
-      (if itfnr-elt
-          (setcar itfnr-elt re)
-        (push (cons re 'imagemagick) image-type-file-name-regexps))
+    (let* ((include
+            (cond ((null imagemagick-types-enable) nil)
+                  ((eq imagemagick-types-inhibit t) nil)
+                  ((eq imagemagick-types-enable t) (imagemagick-types))
+                  (t
+                   (delq nil
+                         (mapcar
+                          (lambda (type)
+                            (catch 'found
+                              (dolist (enable imagemagick-types-enable nil)
+                                (if (cond ((symbolp enable) (eq enable type))
+                                          ((stringp enable)
+                                           (string-match enable
+                                                         (symbol-name type))))
+                                    (throw 'found type)))))
+                          (imagemagick-types))))))
+           (re (let (types)
+                 (dolist (type include)
+                   (unless (memq type imagemagick-types-inhibit)
+                     (push (downcase (symbol-name type)) types)))
+                 (if types (concat "\\." (regexp-opt types) "\\'"))))
+           (ama-elt (car (member (cons imagemagick--file-regexp 'image-mode)
+                                 auto-mode-alist)))
+           (itfnr-elt (car (member (cons imagemagick--file-regexp 'imagemagick)
+                                   image-type-file-name-regexps))))
+      (if (not re)
+          (setq auto-mode-alist (delete ama-elt auto-mode-alist)
+                image-type-file-name-regexps
+                (delete itfnr-elt image-type-file-name-regexps))
+        (if ama-elt
+            (setcar ama-elt re)
+          (push (cons re 'image-mode) auto-mode-alist))
+        (if itfnr-elt
+            (setcar itfnr-elt re)
+          (push (cons re 'imagemagick) image-type-file-name-regexps)))
       (setq imagemagick--file-regexp re))))
 
 (defcustom imagemagick-types-inhibit
@@ -743,12 +764,45 @@ has no effect."
   :type '(choice (const :tag "Support all ImageMagick types" nil)
                  (const :tag "Disable all ImageMagick types" t)
                  (repeat symbol))
+  :initialize 'custom-initialize-default
   :set (lambda (symbol value)
          (set-default symbol value)
          (imagemagick-register-types))
   :version "24.1"
   :group 'image)
 
+(defcustom imagemagick-types-enable
+  '("\\`BMP" DJVU "\\`GIF" "\\`ICO" "P?JPE?G" "P[BNP]M"
+    "\\`[MP]NG" "\\`TIFF")
+  "List of ImageMagick types to treat as images.
+The list elements are either strings or symbols, and represent
+types returned by `imagemagick-types'.  A string is a regexp that
+selects all types matching the regexp.
+
+The value may also be t, meaning all the types that ImageMagick
+supports; or nil, meaning no types.
+
+The variable `imagemagick-types-inhibit' overrides this variable.
+
+If you change this without using customize, you must call
+`imagemagick-register-types' afterwards.
+
+If Emacs is compiled without ImageMagick support, this variable
+has no effect."
+  :type '(choice (const :tag "Support all ImageMagick types" t)
+                 (const :tag "Disable all ImageMagick types" nil)
+                 (repeat :tag "List of types"
+                         (choice (symbol :tag "type")
+                                 (regexp :tag "regexp"))))
+  :initialize 'custom-initialize-default
+  :set (lambda (symbol value)
+         (set-default symbol value)
+         (imagemagick-register-types))
+  :version "24.2"
+  :group 'image)
+
+(imagemagick-register-types)
+
 (provide 'image)
 
 ;;; image.el ends here
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 5451fa38001..558b9960213 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove obsolete '#define static' cruft.
+        * xlwmenu.c [emacs]: Include "bitmaps/gray.xbm".
+        (gray_bitmap_width, gray_bitmap_height, gray_bitmap_bits) [!emacs]:
+        Remove; all uses replaced with definiens.
+
 2012-04-18  Paul Eggert  <eggert@cs.ucla.edu>
 
         configure: new option --enable-gcc-warnings (Bug#11207)
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 0a328f09f1e..4406c505392 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -49,22 +49,12 @@ Boston, MA 02110-1301, USA.  */
 
 #ifdef emacs
 
-/* Defined in xfns.c.  When config.h defines `static' as empty, we get
-   redefinition errors when gray_bitmap is included more than once, so
-   we're referring to the one include in xfns.c here.  */
-
-extern int gray_bitmap_width;
-extern int gray_bitmap_height;
-extern char *gray_bitmap_bits;
-
 #include <xterm.h>
+#include "bitmaps/gray.xbm"
 
 #else /* not emacs */
 
 #include <X11/bitmaps/gray>
-#define gray_bitmap_width       gray_width
-#define gray_bitmap_height      gray_height
-#define gray_bitmap_bits        gray_bits
 
 #endif /* not emacs */
 
@@ -1918,8 +1908,8 @@ XlwMenuInitialize (Widget request, Widget w, ArgList args, Cardinal *num_args)
   mw->menu.cursor = mw->menu.cursor_shape;
 
   mw->menu.gray_pixmap
-    = XCreatePixmapFromBitmapData (display, window, gray_bitmap_bits,
-                                   gray_bitmap_width, gray_bitmap_height,
+    = XCreatePixmapFromBitmapData (display, window, gray_bits,
+                                   gray_width, gray_height,
                                    (unsigned long)1, (unsigned long)0, 1);
 
 #ifdef HAVE_XFT
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 781d5d71559..0687e8be605 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,20 @@
+2012-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * configure.bat (genmakefiles): Move the redirection away from the
+        end of the command, to avoid excess whitespace at the end of Make
+        variables created at configure time, and also avoid things like
+        "FOO1>>config.settings", where "1" gets interpreted as the file
+        descriptor and eaten up.  This fixes breakage introduced by the
+        last change, without reintroducing the bug fixed by that change.
+
+2012-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * nmake.defs (MWINDOWS): Define as
+        "-subsystem:windows -entry:mainCRTStartup".  Suggested by Fabrice
+        Popineau <fabrice.popineau@supelec.fr>.  (Bug#11405)
+
+        * gmake.defs (MWINDOWS): Define as "-mwindows".
+
 2012-05-28  Eli Zaretskii  <eliz@gnu.org>
 
         * config.nt (HAVE_SYSINFO): Remove; unused.
diff --git a/nt/configure.bat b/nt/configure.bat
index a60df56fc94..cecf52ee927 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -753,29 +753,36 @@ if %COMPILER% == gcc set MAKECMD=gmake
 if %COMPILER% == cl set MAKECMD=nmake

 

 rem   Pass on chosen settings to makefiles.

-rem   NB. Be very careful to not have a space before redirection symbols

-rem   except when there is a preceding digit, when a space is required.

 rem

+rem   The weird place we put the redirection is to make sure no extra

+rem   whitespace winds up at the end of the Make variables, since some

+rem   variables, e.g. INSTALL_DIR, cannot stand that.  Yes, echo will

+rem   write the blanks between the end of command arguments and the

+rem   redirection symbol to the file.  OTOH, we cannot put the

+rem   redirection immediately after the last character of the command,

+rem   because environment variable expansion can yield a digit there,

+rem   which will then be misinterpreted as the file descriptor to

+rem   redirect...

 echo # Start of settings from configure.bat >config.settings

-echo COMPILER=%COMPILER% >>config.settings

-if not "(%mf%)" == "()" echo MCPU_FLAG=%mf% >>config.settings

-if not "(%dbginfo%)" == "()" echo DEBUG_INFO=%dbginfo% >>config.settings

-if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings

-if (%noopt%) == (Y) echo NOOPT=1 >>config.settings

-if (%enablechecking%) == (Y) echo ENABLECHECKS=1 >>config.settings

-if (%profile%) == (Y) echo PROFILE=1 >>config.settings

-if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings

-if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix% >>config.settings

-if not "(%distfiles%)" == "()" echo DIST_FILES=%distfiles% >>config.settings

+>>config.settings echo COMPILER=%COMPILER%

+if not "(%mf%)" == "()" >>config.settings echo MCPU_FLAG=%mf%

+if not "(%dbginfo%)" == "()" >>config.settings echo DEBUG_INFO=%dbginfo%

+if (%nodebug%) == (Y) >>config.settings echo NODEBUG=1

+if (%noopt%) == (Y) >>config.settings echo NOOPT=1

+if (%enablechecking%) == (Y) >>config.settings echo ENABLECHECKS=1

+if (%profile%) == (Y) >>config.settings echo PROFILE=1

+if (%nocygwin%) == (Y) >>config.settings echo NOCYGWIN=1

+if not "(%prefix%)" == "()" >>config.settings echo INSTALL_DIR=%prefix%

+if not "(%distfiles%)" == "()" >>config.settings echo DIST_FILES=%distfiles%

 rem We go thru docflags because usercflags could be "-DFOO=bar" -something

 rem and the if command cannot cope with this

 for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y

-if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags% >>config.settings

-if (%docflags%)==(Y) echo ESC_USER_CFLAGS=%escusercflags% >>config.settings

+if (%docflags%)==(Y) >>config.settings echo USER_CFLAGS=%usercflags%

+if (%docflags%)==(Y) >>config.settings echo ESC_USER_CFLAGS=%escusercflags%

 for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y

-if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags% >>config.settings

+if (%doldflags%)==(Y) >>config.settings echo USER_LDFLAGS=%userldflags%

 for %%v in (%extrauserlibs%) do if not (%%v)==() set doextralibs=Y

-if (%doextralibs%)==(Y) echo USER_LIBS=%extrauserlibs% >>config.settings

+if (%doextralibs%)==(Y) >>config.settings echo USER_LIBS=%extrauserlibs%

 echo # End of settings from configure.bat>>config.settings

 echo. >>config.settings

 

diff --git a/nt/gmake.defs b/nt/gmake.defs
index a669ffd27be..dd96b776363 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -210,6 +210,8 @@ else
 CHECKING_CFLAGS =
 endif
 
+MWINDOWS        = -mwindows
+
 CFLAGS          = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
 ESC_CFLAGS      = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
 EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 11079b4fb7d..b01e341f2d3 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -151,6 +151,8 @@ CHECKING_CFLAGS	= -DENABLE_CHECKING -DXASSERTS
 CHECKING_CFLAGS =

 !endif

 

+MWINDOWS        = -subsystem:windows -entry:mainCRTStartup

+

 CFLAGS          = -I. $(ARCH_CFLAGS) \

                   $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)

 ESC_CFLAGS      = -I. $(ARCH_CFLAGS) \

diff --git a/src/ChangeLog b/src/ChangeLog
index 767dfa47036..6d71346dd78 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,53 @@
+2012-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Pacify gcc -Wdouble-precision when using Xaw.
+        * xterm.c (xaw_jump_callback, x_set_toolkit_scroll_bar_thumb)
+        [HAVE_X_WINDOWS && USE_TOOLKIT_SCROLL_BARS && !USE_MOTIF && !USE_GTK]:
+        Use 'float' consistently, rather than 'float' in most places
+        and 'double' in a couple of places.
+
+2012-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (handle_stop): Detect whether we have overlay strings
+        loaded by testing it->current.overlay_string_index to be
+        non-negative, instead of checking whether n_overlay_strings is
+        positive.  (Bug#11587)
+
+2012-05-31  Chong Yidong  <cyd@gnu.org>
+
+        * keymap.c (describe_map_tree): Revert 2011-07-07 change (Bug#1169).
+
+        * doc.c (Fsubstitute_command_keys): Doc fix.
+
+2012-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * search.c (search_buffer): Remove calls to
+        r_alloc_inhibit_buffer_relocation, as it is now called by
+        maybe_unify_char, which was the cause of relocation of buffer text
+        in bug#11519.
+
+2012-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * charset.c (maybe_unify_char): Inhibit relocation of buffer text
+        for the duration of call to load_charset, to avoid problems with
+        callers of maybe_unify_char that access buffer text through C
+        pointers.
+
+        * ralloc.c (r_alloc_inhibit_buffer_relocation): Increment and
+        decrement the inhibition flag, instead of just setting or
+        resetting it.
+
+2012-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove obsolete '#define static' cruft.
+        * s/hpux10-20.h (_FILE_OFFSET_BITS): Don't #undef.
+        This #undef was "temporary" in 2000; it is no longer needed
+        now that '#define static' has gone away.
+        * xfns.c, xterm.h (gray_bitmap_width, gray_bitmap_height)
+        (gray_bitmap_bits): Remove; no longer needed.
+        All uses replaced with definiens.
+        * xterm.c: Include "bitmaps/gray.xbm".
+
 2012-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 
         Clean up __executable_start, monstartup when --enable-profiling.
@@ -13,6 +63,10 @@
         and not pointers.
         * lisp.h (__executable_start): New decl.
 
+2012-05-31  Glenn Morris  <rgm@gnu.org>
+
+        * image.c (Fimagemagick_types): Doc fix.
+
 2012-05-30  Jim Meyering  <meyering@redhat.com>
 
         * callproc.c (Fcall_process_region): Include directory component
diff --git a/src/charset.c b/src/charset.c
index 6ecc8d2c4d1..8ce972ebf37 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1633,6 +1633,12 @@ maybe_unify_char (int c, Lisp_Object val)
     return c;
 
   CHECK_CHARSET_GET_CHARSET (val, charset);
+#ifdef REL_ALLOC
+  /* The call to load_charset below can allocate memory, which screws
+     callers of this function through STRING_CHAR_* macros that hold C
+     pointers to buffer text, if REL_ALLOC is used.  */
+  r_alloc_inhibit_buffer_relocation (1);
+#endif
   load_charset (charset, 1);
   if (! inhibit_load_charset_map)
     {
@@ -1648,6 +1654,9 @@ maybe_unify_char (int c, Lisp_Object val)
       if (unified > 0)
         c = unified;
     }
+#ifdef REL_ALLOC
+  r_alloc_inhibit_buffer_relocation (0);
+#endif
   return c;
 }
 
diff --git a/src/doc.c b/src/doc.c
index bec20fb0d94..cd23d9266a2 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -705,18 +705,23 @@ the same file name is found in the `doc-directory'.  */)
 DEFUN ("substitute-command-keys", Fsubstitute_command_keys,
        Ssubstitute_command_keys, 1, 1, 0,
        doc: /* Substitute key descriptions for command names in STRING.
-Substrings of the form \\=\\[COMMAND] replaced by either: a keystroke
-sequence that will invoke COMMAND, or "M-x COMMAND" if COMMAND is not
-on any keys.
-Substrings of the form \\=\\{MAPVAR} are replaced by summaries
-\(made by `describe-bindings') of the value of MAPVAR, taken as a keymap.
-Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR
+Each substring of the form \\=\\[COMMAND] is replaced by either a
+keystroke sequence that invokes COMMAND, or "M-x COMMAND" if COMMAND
+is not on any keys.
+
+Each substring of the form \\=\\{MAPVAR} is replaced by a summary of
+the value of MAPVAR as a keymap.  This summary is similar to the one
+produced by `describe-bindings'.  The summary ends in two newlines
+\(used by the helper function `help-make-xrefs' to find the end of the
+summary).
+
+Each substring of the form \\=\\<MAPVAR> specifies the use of MAPVAR
 as the keymap for future \\=\\[COMMAND] substrings.
 \\=\\= quotes the following character and is discarded;
 thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output.
 
-Returns original STRING if no substitutions were made.  Otherwise,
-a new string, without any text properties, is returned.  */)
+Return the original STRING if no substitutions are made.
+Otherwise, return a new string, without any text properties.  */)
   (Lisp_Object string)
 {
   char *buf;
diff --git a/src/image.c b/src/image.c
index a3b64b74997..b6cdb6c8290 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,5 +1,6 @@
 /* Functions for image support on window system.
-   Copyright (C) 1989, 1992-2012 Free Software Foundation, Inc.
+
+Copyright (C) 1989, 1992-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -7987,7 +7988,8 @@ their descriptions (http://www.imagemagick.org/script/formats.php).
 You can also try the shell command: `identify -list format'.
 
 Note that ImageMagick recognizes many file-types that Emacs does not
-recognize as images, such as C.  See `imagemagick-types-inhibit'.  */)
+recognize as images, such as C.  See `imagemagick-types-enable'
+and `imagemagick-types-inhibit'.  */)
   (void)
 {
   Lisp_Object typelist = Qnil;
diff --git a/src/keymap.c b/src/keymap.c
index 2a03dda5a5e..2f5558c171f 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2996,9 +2996,9 @@ You type        Translation\n\
    If MENTION_SHADOW is nonzero, then when something is shadowed by SHADOW,
    don't omit it; instead, mention it but say it is shadowed.
 
-   Return whether something was inserted or not.  */
+   Any inserted text ends in two newlines (used by `help-make-xrefs').  */
 
-int
+void
 describe_map_tree (Lisp_Object startmap, int partial, Lisp_Object shadow,
                    Lisp_Object prefix, const char *title, int nomenu, int transl,
                    int always_title, int mention_shadow)
@@ -3108,8 +3108,10 @@ key             binding\n\
     skip: ;
     }
 
+  if (something)
+    insert_string ("\n");
+
   UNGCPRO;
-  return something;
 }
 
 static int previous_description_column;
diff --git a/src/keymap.h b/src/keymap.h
index 234ffce471d..d9334cda0f4 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -47,7 +47,7 @@ EXFUN (Fcurrent_active_maps, 2);
 extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, int, int, int);
 extern Lisp_Object get_keymap (Lisp_Object, int, int);
 EXFUN (Fset_keymap_parent, 2);
-extern int describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object,
+extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object,
                               const char *, int, int, int, int);
 extern ptrdiff_t current_minor_maps (Lisp_Object **, Lisp_Object **);
 extern void initial_define_key (Lisp_Object, int, const char *);
diff --git a/src/ralloc.c b/src/ralloc.c
index 7fdef69842a..19d15664eec 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -1142,7 +1142,12 @@ r_alloc_reset_variable (POINTER *old, POINTER *new)
 void
 r_alloc_inhibit_buffer_relocation (int inhibit)
 {
-  use_relocatable_buffers = !inhibit;
+  if (use_relocatable_buffers < 0)
+    use_relocatable_buffers = 0;
+  if (inhibit)
+    use_relocatable_buffers++;
+  else if (use_relocatable_buffers > 0)
+    use_relocatable_buffers--;
 }
 
 
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 3e25b1bd0d9..f1ae50c533a 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -95,12 +95,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define HAVE_XRMSETDATABASE
 #endif
 
-/* 2000-11-21: Temporarily disable Unix 98 large file support found by
-   configure.  It fails on HPUX 11, at least, because it enables
-   header sections which lose when `static' is defined away, as it is
-   on HP-UX.  (You get duplicate symbol errors on linking). */
-#undef _FILE_OFFSET_BITS
-
 /* Conservative garbage collection has not been tested, so for now
    play it safe and stick with the old-fashioned way of marking.  */
 #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
diff --git a/src/search.c b/src/search.c
index 5608e344e75..99519b839ef 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1160,24 +1160,12 @@ search_buffer (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
         {
           ptrdiff_t val;
 
-#ifdef REL_ALLOC
-          /* re_search_2 below is passed C pointers to buffer text.
-             If some code called by it causes memory (re)allocation,
-             buffer text could be relocated on platforms that use
-             REL_ALLOC, which invalidates those C pointers.  So we
-             inhibit relocation of buffer text for as long as
-             re_search_2 runs.  */
-          r_alloc_inhibit_buffer_relocation (1);
-#endif
           val = re_search_2 (bufp, (char *) p1, s1, (char *) p2, s2,
                              pos_byte - BEGV_BYTE, lim_byte - pos_byte,
                              (NILP (Vinhibit_changing_match_data)
                               ? &search_regs : &search_regs_1),
                              /* Don't allow match past current point */
                              pos_byte - BEGV_BYTE);
-#ifdef REL_ALLOC
-          r_alloc_inhibit_buffer_relocation (0);
-#endif
           if (val == -2)
             {
               matcher_overflow ();
@@ -1217,19 +1205,11 @@ search_buffer (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
         {
           ptrdiff_t val;
 
-#ifdef REL_ALLOC
-          /* See commentary above for the reasons for inhibiting
-             buffer text relocation here.  */
-          r_alloc_inhibit_buffer_relocation (1);
-#endif
           val = re_search_2 (bufp, (char *) p1, s1, (char *) p2, s2,
                              pos_byte - BEGV_BYTE, lim_byte - pos_byte,
                              (NILP (Vinhibit_changing_match_data)
                               ? &search_regs : &search_regs_1),
                              lim_byte - BEGV_BYTE);
-#ifdef REL_ALLOC
-          r_alloc_inhibit_buffer_relocation (0);
-#endif
           if (val == -2)
             {
               matcher_overflow ();
diff --git a/src/xdisp.c b/src/xdisp.c
index 82dbe4beb3b..c8d2de7c9de 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3175,7 +3175,7 @@ handle_stop (struct it *it)
                      onto the stack one more time, which is not
                      expected by the rest of the code that processes
                      overlay strings.  */
-                  || (it->n_overlay_strings <= 0
+                  || (it->current.overlay_string_index < 0
                       ? !get_overlay_strings_1 (it, 0, 0)
                       : 0))
                 {
diff --git a/src/xfns.c b/src/xfns.c
index 767507805fb..1f1d3d3ef0c 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -126,14 +126,6 @@ extern LWLIB_ID widget_id_tick;
 
 #define MAXREQUEST(dpy) (XMaxRequestSize (dpy))
 
-/* The gray bitmap `bitmaps/gray'.  This is done because xterm.c uses
-   it, and including `bitmaps/gray' more than once is a problem when
-   config.h defines `static' as an empty replacement string.  */
-
-int gray_bitmap_width = gray_width;
-int gray_bitmap_height = gray_height;
-char *gray_bitmap_bits = gray_bits;
-
 /* Nonzero if using X.  */
 
 int x_in_use;
diff --git a/src/xterm.c b/src/xterm.c
index b05544a6fca..442b6b1b934 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -142,6 +142,8 @@ extern void _XEditResCheckMessages (Widget, XtPointer, XEvent *, Boolean *);
 #endif
 #endif
 
+#include "bitmaps/gray.xbm"
+
 /* Default to using XIM if available.  */
 #ifdef USE_XIM
 int use_xim = 1;
@@ -4536,7 +4538,7 @@ xaw_jump_callback (Widget widget, XtPointer client_data, XtPointer call_data)
   whole = 10000000;
   portion = shown < 1 ? top * whole : 0;
 
-  if (shown < 1 && (eabs (top + shown - 1) < 1.0/height))
+  if (shown < 1 && (eabs (top + shown - 1) < 1.0f / height))
     /* Some derivatives of Xaw refuse to shrink the thumb when you reach
        the bottom, so we force the scrolling whenever we see that we're
        too close to the bottom (in x_set_toolkit_scroll_bar_thumb
@@ -4901,7 +4903,7 @@ x_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar, int portion, int positio
     else
       top = old_top;
     /* Keep two pixels available for moving the thumb down.  */
-    shown = max (0, min (1 - top - (2.0 / height), shown));
+    shown = max (0, min (1 - top - (2.0f / height), shown));
 
     /* If the call to XawScrollbarSetThumb below doesn't seem to work,
        check that your system's configuration file contains a define
@@ -10401,8 +10403,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
   {
     dpyinfo->gray
       = XCreatePixmapFromBitmapData (dpyinfo->display, dpyinfo->root_window,
-                                     gray_bitmap_bits,
-                                     gray_bitmap_width, gray_bitmap_height,
+                                     gray_bits, gray_width, gray_height,
                                      1, 0, 1);
   }
 
diff --git a/src/xterm.h b/src/xterm.h
index 8919b648371..68e0372b05a 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -939,8 +939,6 @@ void x_handle_property_notify (XPropertyEvent *);
 struct frame *check_x_frame (Lisp_Object);
 EXFUN (Fx_display_grayscale_p, 1);
 extern void x_free_gcs (struct frame *);
-extern int gray_bitmap_width, gray_bitmap_height;
-extern char *gray_bitmap_bits;
 
 /* From xrdb.c.  */