Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org
authorChong Yidong <cyd@gnu.org>
Sun, 17 Jun 2012 05:13:40 +0000 (13:13 +0800)
committerChong Yidong <cyd@gnu.org>
Sun, 17 Jun 2012 05:13:40 +0000 (13:13 +0800)
40 files changed:
1  2 
doc/emacs/ChangeLog
doc/emacs/anti.texi
doc/emacs/building.texi
doc/emacs/calendar.texi
doc/emacs/cmdargs.texi
doc/emacs/custom.texi
doc/emacs/display.texi
doc/emacs/emacs.texi
doc/emacs/files.texi
doc/emacs/frames.texi
doc/emacs/glossary.texi
doc/emacs/maintaining.texi
doc/emacs/misc.texi
doc/emacs/msdog.texi
doc/emacs/mule.texi
doc/emacs/programs.texi
doc/emacs/text.texi
doc/lispref/ChangeLog
doc/lispref/customize.texi
doc/lispref/display.texi
doc/lispref/edebug.texi
doc/lispref/elisp.texi
doc/lispref/files.texi
doc/lispref/functions.texi
doc/lispref/keymaps.texi
doc/lispref/loading.texi
doc/lispref/macros.texi
doc/lispref/modes.texi
doc/lispref/nonascii.texi
doc/lispref/os.texi
doc/lispref/positions.texi
doc/lispref/processes.texi
doc/lispref/text.texi
doc/lispref/windows.texi
etc/NEWS
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/international/mule-cmds.el
src/ChangeLog
src/nsterm.m

@@@ -1,42 -1,30 +1,64 @@@
 -2012-06-01  Chong Yidong  <cyd@gnu.org>
+ 2012-06-11  Chong Yidong  <cyd@gnu.org>
+       * emacs.texi: Remove urlcolor setting.
+ 2012-06-10  Chong Yidong  <cyd@gnu.org>
+       * emacs.texi: Update ISBN and edition number.
+       * anti.texi:
+       * building.texi:
+       * cmdargs.texi:
+       * custom.texi:
+       * display.texi:
+       * files.texi:
+       * frames.texi:
+       * glossary.texi:
+       * misc.texi:
+       * mule.texi:
+       * programs.texi:
+       * sending.texi:
+       * text.texi: Copyedits to avoid underfull/overfull in 7x9 manual.
 +2012-06-06  Michael Albinus  <michael.albinus@gmx.de>
  
 -      * Version 24.1 released.
 +      * custom.texi (Directory Variables): Mention enable-remote-dir-locals.
  
 -2012-05-06  Chong Yidong  <cyd@gnu.org>
 +2012-05-28  Glenn Morris  <rgm@gnu.org>
 +
 +      * ack.texi, building.texi, calendar.texi, custom.texi:
 +      * maintaining.texi, text.texi: Use @LaTeX rather than La@TeX.
 +
 +2012-05-27  Glenn Morris  <rgm@gnu.org>
 +
 +      * emacs.texi: Simplify following removal of node pointers.
 +
 +      * ack.texi, anti.texi, basic.texi, buffers.texi, building.texi:
 +      * cmdargs.texi, commands.texi, display.texi, emacs.texi:
 +      * entering.texi, files.texi, fixit.texi, frames.texi, glossary.texi:
 +      * gnu.texi, help.texi, indent.texi, killing.texi, kmacro.texi:
 +      * m-x.texi, macos.texi, maintaining.texi, mark.texi, mini.texi:
 +      * misc.texi, modes.texi, msdog.texi, mule.texi, programs.texi:
 +      * regs.texi, screen.texi, search.texi, text.texi, trouble.texi:
 +      * windows.texi, xresources.texi: Nuke hand-written node pointers.
 +
 +2012-05-22  Glenn Morris  <rgm@gnu.org>
 +
 +      * emacs.texi (Acknowledgments): Add another contributor.
 +
 +2012-05-12  Glenn Morris  <rgm@gnu.org>
 +
 +      * Makefile.in (MKDIR_P): New, set by configure.
 +      (mkinfodir): Use $MKDIR_P.
 +
 +2012-05-10  Glenn Morris  <rgm@gnu.org>
 +
 +      * mule.texi (Disabling Multibyte): Replace the obsolete "unibyte: t"
 +      with "coding: raw-text".
 +
 +      * files.texi (Interlocking): Mention create-lockfiles option.
 +
 +2012-05-09  Chong Yidong  <cyd@gnu.org>
  
        * frames.texi (Mouse References, Mouse Commands): Fix index
        entries (Bug#11362).
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1,64 -1,17 +1,68 @@@
++2012-06-17  Chong Yidong  <cyd@gnu.org>
++
++      * elisp.texi: Remove urlcolor setting.
++
 +2012-06-17  Glenn Morris  <rgm@gnu.org>
 +
 +      * display.texi (Face Attributes): Copyedits.  Add a few cindex entries.
 +      Overlining no longer behaves exactly like underlining.
 +
 +2012-06-16  Aurelien Aptel  <aurelien.aptel@gmail.com>
 +
 +      * display.texi (Face Attributes):
 +      Document wave-style underline face attribute.
 +
  2012-06-11  Chong Yidong  <cyd@gnu.org>
  
 -      * elisp.texi, vol1.texi, vol2.texi: Remove urlcolor setting.
 +      * display.texi (ImageMagick Images): ImageMagick now supports the
 +      :background property.
 +
 +2012-06-10  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +      * internals.texi (Garbage Collection): Typo fix.
 +
 +2012-06-09  Chong Yidong  <cyd@gnu.org>
 +
 +      * text.texi (Special Properties): Clarify the meaning of a list of
 +      faces in the `face' property.
 +
 +      * display.texi (Face Remapping): Minor clarification.
  
 -      * vol2.texi: Include package.texi.
 +2012-06-08  Chong Yidong  <cyd@gnu.org>
  
 -2012-06-01  Chong Yidong  <cyd@gnu.org>
 +      * display.texi (Face Attributes): Font family does not accept
 +      wildcards.  De-document obsolete :bold and :italic attributes.
 +      (Defining Faces): Use new-style face spec format.
  
 -      * Version 24.1 released.
 +2012-06-08  Dmitry Antipov  <dmantipov@yandex.ru>
  
 -2012-05-15  Chong Yidong  <cyd@gnu.org>
 +      * internals.text (Garbage Collection): Document new
 +      vector management code and vectorlike_header structure.
  
 -      * functions.texi (Obsolete Functions): Fix doc for
 -      set-advertised-calling-convention.
 +2012-06-03  Chong Yidong  <cyd@gnu.org>
 +
 +      * modes.texi (Mode Line Data): Use "mode line construct"
 +      terminology for consistency.
 +
 +2012-05-27  Glenn Morris  <rgm@gnu.org>
 +
 +      * abbrevs.texi, advice.texi, anti.texi, backups.texi:
 +      * buffers.texi, commands.texi, compile.texi, control.texi:
 +      * customize.texi, debugging.texi, display.texi, doclicense.texi:
 +      * edebug.texi, elisp.texi, errors.texi, eval.texi, files.texi:
 +      * frames.texi, functions.texi, gpl.texi, hash.texi, help.texi:
 +      * hooks.texi, index.texi, internals.texi, intro.texi, keymaps.texi:
 +      * lists.texi, loading.texi, macros.texi, maps.texi, markers.texi:
 +      * minibuf.texi, modes.texi, nonascii.texi, numbers.texi:
 +      * objects.texi, os.texi, package.texi, positions.texi:
 +      * processes.texi, searching.texi, sequences.texi, streams.texi:
 +      * strings.texi, symbols.texi, syntax.texi, text.texi, tips.texi:
 +      * variables.texi, windows.texi: Nuke hand-written node pointers.
 +
 +2012-05-27  Chong Yidong  <cyd@gnu.org>
 +
 +      * functions.texi (Obsolete Functions):
 +      Fix doc for set-advertised-calling-convention.
  
        * modes.texi (Mode Help): Fix describe-mode.
  
Simple merge
@@@ -2077,15 -2074,15 +2077,14 @@@ names.  @xref{Fontsets}, for informatio
  
  @item :foundry
  The name of the @dfn{font foundry} for the font family specified by
 -the @code{:family} attribute (a string).  The wild-card characters
 -@samp{*} and @samp{?} are allowed.  @xref{Fonts,,, emacs, The GNU
 -Emacs Manual}.
 +the @code{:family} attribute (a string).  @xref{Fonts,,, emacs, The
 +GNU Emacs Manual}.
  
  @item :width
- Relative proportionate character width, also known as the character
- set width.  This should be one of the symbols @code{ultra-condensed},
- @code{extra-condensed}, @code{condensed}, @code{semi-condensed},
- @code{normal}, @code{semi-expanded}, @code{expanded},
- @code{extra-expanded}, or @code{ultra-expanded}.
+ Relative character width.  This should be one of the symbols
+ @code{ultra-condensed}, @code{extra-condensed}, @code{condensed},
+ @code{semi-condensed}, @code{normal}, @code{semi-expanded},
+ @code{expanded}, @code{extra-expanded}, or @code{ultra-expanded}.
  
  @item :height
  The height of the font.  In the simplest case, this is an integer in
Simple merge
  @c in general, keep the following line commented out, unless doing a
  @c copy of this manual that will be published.  The manual should go
  @c onto the distribution in the full, 8.5 x 11" size.
- @c @smallbook
+ @c @set smallbook
  
 +@ifset volflag
 +@smallbook
 +@end ifset
 +
  @ifset smallbook
  @smallbook
  @end ifset
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/ChangeLog
 -2012-06-01  Chong Yidong  <cyd@gnu.org>
+ 2012-06-13  Glenn Morris  <rgm@gnu.org>
+       * international/mule-cmds.el (mule-menu-keymap)
+       (set-language-environment, set-locale-environment): Doc tweaks.
 +2012-06-16  Aurelien Aptel  <aurelien.aptel@gmail.com>
 +
 +      * cus-face.el (custom-face-attributes): Add wave-style underline
 +      attribute.
 +      * faces.el (set-face-attribute): Update docstring to describe
 +      wave-style underline attribute.
 +
 +2012-06-16  Chong Yidong  <cyd@gnu.org>
 +
 +      * term/xterm.el (terminal-init-xterm): Discard input before
 +      querying background mode (Bug#10959).
 +
 +2012-06-16  Stefan Merten  <smerten@oekonux.de>
 +
 +      * textmodes/rst.el: Added and corrected some comments.
 +      (rst-re-alist-def): Improve symbol syntax.
 +      (rst-mode-syntax-table): Correct syntax entries.
 +      (rst-cvs-header, rst-svn-rev, rst-svn-timestamp)
 +      (rst-official-version, rst-official-cvs-rev): Update version
 +      information.
 +
 +2012-06-15  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * makefile.w32-in (COMPILE_FIRST): Synch with makefile.in changes
 +      in 2008-06-22T13:57:28Z!monnier@iro.umontreal.ca.
 +
 +2012-06-15  Fabián Ezequiel Gallina  <fgallina@cuca>
 +
 +      * progmodes/python.el: New python.el merge.
 +      (python-guess-indent): Obsolete var.
 +      (python-indent-guess-indent-offset): New defcustom.
 +      (python-indent): Obsolete var.
 +      (python-indent-offset): New defcustom.
 +      (python-python-command, python-jython-command): Delete var.
 +      (python-shell-interpreter): New defcustom.
 +      (python-pdbtrack-do-tracking-p): Delete var.
 +      (python-pdbtrack-activate): New defcustom.
 +      (python-use-skeletons): Obsolete var.
 +      (python-skeleton-autoinsert): New defcustom.
 +      (inferior-python-filter-regexp, python-continuation-offset)
 +      (python-honour-comment-indentation, python-indent-string-contents)
 +      (python-jython-packages, python-mode-hook)
 +      (python-pdbtrack-minor-mode-string, python-remove-cwd-from-path)
 +      (python-shell-prompt-alist)
 +      (python-source-modes): Delete defcustoms.
 +      (python-check-buffer-name, python-eldoc-setup-code)
 +      (python-eldoc-string-code, python-ffap-setup-code)
 +      (python-ffap-string-code, python-fill-comment-function)
 +      (python-fill-decorator-function, python-fill-paren-function)
 +      (python-fill-string-function, python-imenu-include-defun-type)
 +      (python-imenu-make-tree, python-imenu-subtree-root-label)
 +      (python-pdbtrack-stacktrace-info-regexp, python-shell-buffer-name)
 +      (python-shell-compilation-regexp-alist)
 +      (python-shell-completion-module-string-code)
 +      (python-shell-completion-pdb-string-code)
 +      (python-shell-completion-setup-code)
 +      (python-shell-completion-string-code)
 +      (python-shell-enable-font-lock, python-shell-exec-path)
 +      (python-shell-extra-pythonpaths)
 +      (python-shell-internal-buffer-name, python-shell-interpreter-args)
 +      (python-shell-process-environment)
 +      (python-shell-prompt-block-regexp)
 +      (python-shell-prompt-output-regexp)
 +      (python-shell-prompt-pdb-regexp, python-shell-prompt-regexp)
 +      (python-shell-send-setup-max-wait, python-shell-setup-codes)
 +      (python-shell-virtualenv-path): New defcustoms.
 +      (brm-menu, eldoc-documentation-function, inferior-python-mode-map)
 +      (inferior-python-mode-syntax-table, python--prompt-regexp)
 +      (python-buffer, python-command python-python-command)
 +      (python-default-template, python-imports, python-indent-index)
 +      (python-indent-list, python-indent-list-length)
 +      (python-mode-running, python-pdbtrack-is-tracking-p)
 +      (python-preoutput-continuation, python-preoutput-leftover)
 +      (python-preoutput-result, python-preoutput-skip-next-prompt)
 +      (python-prev-dir/file, python-recursing)
 +      (python-saved-check-command, python-version-checked)
 +      (python-which-func-length-limit)
 +      (view-return-to-alist): Delete vars.
 +      (python-check-custom-command, python-dotty-syntax-table)
 +      (python-imenu-index-alist, python-indent-current-level)
 +      (python-indent-dedenters, python-indent-levels)
 +      (python-nav-beginning-of-defun-regexp)
 +      (python-nav-list-defun-positions-cache)
 +      (python-pdbtrack-buffers-to-kill, python-pdbtrack-tracked-buffer)
 +      (python-shell-internal-buffer)
 +      (python-skeleton-available): New vars.
 +      (def-python-skeleton): Delete macro.
 +      (python-skeleton-define): New macro.
 +      (python-define-auxiliary-skeleton, python-rx): New macros.
 +      (python-insert-class): Delete command.
 +      (python-skeleton-class): New command.
 +      (python-insert-def): Delete command.
 +      (python-skeleton-def): New command.
 +      (python-insert-for): Delete command.
 +      (python-skeleton-for): New command.
 +      (python-insert-if): Delete command.
 +      (python-skeleton-if): New command.
 +      (python-insert-try/except, python-insert-try/finally): Delete commands.
 +      (python-skeleton-try): New command.
 +      (python-insert-while): Delete command.
 +      (python-skeleton-while): New command.
 +      (python-backspace): Delete command.
 +      (python-indent-dedent-line-backspace): New command.
 +      (python-electric-colon): Delete command.
 +      (python-indent-electric-colon): New command.
 +      (python-guess-indent): Delete command.
 +      (python-indent-guess-indent-offset): New command.
 +      (python-shift-left): Delete command.
 +      (python-indent-shift-left): New command.
 +      (python-shift-right): Delete command.
 +      (python-indent-shift-right): New command.
 +      (python-find-function): Delete command.
 +      (python-nav-jump-to-defun): New command.
 +      (python-next-statement): Delete command.
 +      (python-nav-forward-sentence): New command.
 +      (python-previous-statement): Delete command.
 +      (python-nav-backward-sentence): New command.
 +      (python-fill-paragraph): Delete command.
 +      (python-fill-paragraph-function): New command.
 +      (python-send-buffer): Delete command.
 +      (python-shell-send-buffer): New command.
 +      (python-send-defun): Delete command.
 +      (python-shell-send-defun): New command.
 +      (python-send-region, python-send-region-and-go): Delete commands.
 +      (python-shell-send-region)
 +      (python-shell-switch-to-shell): New commands.
 +      (python-send-string): Delete command.
 +      (python-shell-send-string): New command.
 +      (python-switch-to-python): Delete command.
 +      (python-shell-switch-to-shell): New command.
 +      (python-describe-symbol): Delete command.
 +      (python-eldoc-at-point): New command.
 +      (python--set-prompt-regexp, python-args-to-list)
 +      (python-after-info-look, python-check-version)
 +      (python-check-comint-prompt, python-find-imports)
 +      (python-execute-file, turn-off-pdbtrack, turn-on-pdbtrack)
 +      (python-unload-function, python-expand-template)
 +      (python-maybe-jython, python-preoutput-filter)
 +      (python-pdbtrack-get-source-buffer)
 +      (python-pdbtrack-grub-for-buffer, python-pdbtrack-overlay-arrow)
 +      (python-pdbtrack-toggle-stack-tracking)
 +      (python-pdbtrack-track-stack-file, python-initial-text)
 +      (python-first-word, python-comment-line-p, python-send-command)
 +      (python-setup-brm, python-sentinel, python-set-proc)
 +      (python-skip-out, python-input-filter, python-outdent-p)
 +      (python-outline-level, python-backslash-continuation-line-p)
 +      (python-end-of-block, python-end-of-statement, python-mark-block)
 +      (python-beginning-of-block, python-beginning-of-statement)
 +      (python-blank-line-p, python-beginning-of-string)
 +      (python-open-block-statement-p): Delete functions.
 +      (python-indent-line, python-indent-line-1): Delete functions.
 +      (python-indent-line): New function.
 +      (python-indentation-levels): Delete function.
 +      (python-indent-calculate-levels): New function.
 +      (python-proc): Delete function.
 +      (python-shell-get-process): New function.
 +      (python-send-receive): Delete function.
 +      (python-shell-send-string-no-output): New function.
 +      (python-module-path): Delete function.
 +      (python-ffap-module-path): New function.
 +      (python-completion-at-point)
 +      (python-symbol-completions): Delete functions.
 +      (python-completion-complete-at-point): New function.
 +      (python-load-file): Delete function.
 +      (python-shell-send-file): New function.
 +      (python-calculate-indentation): Delete function.
 +      (python-indent-calculate-indentation): New function.
 +      (python-skip-comments/blanks): Delete function.
 +      (python-util-forward-comment): New function.
 +      (python-continuation-line-p): Delete function.
 +      (python-info-continuation-line-p): New function.
 +      (python-which-func, python-current-defun): Delete function.
 +      (python-info-current-defun): New function.
 +      (python-beginning-of-defun): Delete function.
 +      (python-nav-beginning-of-defun): New function.
 +      (python-close-block-statement-p)
 +      (python-block-end-p): Delete function.
 +      (python-info-closing-block): New function.
 +      (python-comint-output-filter-function)
 +      (python-eldoc--get-doc-at-point, python-end-of-defun-function)
 +      (python-fill-comment, python-fill-decorator, python-fill-paren)
 +      (python-fill-string, python-imenu-make-element-tree)
 +      (python-imenu-make-tree, python-imenu-tree-assoc)
 +      (python-indent-context, python-indent-dedent-line)
 +      (python-indent-line-function)
 +      (python-indent-post-self-insert-function)
 +      (python-indent-toggle-levels)
 +      (python-info-assignment-continuation-line-p)
 +      (python-info-beginning-of-backlash)
 +      (python-info-block-continuation-line-p)
 +      (python-info-closing-block-message)
 +      (python-info-line-ends-backslash-p)
 +      (python-info-looking-at-beginning-of-defun)
 +      (python-info-ppss-context, python-info-ppss-context-type)
 +      (python-nav-list-defun-positions, python-nav-read-defun)
 +      (python-nav-sentence-end, python-nav-sentence-start)
 +      (python-pdbtrack-comint-output-filter-function)
 +      (python-pdbtrack-set-tracked-buffer)
 +      (python-shell-calculate-exec-path)
 +      (python-shell-calculate-process-environment)
 +      (python-shell-completion--do-completion-at-point)
 +      (python-shell-completion--get-completions)
 +      (python-shell-completion-complete-at-point)
 +      (python-shell-completion-complete-or-indent)
 +      (python-shell-get-or-create-process)
 +      (python-shell-get-process-name)
 +      (python-shell-internal-get-or-create-process)
 +      (python-shell-internal-get-process-name)
 +      (python-shell-internal-send-string, python-shell-make-comint)
 +      (python-shell-parse-command, python-shell-send-setup-code)
 +      (python-skeleton-add-menu-items)
 +      (python-util-clone-local-variables, python-util-position)
 +      (run-python-internal, python-indentation-levels)
 +      (python-nav-beginning-of-defun)
 +      (python-completion-complete-at-point): New functions.
 +      (run-python): Change arguments.  New API requirements.
 +
 +2012-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/cl-lib.el (cl--defsubst-expand): Autoload inliner
 +      (bug#11649).
 +
 +      * emacs-lisp/macroexp.el (macroexp--compiler-macro): New function.
 +      (macroexp--expand-all): Use it.
 +
 +      * emacs-lisp/cl-macs.el (cl--transform-function-property): Remove.
 +      (cl-define-setf-expander, cl-deftype, cl-define-compiler-macro):
 +      Use `cl-function' instead.
 +
 +2012-06-14  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * makefile.w32-in (COMPILE_FIRST): Remove subr.el.
 +      Suggested by Stefan Monnier while discussing bug#11657.
 +
 +2012-06-14  Sam Steingold  <sds@gnu.org>
 +
 +      * files.el (abort-if-file-too-large): Use `file-size-human-readable'.
 +
 +2012-06-14  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * play/doctor.el (doctor-doc): Remove parameter and use
 +      doctor-sent instead of sent.
 +      (doctor-read-print): Use doctor-sent instead of sent.  (Bug#11708)
 +
 +2012-06-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * files.el: Require cl-lib.
 +      (file-name-non-special): Replace case -> cl-case.
 +
 +      * emacs-lisp/cl-macs.el (cl-defstruct): Don't add print-func.
 +
 +      * emacs-lisp/edebug.el (edebug-read-function): Remove old incorrect
 +      mapping from #' to function*.
 +
 +2012-06-13  Chong Yidong  <cyd@gnu.org>
 +
 +      * mouse.el (mouse-drag-track): Do not set the mark if the user
 +      releases the mouse without selecting anything (Bug#11588).
 +
 +2012-06-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * textmodes/tex-mode.el (latex-indent): Recognize tex-verbatim at EOB
 +      as well (bug#11646).
 +
 +      * loadup.el: Count byte-code functions as well.
  
 -      * Version 24.1 released.
 +      * emacs-lisp/byte-opt.el (featurep): Move compiler-macro...
 +      * emacs-lisp/bytecomp.el (featurep): ...here (bug#11692).
  
 -2012-06-01  Glenn Morris  <rgm@gnu.org>
 +      * emacs-lisp/autoload.el (make-autoload): Accept nil doc-string-elt
 +      (bug#11649).  Add cl-defun and cl-defmacro.
  
 -      * mail/rmail.el (rmail-yank-current-message):
 -      Leave point at correct position.  (Bug#11660)
 +2012-06-13  Drew Adams  <drew.adams@oracle.com>
  
 -2012-06-01  Chong Yidong  <cyd@gnu.org>
 +      * help-mode.el (help-bookmark-make-record, help-bookmark-jump):
 +      Fix last change.
  
 -      * allout-widgets.el: Fix code header
 +2012-06-13  Michael Albinus  <michael.albinus@gmx.de>
  
 -2012-06-01  Chong Yidong  <cyd@gnu.org>
 +      * net/dbus.el (dbus-call-method): Use timeout for `read-event'.
 +      Otherwise, it blocks in batch mode.
  
 -      * cus-edit.el (customize-changed-options-previous-release): Bump
 -      to 23.4.
 +2012-06-13  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * help-mode.el (bookmark-make-record-default): Declare.
 +
 +2012-06-13  Chong Yidong  <cyd@gnu.org>
 +
 +      * emacs-lisp/package.el (list-packages): Compute a list of
 +      packages that are newly-available since the last list-packages
 +      invocation.
 +      (package-menu--new-package-list): New var.
 +      (package-menu--generate, package-menu--print-info)
 +      (package-menu--status-predicate, package-menu-mark-install):
 +      Handle new status label "new".
 +
 +2012-06-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/cl-macs.el (cl-remf): Fix error in recent
 +      conversion to backquotes.
 +
 +2012-06-12  Chong Yidong  <cyd@gnu.org>
 +
 +      * emacs-lisp/edebug.el (edebug-inhibit-emacs-lisp-mode-bindings):
 +      Rename from gud-inhibit-global-bindings.
 +
 +      * emacs-lisp/eieio.el (eieio-pre-method-execution-hooks): Doc fix.
 +
 +      * nxml/nxml-glyph.el (nxml-glyph-set-functions): Rename abnormal
 +      hook from nxml-glyph-set-hook.
 +
 +      * progmodes/cwarn.el (cwarn-mode): Remove redundant variable
 +      declaration.
 +
 +      * progmodes/pascal.el (pascal-toggle-completions): Doc fix.
 +
 +      * textmodes/bibtex.el (bibtex-string-file-path, bibtex-file-path):
 +      Convert to defcustom.
 +
 +2012-06-12  Drew Adams  <drew.adams@oracle.com>
 +
 +      * help-mode.el (help-bookmark-make-record, help-bookmark-jump):
 +      New functions.
 +      (help-mode): Use them.
 +
 +2012-06-11  Glenn Morris  <rgm@gnu.org>
 +
 +      * progmodes/fortran.el (fortran-font-lock-keywords-3):
 +      Use preprocessor face for directives.
 +      (fortran-directive-re): Doc fix.
 +
 +2012-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/cl-macs.el (cl-parse-loop-clause): Fix error in recent
 +      conversion to backquotes (bug#11652).
 +
 +      Fix compiler-expansion of CL's cXXr functions (bug#11673).
 +      * emacs-lisp/cl-lib.el (cl--defalias): New function.
 +      (cl-values, cl-values-list, cl-copy-seq, cl-svref, cl-first)
 +      (cl-second, cl-rest, cl-endp, cl-third, cl-fourth): Use it.
 +      (cl-plusp, cl-minusp, cl-fifth, cl-sixth, cl-seventh, cl-eighth)
 +      (cl-ninth, cl-tenth): Mark them as inlinable.
 +      (cl-caaar, cl-caadr, cl-cadar, cl-caddr, cl-cdaar, cl-cdadr)
 +      (cl-cddar, cl-cdddr, cl-caaaar, cl-caaadr, cl-caadar, cl-caaddr)
 +      (cl-cadaar, cl-cadadr, cl-caddar, cl-cadddr, cl-cdaaar, cl-cdaadr)
 +      (cl-cdadar, cl-cdaddr, cl-cddaar, cl-cddadr, cl-cdddar, cl-cddddr):
 +      Add a compiler-macro declaration to use cl--compiler-macro-cXXr.
 +      (cl-list*, cl-adjoin): Don't put an autoload manually.
 +      * emacs-lisp/cl-macs.el (cl--compiler-macro-adjoin)
 +      (cl--compiler-macro-list*): Add autoload cookie.
 +      (cl--compiler-macro-cXXr): New function.
 +
 +      * help-fns.el (help-fns--compiler-macro): New function extracted from
 +      describe-function-1; follow aliases and use `compiler-macro' property.
 +      (describe-function-1): Use it.
 +
 +2012-06-11  Chong Yidong  <cyd@gnu.org>
 +
 +      * startup.el (fancy-splash-head): Use splash.svg even if librsvg
 +      is uninstalled, if imagemagick is installed.
 +
 +2012-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/cl-lib.el: Use lexical-binding.
 +      (cl-map-extents, cl-maclisp-member): Remove.
 +      (cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
 +      (cl--set-substring, cl--block-wrapper, cl--block-throw)
 +      (cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
 +      * emacs-lisp/cl-extra.el: Use lexical-binding.
 +      (cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
 +      (cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
 +      (cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
 +      (cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
 +      * emacs-lisp/cl-seq.el: Use lexical-binding.
 +      (cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
 +      (cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
 +      (cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
 +      * emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
 +      * edmacro.el (edmacro-mismatch): Simplify to remove dependence on
 +      CL's internals.
 +
 +2012-06-11  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      Sync with Tramp 2.2.6-pre.
 +
 +      * net/tramp-cache.el (tramp-dump-connection-properties): Let-bind
 +      `print-length' and `print-level' to nil, in order to avoid
 +      truncation.  Reported by Christopher Schmidt
 +      <christopher@ristopher.com>.
 +
 +      * net/tramp-cmds.el (tramp-cleanup-connection): Delete also process.
 +
 +      * net/tramp-compat.el (tramp-compat-condition-case-unless-debug):
 +      New defmacro.
 +      (tramp-compat-copy-directory): Add optional argument
 +      COPY-CONTENTS.  It is not handled yet.
 +
 +      * net/tramp-ftp.el (tramp-disable-ange-ftp): Fix docstring.
 +      (tramp-ftp-file-name-p): Simplify.
 +
 +      * net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name):
 +      * net/tramp-gw.el (tramp-gw-open-connection): Add hop to
 +      connection vector.
 +
 +      * net/tramp-sh.el (tramp-copy-size-limit): Fix docstring.
 +      (tramp-methods): Do not use `tramp-password-end-of-line'.
 +      (tramp-completion-function-alist-putty): Handle UNIX case.
 +      (tramp-remote-path): Add "/opt/bin", "/opt/sbin" and "/opt/local/bin".
 +      (tramp-do-file-attributes-with-stat)
 +      (tramp-do-directory-files-and-attributes-with-stat) Return uid and
 +      gid as real numbers.  They could run out of integer range on cygwin.
 +      (tramp-do-copy-or-rename-file-out-of-band): Better trace format.
 +      (tramp-sh-handle-expand-file-name): Handle hops.
 +      (tramp-open-connection-setup-interactive-shell):
 +      Use `tramp-cleanup'.  Move check for busyboxes ...
 +      (tramp-find-shell): ... here.  Simplify implementation.
 +      Set "remote-shell" property also for alternative shells.
 +      (tramp-remote-coding-commands): Check "test -c /dev/stdout".
 +      If failing, a regular file would be written otherwise.
 +      Reported by Dmitry Kurochkin <dmitry.kurochkin@gmail.com>.
 +      (tramp-find-inline-encoding): Cache the coding commands in the
 +      process cache.  Apply test command on the remote side, if defined.
 +      (tramp-find-inline-compress): Cache the compress commands in the
 +      process cache.
 +      (tramp-compute-multi-hops): Save `tramp-default-proxies-alist'
 +      when requested.  Handle hops.
 +      (tramp-current-connection): New defvar.
 +      (tramp-maybe-open-connection): Use `tramp-cleanup'.
 +      Throw `suppress', if there was a failed connection shortly before.
 +      Handle user interrupt.  (Bug#10187)
 +      (tramp-get-inline-compress, tramp-get-inline-coding):
 +      Read connection properties from the process cache.
 +
 +      * net/tramp-smb.el (tramp-smb-server-version)
 +      (tramp-smb-wrong-passwd-regexp, tramp-smb-actions-with-tar):
 +      New defconsts.
 +      (tramp-smb-prompt): Extend for powershell prompt.
 +      (tramp-smb-file-name-handler-alist): Add handlers for
 +      `process-file', `shell-command' and `start-file-process'.
 +      (tramp-smb-winexe-program, tramp-smb-winexe-shell-command)
 +      (tramp-smb-winexe-shell-command-switch): New defcustoms.
 +      (tramp-smb-file-name-p): Simplify.
 +      (tramp-smb-action-with-tar, tramp-smb-handle-process-file)
 +      (tramp-smb-kill-winexe-function, tramp-smb-call-winexe)
 +      (tramp-smb-shell-quote-argument): New defuns.
 +      (tramp-smb-handle-copy-directory): Add COPY-CONTENTS argument.
 +      Implement using "tar".  By this, time-stamps are preserved.
 +      (tramp-smb-handle-copy-file): Handle also the case of directories.
 +      (tramp-smb-do-file-attributes-with-stat)
 +      (tramp-smb-get-file-entries, tramp-smb-get-cifs-capabilities):
 +      Use `tramp-get-connection-buffer').
 +      (tramp-smb-handle-rename-file): Use "rename", when source and
 +      target are on the same share.
 +      (tramp-smb-maybe-open-connection): Handle wrong passwords.
 +      Use `tramp-smb-server-version'.
 +      (tramp-smb-wait-for-output): Remove prompt.
 +
 +      * net/tramp.el (top): Require 'cl.
 +      (tramp-methods, tramp-rsh-end-of-line):
 +      Remove `tramp-password-end-of-line' from docstring.
 +      (tramp-save-ad-hoc-proxies): New defcustom.
 +      (tramp-completion-function-alist): Adapt docstring.
 +      (tramp-default-password-end-of-line): Remove defcustom.
 +      (tramp-shell-prompt-pattern): Allow "[]" style prompts.  (Bug#11065)
 +      (tramp-user-regexp, tramp-file-name-regexp-unified)
 +      (tramp-file-name-regexp-url): Extend regexp by hop separator.
 +      (tramp-postfix-hop-format, tramp-postfix-hop-regexp)
 +      (tramp-remote-file-name-spec-regexp): New defconst.
 +      (tramp-file-name-structure): Extend structure for hops.
 +      (tramp-get-method-parameter): Move up.
 +      (tramp-file-name-p, tramp-dissect-file-name)
 +      (with-parsed-tramp-file-name): Handle hops.
 +      (tramp-file-name-hop): New defun.
 +      (tramp-make-tramp-file-name): New optional arg HOP.
 +      (tramp-message-show-progress-reporter-message): New defvar.
 +      (tramp-with-progress-reporter): Use it.  We cannot use
 +      `tramp-message-show-message' here, because this suppresses also
 +      error buffers.
 +      (tramp-error-with-buffer): Suppress buffer view, if
 +      `tramp-message-show-message' is nil.
 +      Use `tramp-get-connection-buffer'.
 +      (tramp-cleanup): New defun.
 +      (tramp-rfn-eshadow-update-overlay): Let-bind `non-essential' to `t'.
 +      (tramp-file-name-handler): If `debug-on-error' is set, propagate
 +      an error unchanged.
 +      (tramp-completion-handle-file-name-all-completions): Handle hops.
 +      Fix an error when called from ido.
 +      (tramp-completion-dissect-file-name): Use better local variable
 +      name.  Add hop to the vector.
 +      (tramp-handle-insert-file-contents): Use progress-reporter for the
 +      whole scenario.
 +      (tramp-action-password): Let-bind `enable-recursive-minibuffers'
 +      to `t'.
 +      (tramp-check-for-regexp): Simplify search.
 +      (tramp-enter-password): Remove it.  Move implementation ...
 +      (tramp-action-password): ... here.
 +      (tramp-mode-string-to-int, tramp-local-host-p)
 +      (tramp-make-tramp-temp-file, tramp-read-passwd)
 +      (tramp-clear-passwd, tramp-time-less-p, tramp-time-diff):
 +      Set tramp-autoload cookie.
 +
 +      * net/trampver.el: Update release number.
 +
 +2012-06-11  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 +          Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * net/tramp.el (tramp-set-completion-function): Fix docstring.
 +      (tramp-parse-group, tramp-parse-file)
 +      (tramp-parse-shostkeys-sknownhosts): New defuns.
 +      (tramp-parse-rhosts, tramp-parse-rhosts-group, tramp-parse-shosts)
 +      (tramp-parse-shosts-group, tramp-parse-sconfig)
 +      (tramp-parse-sconfig-group, tramp-parse-shostkeys)
 +      (tramp-parse-sknownhosts, tramp-parse-hosts)
 +      (tramp-parse-hosts-group, tramp-parse-passwd, tramp-parse-netrc):
 +      Use them.
 +      (tramp-parse-passwd-group, tramp-parse-netrc-group)
 +      (tramp-parse-putty-group): Don't narrow.
 +      (tramp-parse-putty): Make a loop.
 +      (tramp-file-name-handler): Catch the `suppress' signal.
 +
 +2012-06-11  Chong Yidong  <cyd@gnu.org>
 +
 +      * image.el (imagemagick-register-types): Put the ImageMagick entry
 +      at the end of image-type-file-name-regexps.
 +
 +2012-06-11  Johan Bockgård  <bojohan@gnu.org>
 +
 +      * emacs-lisp/pcase.el (pcase-UPAT, pcase-QPAT): New edebug specs.
 +      (pcase, pcase-let*, pcase-dolist): Use them.
 +
 +2012-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/pcase.el (pcase--let*): New function.
 +      (pcase-let*): Use it.  Use pcase--memoize to avoid repeated expansions.
 +      (pcase--expand): Use macroexp-let².
 +
 +2012-06-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/timer.el, emacs-lisp/syntax.el, emacs-lisp/smie.el:
 +      * emacs-lisp/ewoc.el, emacs-lisp/cconv.el, emacs-lisp/bytecomp.el:
 +      * emacs-lisp/byte-opt.el, emacs-lisp/autoload.el: Convert to cl-lib.
 +      * emacs-lisp/easymenu.el, emacs-lisp/easy-mmode.el:
 +      * emacs-lisp/derived.el: Use pcase instead of `cl'.
 +      * emacs-lisp/cl-lib.el: Get rid of special cl-macs auto load.
 +
 +2012-06-10  Glenn Morris  <rgm@gnu.org>
 +
 +      * mail/rmail.el (rmail-yank-current-message): Leave point at
 +      correct position.  (Bug#11660)
 +
 +2012-06-10  Chong Yidong  <cyd@gnu.org>
 +
 +      * allout-widgets.el: Fix code header.
 +
 +2012-06-10  Chong Yidong  <cyd@gnu.org>
 +
 +      * cus-edit.el (customize-changed-options-previous-release):
 +      Bump to 24.1.
 +
 +2012-06-09  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * Makefile.in (BIG_STACK_DEPTH): Enlarge to 2200.
 +
 +2012-06-09  Chong Yidong  <cyd@gnu.org>
 +
 +      * ebuff-menu.el (electric-buffer-list): Preserve header line.
 +
 +2012-06-09  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (special-display-popup-frame): Don't use
 +      window--display-buffer (Bug#11651).
 +
 +2012-06-09  Eli Zaretskii  <eliz@gnu.org>
 +
 +      Fix parallel builds: make sure loaddefs.el is not being written
 +      while Lisp files are compiled.
 +      (compile): Don't depend on 'mh-autoloads'.
 +      (compile-CMD, compile-SH): Depend on 'autoloads'.
 +      (bootstrap): Don't depend on 'autoloads' and 'mh-autoloads'.
 +
 +      * makefile.w32-in (BIG_STACK_DEPTH): Enlarge to 2200.  (Bug#11649)
 +
 +2012-06-09  Chong Yidong  <cyd@gnu.org>
 +
 +      * face-remap.el (face-remap-add-relative, face-remap-set-base)
 +      (buffer-face-set, buffer-face-toggle, buffer-face-mode-invoke):
 +      Doc fixes (Bug#11225).
 +
 +2012-06-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/macroexp.el (macroexp--expand-all): Only autoload
 +      a function if there's a clear indication that it has a compiler-macro.
 +      * emacs-lisp/byte-run.el (defun-declarations-alist, defmacro, defun)
 +      (macro-declarations-alist): Add arglist to declaration functions.
 +      (defun-declarations-alist): Add `obsolete' and `compiler-macro'.
 +      * emacs-lisp/cl-seq.el (cl-member, cl-assoc):
 +      * emacs-lisp/cl-lib.el (cl-list*, cl-adjoin):
 +      * emacs-lisp/cl-extra.el (cl-get): Use the new `declare' statement.
 +      Also add autoload to find the compiler macro.
 +      * emacs-lisp/cl-macs.el (eql) [compiler-macro]: Remove.
 +      (cl--compiler-macro-member, cl--compiler-macro-assoc)
 +      (cl--compiler-macro-adjoin, cl--compiler-macro-list*)
 +      (cl--compiler-macro-get): New functions, replacing calls to
 +      cl-define-compiler-macro.
 +      (cl-typep) [compiler-macro]: Use macroexp-let².
 +
 +2012-06-08  Nick Dokos  <nicholas.dokos@hp.com>  (tiny change)
 +
 +      * calendar/icalendar.el (icalendar--parse-vtimezone): Import TZID
 +      string properly, fixes Bug#11473.
 +
 +2012-06-08  Chong Yidong  <cyd@gnu.org>
 +
 +      * faces.el (set-face-attribute): Doc fix.
 +      (modify-face): Don't use :bold and :italic.
 +      (error, warning, success): Tweak definitions.
 +
 +      * cus-edit.el (custom-modified, custom-invalid, custom-rogue)
 +      (custom-modified, custom-set, custom-changed, custom-themed)
 +      (custom-saved, custom-button, custom-button-mouse)
 +      (custom-button-pressed, custom-state, custom-comment-tag)
 +      (custom-variable-tag, custom-group-tag-1, custom-group-tag)
 +      (custom-group-subtitle): Use new-style face specs.
 +      (custom-invalid-face, custom-rogue-face, custom-modified-face)
 +      (custom-set-face, custom-changed-face, custom-saved-face)
 +      (custom-button-face, custom-button-pressed-face)
 +      (custom-documentation-face, custom-state-face)
 +      (custom-comment-face, custom-comment-tag-face)
 +      (custom-variable-tag-face, custom-variable-button-face)
 +      (custom-face-tag-face, custom-group-tag-face-1)
 +      (custom-group-tag-face): Remove obsolete face alias.
 +
 +      * epa.el (epa-validity-high, epa-validity-medium)
 +      (epa-validity-low, epa-mark, epa-field-name, epa-string)
 +      (epa-field-name, epa-field-body):
 +      * font-lock.el (font-lock-comment-face, font-lock-string-face)
 +      (font-lock-keyword-face, font-lock-builtin-face)
 +      (font-lock-function-name-face, font-lock-variable-name-face)
 +      (font-lock-type-face, font-lock-constant-face):
 +      * ido.el (ido-first-match, ido-only-match, ido-subdir)
 +      (ido-virtual, ido-indicator, ido-incomplete-regexp):
 +      * speedbar.el (speedbar-button-face, speedbar-file-face)
 +      (speedbar-directory-face, speedbar-tag-face)
 +      (speedbar-selected-face, speedbar-highlight-face)
 +      (speedbar-separator-face):
 +      * whitespace.el (whitespace-newline, whitespace-space)
 +      (whitespace-hspace, whitespace-tab, whitespace-trailing)
 +      (whitespace-line, whitespace-space-before-tab)
 +      (whitespace-space-after-tab, whitespace-indentation)
 +      (whitespace-empty):
 +      * emulation/cua-base.el (cua-global-mark):
 +      * eshell/em-prompt.el (eshell-prompt):
 +      * net/newst-plainview.el (newsticker-new-item-face)
 +      (newsticker-old-item-face, newsticker-immortal-item-face)
 +      (newsticker-obsolete-item-face, newsticker-date-face)
 +      (newsticker-statistics-face, newsticker-default-face):
 +      * net/newst-reader.el (newsticker-feed-face)
 +      (newsticker-extra-face, newsticker-enclosure-face):
 +      * net/newst-treeview.el (newsticker-treeview-face)
 +      (newsticker-treeview-new-face, newsticker-treeview-old-face)
 +      (newsticker-treeview-immortal-face)
 +      (newsticker-treeview-obsolete-face)
 +      (newsticker-treeview-selection-face):
 +      * net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
 +      (rcirc-bright-nick, rcirc-server, rcirc-timestamp)
 +      (rcirc-nick-in-message, rcirc-nick-in-message-full-line)
 +      (rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
 +      * nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
 +      (nxml-outline-active-indicator, nxml-outline-ellipsis):
 +      * play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
 +      (mpuz-text):
 +      * progmodes/vera-mode.el (vera-font-lock-number)
 +      (vera-font-lock-function, vera-font-lock-interface):
 +      * textmodes/table.el (table-cell): Use new-style face specs, and
 +      don't use the old :bold and :italic attributes.
 +
 +      * progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
 +      (ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
 +      (ebrowse-member-class, ebrowse-progress): Likewise.
 +      (ebrowse-tree-mark-face, ebrowse-root-class-face)
 +      (ebrowse-file-name-face, ebrowse-default-face)
 +      (ebrowse-member-attribute-face, ebrowse-member-class-face)
 +      (ebrowse-progress-face): Remove obsolete faces.
 +
 +      * progmodes/flymake.el (flymake-errline, flymake-warnline):
 +      Inherit from error and warning faces respectively.
 +
 +      * textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
 +      Likewise.
 +      (flyspell-incorrect-face, flyspell-duplicate-face):
 +      Remove obsolete aliases.
 +
 +2012-06-08  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * net/tramp-compat.el (tramp-compat-temporary-file-directory):
 +      Avoid infloop.
 +
 +2012-06-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * startup.el (argv, argi): Make lexically scoped.
 +      * emacs-lisp/float-sup.el (pi): Use internal-make-var-non-special.
 +      * emacs-lisp/cl-macs.el: Use lexical-binding.
 +      Rename cl-bind-* to cl--bind-*.
 +      * files.el: Don't require `cl' since it doesn't use it.
 +      * emacs-lisp/pcase.el, emacs-lisp/macroexp.el: Add coding cookie.
 +
 +2012-06-08  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * textmodes/texinfmt.el: Fix bug#11640 (reverts part of 2008-07-31T05:33:56Z!dann@ics.uci.edu).
 +      (texinfo-format-printindex): Use `texinfo-sort-region' in all platforms,
 +      instead of calling external sort utility.
 +      (texinfo-sort-region, texinfo-sort-startkeyfun): Restore functions.
 +
 +2012-06-08  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * descr-text.el (describe-char): Mention how to insert the
 +      character, if the current input method doesn't support it.
 +      See the discussion in this thread for the details:
 +      http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00533.html.
 +
 +2012-06-08  Sam Steingold  <sds@gnu.org>
 +
 +      * bindings.el (global-map): Bind XF86Forward to next-buffer and
 +      XF86Back to previous-buffer.
 +      (minibuffer-local-map): Bind them to next-history-element and
 +      previous-history-element respectively.
 +      * help-mode.el (help-mode-map): Bind them to help-go-forward and
 +      help-go-back respectively.
 +      * info.el (Info-mode-map): Bind them to Info-history-forward and
 +      Info-history-back respectively.
 +      These are the keys next to Up on the ThinkPad keyboard.
 +
 +2012-06-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      Get rid of cl-lexical-let, keeping only lexical-let for compatibility.
 +      * emacs-lisp/cl-macs.el: Provide itself.
 +      (cl--labels-convert-cache): New var.
 +      (cl--labels-convert): New function.
 +      (cl-flet, cl-labels): New implementation with new semantics, relying on
 +      lexical-binding.
 +      * emacs-lisp/cl.el: Mark compatibility aliases as obsolete.
 +      (cl-closure-vars, cl--function-convert-cache)
 +      (cl--function-convert): Move from cl-macs.el.
 +      (lexical-let, lexical-let*, flet, labels): Move from cl-macs.el and
 +      rename by removing the "cl-" prefix.
 +      * emacs-lisp/macroexp.el (macroexp-unprogn): New function.
 +
 +2012-06-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/cl.el (cl-macroexpand, cl-macro-environment)
 +      (cl-macroexpand-all, cl-not-hash-table, cl-builtin-gethash)
 +      (cl-builtin-remhash, cl-builtin-clrhash, cl-builtin-maphash)
 +      (cl-map-keymap, cl-copy-tree, cl-gethash, cl-puthash, cl-remhash)
 +      (cl-clrhash, cl-maphash, cl-make-hash-table, cl-hash-table-p)
 +      (cl-hash-table-count): Add old compatibility aliases.
 +
 +      * emacs-lisp/cl-macs.el (cl-macro-environment): Remove var.
 +      Use macroexpand-all-environment instead.
 +      (cl--old-macroexpand): New var.
 +      (cl--sm-macroexpand): New function.
 +      (cl-symbol-macrolet): Use it during macro expansion.
 +      (cl--function-convert-cache): New var.
 +      (cl--function-convert): New function, extracted from
 +      cl-macroexpand-all.
 +      (cl-lexical-let): Use it.
 +
 +      * emacs-lisp/cl-lib.el (cl-macro-environment): Remove decl.
 +      (cl-macroexpand): Move to cl-macs.el and rename to cl--sm-macroexpand.
 +      (cl-member): Remove old alias.
 +
 +      * emacs-lisp/cl-extra.el (cl-map-keymap, cl-copy-tree)
 +      (cl-not-hash-table, cl-builtin-gethash, cl-builtin-remhash)
 +      (cl-builtin-clrhash, cl-builtin-maphash, cl-gethash, cl-puthash)
 +      (cl-remhash, cl-clrhash, cl-maphash, cl-make-hash-table)
 +      (cl-hash-table-p, cl-hash-table-count): Move to cl.el.
 +      (cl-macroexpand-cmacs): Remove var.
 +      (cl-macroexpand-all, cl-macroexpand-body): Remove funs.
 +      Use macroexpand-all instead.
 +
 +2012-06-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/macroexp.el (macroexp-progn, macroexp-let*, macroexp-if)
 +      (macroexp-let², macroexp--const-symbol-p, macroexp-const-p)
 +      (macroexp-copyable-p): New functions and macros.
 +      * emacs-lisp/edebug.el (edebug-unwrap):
 +      * emacs-lisp/disass.el (disassemble-internal): Use macroexp-progn.
 +      * emacs-lisp/pcase.el: Use macroexp-let*, macroexp-if, ...
 +      (pcase--let*): Remove.
 +      * emacs-lisp/bytecomp.el (byte-compile-const-symbol-p)
 +      (byte-compile-constp): Remove.  Use macroexp--const-symbol-p and
 +      macroexp-const-p instead.
 +      * emacs-lisp/byte-opt.el: Use macroexp-const-p and macroexp-progn.
 +
 +      * emacs-lisp/cl-macs.el: Clean up the name space by using "cl--"
 +      instead of "cl-" for internal definitions.  Use macroexp-const-p.
 +      (cl-old-bc-file-form): Remove var.
 +      (cl-const-exprs-p): Remove fun.
 +      (cl-labels, cl-macrolet): Use backquote.
 +      (cl-lexical-let): Use cl-symbol-macrolet.  Don't use cl-defun-expander.
 +      (cl-defun-expander, cl-byte-compile-compiler-macro): Remove fun.
 +      (cl-define-setf-expander): Rename from cl-define-setf-method.
 +      * emacs-lisp/cl.el: Adjust alias for define-setf-method.
 +
 +      * international/mule-cmds.el: Don't require CL.
 +      (view-hello-file): Don't use `letf'.
 +
 +2012-06-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * tmm.el (tmm-prompt): Use string-prefix-p.
 +      (tmm-completion-delete-prompt): Don't affect current-buffer outside.
 +      (tmm-add-prompt): Use minibuffer-completion-help.
 +      (tmm-delete-map): Remove.
 +
 +      * subr.el (kbd): Make it its own function.
 +
 +2012-06-07  Stefan Merten  <smerten@oekonux.de>
 +
 +      * textmodes/rst.el: Use `eval-when-compile' for requiring `cl.el'.
 +      Silence compiler warnings.  Fix versions.
 +      (rst-position-if, rst-position, rst-some, rst-signum): New functions.
 +      (rst-shift-region, rst-adornment-level, rst-compute-tabs)
 +      (rst-indent-line, rst-shift-region, rst-forward-line): Use them.
 +      (rst-package-emacs-version-alist): Correct Emacs version to
 +      represent major merge with upstream.
 +      (rst-transition, rst-adornment, rst-compile-toolsets): Fix versions.
 +
 +2012-06-06  Glenn Morris  <rgm@gnu.org>
 +
 +      * mail/emacsbug.el (report-emacs-bug): Add relevant EMACS env-vars.
 +      Only print environment variables if set.
 +
 +2012-06-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/macroexp.el: Don't require CL since we don't use it.
 +      (macroexp--cons): Rename from maybe-cons.
 +      (macroexp--accumulate): Rename from macroexp-accumulate.
 +      (macroexp--all-forms): Rename from macroexpand-all-forms.
 +      (macroexp--all-clauses): Rename from macroexpand-all-clauses.
 +      (macroexp--expand-all): Rename from macroexpand-all-1.
 +
 +2012-06-06  Sam Steingold  <sds@gnu.org>
 +
 +      * calendar/calendar.el (calendar-in-read-only-buffer):
 +      Call `special-mode' to enable the standard read-only keybindings.
 +
 +2012-06-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/macroexp.el (macroexpand-all-1): Don't spam the output
 +      with "loading" messages (bug#11635).
 +
 +2012-06-06  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * files.el (enable-remote-dir-locals): New option.
 +      (hack-dir-local-variables): Use it.  (Bug#1933, Bug#6731)
 +
 +      * net/tramp-compat.el (tramp-compat-temporary-file-directory):
 +      Ensure, that the temp directory is local.
 +
 +      * net/tramp-sh.el (tramp-sh-handle-write-region): Let-bind
 +      `temporary-file-directory'.
 +
 +      * progmodes/python.el (python-send-region): Ensure, that the
 +      temporary file is created also in the remote case.
 +
 +2012-06-06  Glenn Morris  <rgm@gnu.org>
 +
 +      * vc/vc-rcs.el (vc-rcs-rcs2log-program): New.
 +      (vc-rcs-update-changelog): Use it.
 +
 +      * emacs-lisp/authors.el (authors-fixed-entries): Remove vcdiff
 +
 +      * vc/vc-sccs.el (vc-sccs-write-revision): New function.
 +      (vc-sccs-workfile-unchanged-p): Use vc-sccs-write-revision.
 +      (vc-sccs-diff): Replace use of the external vcdiff script.
 +
 +2012-06-05  Glenn Morris  <rgm@gnu.org>
 +
 +      * ledit.el: Move to obsolete/.
 +
 +2012-06-05  Sam Steingold  <sds@gnu.org>
 +
 +      * calendar/calendar.el (calendar-exit): reinstate the 2012-03-28
 +      patch (Bug#11140).
 +
 +2012-06-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-list/cust-print.el: Move to obsolete.
 +
 +      * emacs-lisp/macroexp.el (macroexpand-all-1): Tolerate errors during
 +      compiler-macro expansion.
 +
 +      Add native compiler-macro support.
 +      * emacs-lisp/macroexp.el (macroexpand-all-1):
 +      Support compiler-macros directly.  Properly follow aliases and apply
 +      the compiler macros more thoroughly.
 +      * emacs-lisp/cl.el: Don't copy compiler-macro properties any more since
 +      macroexpand now properly follows aliases.
 +      * emacs-lisp/cl-macs.el (toplevel, cl-define-compiler-macro)
 +      (cl-compiler-macroexpand): Use new prop.
 +      * emacs-lisp/byte-opt.el (featurep): Optimize earlier.
 +
 +      * emacs-lisp/cl-lib.el (custom-print-functions): Add alias.
 +
 +2012-06-05  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (get-lru-window, get-mru-window, get-largest-window):
 +      New argument NOT-SELECTED to avoid picking the selected window.
 +      (window--display-buffer-1, window--display-buffer-2): Replace by
 +      new function window--display-buffer
 +      (display-buffer-same-window, display-buffer-reuse-window)
 +      (display-buffer-pop-up-frame, display-buffer-pop-up-window):
 +      Use window--display-buffer.
 +      (display-buffer-use-some-window): Remove temporary dedication
 +      hack by calling get-lru-window and get-largest-window with
 +      NOT-SELECTED argument non-nil.  Call window--display-buffer.
 +
 +2012-06-05  Glenn Morris  <rgm@gnu.org>
 +
 +      * vc/vc-sccs.el (vc-sccs-workfile-unchanged-p):
 +      Replace external vcdiff script.
 +
 +2012-06-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/cl-lib.el (cl-values, cl-values-list): Fix up last change.
 +
 +2012-06-04  Chong Yidong  <cyd@gnu.org>
 +
 +      * image.el (imagemagick-types-inhibit): Revert last change.
 +      Add INFO and M.
 +      (imagemagick-enabled-types): Remove CIN and EPS*.
 +
 +2012-06-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/cl-lib.el: Rename from cl.el.
 +      * emacs-lisp/cl.el: New compatibility file.
 +      * emacs-lisp/cl-lib.el, emacs-lisp/cl-seq.el, emacs-lisp/cl-macs.el:
 +      * emacs-lisp/cl-extra.el: Rename all top-level functions and variables
 +      to obey the "cl-" prefix.
 +      * emacs-lisp/macroexp.el (macroexpand-all-1): Adjust to new name.
 +
 +2012-06-03  Glenn Morris  <rgm@gnu.org>
 +
 +      * emacs-lisp/authors.el (authors-aliases): Addition.
 +
 +      * cus-start.el (tool-bar-style, tool-bar-max-label-size):
 +      Fix :version.
 +
 +2012-06-03  Stefan Merten  <smerten@oekonux.de>
 +
 +      * textmodes/rst.el: Add comments.
 +      (rst-transition, rst-adornment): New faces.
 +      (rst-adornment-faces-alist): Make default safe to reevaluate.
 +      Fixes
 +      http://sourceforge.net/tracker/?func=detail&atid=422030&aid=3479603&group_id=38414.
 +      Improve customization tags.
 +      (rst-define-level-faces): Clarify meaning.
 +
 +2012-06-03  Chong Yidong  <cyd@gnu.org>
 +
 +      * progmodes/compile.el (compilation-mode-line-fail)
 +      (compilation-mode-line-run, compilation-mode-line-exit):
 +      New faces.
 +      (compilation-start, compilation-handle-exit): Use them (Bug#11032).
 +
 +2012-06-03  Jack Duthen  <duthen.mac.01@gmail.com>  (tiny change)
 +
 +      * progmodes/which-func.el (which-func-update-ediff-windows):
 +      New function.  Use it in ediff-select-hook (Bug#11478).
 +
 +2012-06-03  Chong Yidong  <cyd@gnu.org>
 +
 +      * bindings.el: Remove explicit help text from format-mode-line.
 +      It is now supplied by mode-line-default-help-echo.
 +      (mode-line-front-space, mode-line-end-spaces)
 +      (mode-line-misc-info): New variables.
 +      (mode-line-modes, mode-line-position): Move the default value to
 +      the variable definition.
 +      (mode-line-default-help-echo): New defcustom.
 +      (mode-line-mule-info-help-echo, mode-line-read-only-help-echo)
 +      (mode-line-modified-help-echo): New functions.
 +      (mode-line-mule-info, mode-line-modified): Use them.
 +      (mode-line-eol-desc, propertized-buffer-identification):
 +      Consistency fixes for help text.
 +      (mode-line-coding-system-map): Allow using mouse-3 to invoke
 +      set-buffer-file-coding-system (Bug#289).
 +      (mode-line-mule-info-help-echo): Update help text.
 +
 +2012-06-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * simple.el (execute-extended-command): Set real-this-command
 +      (bug#11506).
 +
 +2012-06-02  Chong Yidong  <cyd@gnu.org>
 +
 +      Remove incorrect uses of "modeline" in comments, docstrings, and
 +      function/variable names (Bug#10329).
 +
 +      * cus-edit.el (mode-line):
 +      * dframe.el (dframe-mouse-hscroll):
 +      * emacs-lisp/re-builder.el:
 +      * emacs-lisp/easy-mmode.el (define-minor-mode):
 +      * frame.el (set-frame-name):
 +      * help.el (lookup-minor-mode-from-indicator):
 +      * net/rcirc.el (rcirc-activity-string, rcirc-short-buffer-name):
 +      * progmodes/cc-cmds.el (c-toggle-auto-newline)
 +      (c-toggle-hungry-state):
 +      * progmodes/antlr-mode.el (antlr-language-alist):
 +      * progmodes/idlw-shell.el (idlwave-shell-electric-stop-line-face):
 +      * progmodes/vhdl-mode.el (vhdl-mode):
 +      * progmodes/which-func.el (which-func, which-func-cleanup-function):
 +      * term/ns-win.el (ns-face-at-pos):
 +      * term/sup-mouse.el (sup-mouse-report):
 +      * textmodes/flyspell.el (flyspell-mode-line-string):
 +      * textmodes/ispell.el (ispell-highlight-face):
 +      * textmodes/reftex-global.el:
 +      * vc/vc-arch.el (vc-arch-mode-line-string):
 +      * vc/vc-cvs.el (vc-cvs-mode-line-string):
 +      * vc/vc-git.el (vc-git-mode-line-string):
 +      * vc/vc-hooks.el (vc-display-status)
 +      (vc-default-mode-line-string):
 +      * vc/vc-mtn.el (vc-mtn-mode-line-string): Doc fixes.
 +
 +      * ansi-color.el (ansi-color-faces-vector): Change default faces.
 +
 +      * dired.el (dired-sort-set-mode-line): Rename from
 +      dired-sort-set-modeline.  All callers changed.
 +
 +      * eshell/esh-mode.el (eshell-status-in-mode-line): Rename from
 +      eshell-status-in-modeline.
 +
 +      * foldout.el (foldout-mode-line-string): Rename from
 +      foldout-modeline-string.  All callers changed.
 +      (foldout-update-mode-line): Rename from foldout-update-modeline.
 +
 +      * subr.el (redraw-modeline): Make into obsolete alias.
 +
 +      * calendar/timeclock.el (timeclock-mode-line-display): Rename from
 +      timeclock-modeline-display.  Make old name an alias.
 +      (timeclock-update-mode-line): Likewise.  All callers changed.
 +      (timeclock-mode-line-display): No need to check before using
 +      add-hook.
 +      (timeclock-relative, timeclock-day-over-hook)
 +      (timeclock-use-elapsed, timeclock-mode-string)
 +      (timeclock-mode-line-display): Doc fix, "modeline" -> "mode line".
 +
 +      * emulation/crisp.el (crisp-mode-mode-line-string): Rename from
 +      crisp-mode-modeline-string.
 +
 +      * play/solitaire.el (solitaire-build-mode-line): Rename from
 +      solitaire-build-modeline.  All callers changed.
 +
 +      * play/zone.el (zone-hiding-mode-line): Rename from
 +      zone-hiding-modeline.  All callers changed.
 +      (zone): Remove unusued `modeline-hidden-level' property.
 +
 +      * progmodes/xscheme.el (xscheme-mode-line-initialize): Rename from
 +      xscheme-modeline-initialize.  All callers changed.
 +
 +      * strokes.el (strokes-lighter): Rename from
 +      strokes-modeline-string.
 +
 +      * textmodes/sgml-mode.el (html-face-tag-alist)
 +      (html-tag-face-alist): Use mode-line face instead of obsolete
 +      alias modeline.
 +
 +2012-06-02  Stefan Merten  <smerten@oekonux.de>
 +
 +      * textmodes/rst.el: Always require `cl'.
 +      (rst-mode-map): Fix meaning of C-M-a / C-M-e.
 +
 +2012-06-02  Chong Yidong  <cyd@gnu.org>
 +
 +      * image.el (imagemagick-enabled-types): Rename from
 +      imagemagick-types-enable.  Add many more types.
 +      (imagemagick-types-inhibit): Change default to nil.
 +      (imagemagick-filter-types): Caller changed.
 +
 +2012-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/cl-macs.el: Use backquotes.
 +      (cl-transform-function-property): Use eval-and-compile rather than
 +      abusing `require'.
 +      (defstruct): Use declare-function instead of with-no-warnings.
 +
 +      * emacs-lisp/bytecomp.el: Fix last change (bug#11594).
 +      (byte-compile-output-docform): Re-add the print-circle bindings.
 +      (byte-compile-fix-header): Use #$ just because it's shorter.
 +      (byte-compile-output-file-form): Remove defun/defmacro.
 +
 +2012-06-01  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * simple.el (choose-completion): Remove now obsolete binding for
 +      owindow.
 +
 +2012-06-01  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * net/tramp.el (tramp-check-for-regexp): Search from buffer end,
 +      in order to avoid "Stack overflow in regexp matcher".
 +
 +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-filter-types): New function.  (Bug#7406)
 +      (imagemagick-register-types): Use imagemagick-filter-types.
 +      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  Stefan Monnier  <monnier@iro.umontreal.ca>
  
@@@ -1,34 -1,14 +1,44 @@@
 -2012-05-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+ 2012-06-10  Toke Høiland-Jørgensen  <toke@toke.dk>  (tiny change)
+       * nnmaildir.el (nnmaildir-request-expire-articles): Ensure that `time'
+       is an integer to avoid later problems.
+ 2012-06-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+       * shr.el: Add a iso-8859-1 cookie to make stuff work under other
+       locales.
 +2012-04-14  Wolfgang Jenkner  <wjenkner@inode.at>
 +
 +      * gnus-agent.el (gnus-agent-retrieve-headers): Recalculate the range of
 +      articles when fetch-old is non-nil (bug#11370).
 +
 +2012-06-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus-group.el (gnus-group-get-new-news): Respect
 +      `gnus-group-use-permanent-levels', as documented (bug#11638).
 +
 +2012-06-10  Dave Abrahams  <dave@boostpro.com>
 +
 +      * gnus-int.el (gnus-warp-to-article): Limit registry warping to real
 +      groups (bug#11641).
 +
 +2012-06-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus-msg.el (gnus-msg-mail): Warn the user about Gnus not running
 +      (bug#11514).
 +
 +2012-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * nntp.el: Stop the `letf' madness.
 +      (nntp--report-1): New var.
 +      (nntp-report): Merge nntp-report-1 into it.
 +      (nntp-with-open-group-function): Set nntp--report-1 instead of modifying
 +      the nntp-report function.
 +
 +      * auth-source.el: Fix comment-style to follow the convention.
 +
 +2012-05-27  Katsumi Yamaoka  <yamaoka@jpl.org>
  
        * gnus-msg.el (gnus-msg-mail): Ensure that gnus-newsgroup-name is
        a string so that Gcc works (bug#11514).
Simple merge
diff --cc src/ChangeLog
 -2012-06-11  Jan Djärv  <jan.h.d@swipnet.se>
++2012-06-17  Jan Djärv  <jan.h.d@swipnet.se>
+       * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
+       referenced (Bug#11583).
 -2012-06-01  Chong Yidong  <cyd@gnu.org>
 +2012-06-16  Aurelien Aptel  <aurelien.aptel@gmail.com>
  
 -      * Version 24.1 released.
 +      Implement wave-style variant of underlining.
 +      * dispextern.h (face_underline_type): New enum.
 +      (face): Add field for underline type.
 +      * nsterm.m (ns_draw_underwave): New function.
 +      (ns_draw_text_decoration): Use it.
 +      * w32term.c (w32_restore_glyph_string_clip, w32_draw_underwave):
 +      New functions.
 +      (x_draw_glyph_string): Use them.
 +      * xfaces.c (Qline, Qwave): New Lisp objects.
 +      (check_lface_attrs, merge_face_ref)
 +      (Finternal_set_lisp_face_attribute, realize_x_face): Handle
 +      wave-style underline face attributes.
 +      * xterm.c (x_draw_underwave): New function.
 +      (x_draw_glyph_string): Use it.
 +
 +2012-06-16  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * makefile.w32-in ($(BLD)/emacs.$(O), $(BLD)/fringe.$(O))
 +      ($(BLD)/xml.$(O), $(BLD)/intervals.$(O), $(BLD)/macros.$(O))
 +      ($(BLD)/minibuf.$(O), $(BLD)/regex.$(O), $(BLD)/region-cache.$(O))
 +      ($(BLD)/textprop.$(O), $(BLD)/undo.$(O), $(BLD)/window.$(O))
 +      ($(BLD)/w32select.$(O)): Update dependencies.
 +
 +2012-06-16  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * buffer.h (FETCH_MULTIBYTE_CHAR): Define as inline.
 +      (BUF_FETCH_MULTIBYTE_CHAR): Likewise.
 +      * character.c (_fetch_multibyte_char_p): Remove.
 +      * alloc.c: Include "character.h" before "buffer.h".
 +      * bidi.c: Likewise.
 +      * buffer.c: Likewise.
 +      * bytecode.c: Likewise.
 +      * callint.c: Likewise.
 +      * callproc.c: Likewise.
 +      * casefiddle.c: Likewise.
 +      * casetab.c: Likewise.
 +      * category.c: Likewise.
 +      * cmds.c: Likewise.
 +      * coding.c: Likewise.
 +      * composite.c: Likewise.
 +      * dired.c: Likewise.
 +      * dispnew.c: Likewise.
 +      * doc.c: Likewise.
 +      * dosfns.c: Likewise.
 +      * editfns.c: Likewise.
 +      * emacs.c: Likewise.
 +      * fileio.c: Likewise.
 +      * filelock.c: Likewise.
 +      * font.c: Likewise.
 +      * fontset.c: Likewise.
 +      * fringe.c: Likewise.
 +      * indent.c: Likewise.
 +      * insdel.c: Likewise.
 +      * intervals.c: Likewise.
 +      * keyboard.c: Likewise.
 +      * keymap.c: Likewise.
 +      * lread.c: Likewise.
 +      * macros.c: Likewise.
 +      * marker.c: Likewise.
 +      * minibuf.c: Likewise.
 +      * nsfns.m: Likewise.
 +      * nsmenu.m: Likewise.
 +      * print.c: Likewise.
 +      * process.c: Likewise.
 +      * regex.c: Likewise.
 +      * region-cache.c: Likewise.
 +      * search.c: Likewise.
 +      * syntax.c: Likewise.
 +      * term.c: Likewise.
 +      * textprop.c: Likewise.
 +      * undo.c: Likewise.
 +      * unexsol.c: Likewise.
 +      * w16select.c: Likewise.
 +      * w32fns.c: Likewise.
 +      * w32menu.c: Likewise.
 +      * window.c: Likewise.
 +      * xdisp.c: Likewise.
 +      * xfns.c: Likewise.
 +      * xmenu.c: Likewise.
 +      * xml.c: Likewise.
 +      * xselect.c: Likewise.
 +
 +2012-06-16  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * xdisp.c (set_cursor_from_row): Don't dereference glyphs_end.  If
 +      all the glyphs of the glyph row came from strings, and we have no
 +      cursor positioning clues, put the cursor on the first glyph of the
 +      row.
 +      (handle_face_prop): Use chunk-relative overlay string index when
 +      indexing into it->string_overlays array.  (Bug#11653)
 +      (set_cursor_from_row): Use the leftmost glyph as GLYPH_BEFORE, not
 +      the rightmost.  (Bug#11720)
 +
 +2012-06-16  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * category.h (CHAR_HAS_CATEGORY): Define as inline.
 +      (CATEGORY_MEMBER): Enforce 1/0 value.
 +      * category.c (_temp_category_set): Remove.
 +
 +2012-06-16  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * window.c (Fdelete_other_windows_internal)
 +      (Fdelete_window_internal): Don't access frame's mouse highlight
 +      info of the initial frame.  (Bug#11677)
 +
 +2012-06-14  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * .gdbinit (xgetint): Fix recently-introduced paren typo.
 +      Assume USE_2_TAGS_FOR_INTS.
 +      (xreload): Adjust $tagmask width to match recent lisp.h change.
 +
 +      Simplify lisp.h in minor ways that should not affect code.
 +      * lisp.h (USE_2_TAGS_FOR_INTS): Remove, as it was always defined.
 +      (LISP_INT_TAG, case_Lisp_Int, LISP_STRING_TAG, LISP_INT_TAG_P)
 +      (LISP_INT1_TAG, enum Lisp_Type, XINT, XUINT, make_number):
 +      Simplify under the assumption that USE_2_TAGS_FOR_INTS is defined.
 +      (INTTYPEBITS): New macro, for clarity.
 +      (INTMASK, MOST_POSITIVE_FIXNUM): Use it.
 +      (LISP_INT1_TAG, LISP_STRING_TAG, LISP_INT_TAG_P): Simplify
 +      now that USE_LSB_TAG is always defined.
 +      (TYPEMASK, XINT) [USE_LSB_TAG]: Remove unnecessary cast.
 +      (make_number) [!USE_LSB_TAG]: Use INTMASK; that's simpler.
 +
 +2012-06-13  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * makefile.w32-in ($(BLD)/data.$(O)): Update dependencies.
 +
 +2012-06-13  Glenn Morris  <rgm@gnu.org>
 +
 +      * s/bsd-common.h (BSD4_3):
 +      * s/usg5-4-common.h (USG5_4): No longer define; unused.
 +
 +2012-06-13  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * lisp.h (Lisp_Object) [CHECK_LISP_OBJECT_TYPE]: Define as struct
 +      instead of union.
 +      (XLI, XIL): Define.
 +      (XHASH, XTYPE, XINT, XUINT, make_number, XSET, XPNTR, XUNTAG): Use
 +      them.
 +      * emacs.c (gdb_use_struct): Renamed from gdb_use_union.
 +      * .gdbinit: Check gdb_use_struct instead of gdb_use_union.
 +      * alloc.c (widen_to_Lisp_Object): Removed.
 +      (mark_memory): Use XIL instead of widen_to_Lisp_Object.
 +      * frame.c (delete_frame): Remove outdated comment.
 +      * w32fns.c (Fw32_register_hot_key): Use XLI instead of checking
 +      USE_LISP_UNION_TYPE.
 +      (Fw32_unregister_hot_key): Likewise.
 +      (Fw32_toggle_lock_key): Likewise.
 +      * w32menu.c (add_menu_item): Likewise.
 +      (w32_menu_display_help): Use XIL instead of checking
 +      USE_LISP_UNION_TYPE.
 +      * w32heap.c (allocate_heap): Don't check USE_LISP_UNION_TYPE.
 +      (init_heap): Likewise.
 +      * w32term.c (w32_read_socket): Update comment.
 +
 +2012-06-13  Glenn Morris  <rgm@gnu.org>
 +
 +      * s/usg5-4-common.h, src/s/unixware.h:
 +      Remove define/undef of HAVE_SYSV_SIGPAUSE (not used since 2010-05-04).
 +
 +      * s/gnu.h (POSIX_SIGNALS): Remove (not used since 2010-05-04).
 +
 +2012-06-13  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      USE_LISP_UNION_TYPE + USE_LSB_TAG cleanup (Bug#11604)
 +      * alloc.c (make_number) [!defined make_number]:
 +      Remove, as lisp.h always defines this now.
 +      (mark_maybe_pointer): Simplify since USE_LSB_TAG is always defined now.
 +      (roundup_size): Verify that it is a power of 2.
 +      * data.c (Fmake_variable_buffer_local, Fmake_local_variable):
 +      * ftfont.c (ftfont_driver): Use LISP_INITIALLY_ZERO.
 +      * lisp.h (USE_LSB_TAG): Allow the builder to compile with
 +      -DUSE_LSB_TAG=0, to override the automatically-selected default.
 +      USE_LSB_TAG now is always defined to be either 0 or 1.
 +      All uses changed.
 +      (union Lisp_Object): Don't worry about WORDS_BIGENDIAN; the
 +      code works fine either way, and efficiency is not a concern here,
 +      as the union type is for debugging, not for production.
 +      (LISP_MAKE_RVALUE, make_number) [USE_LISP_UNION_TYPE]:
 +      Use an inline function on all platforms when using the union type,
 +      since this is simpler and 'static inline' can be used portably
 +      within Emacs now.
 +      (LISP_INITIALLY_ZERO): New macro.
 +      (XFASTINT, XSETFASTINT) [USE_LISP_UNION_TYPE]: Remove.
 +      (XSET) [USE_LISP_UNION_TYPE]: Don't overparenthesize.
 +
 +2012-06-12  Glenn Morris  <rgm@gnu.org>
 +
 +      * s/gnu-kfreebsd.h, s/hpux11.h, s/openbsd.h, s/sol2-10.h: Remove files.
 +
 +      * s/gnu-linux.h (HAVE_PROCFS): Move to configure.
 +
 +      * s/hpux10-20.h, s/openbsd.h, s/usg5-4-common.h:
 +      Move BROKEN_SIGIO to configure.
 +
 +      * s/bsd-common.h, s/darwin.h, s/gnu-kfreebsd.h, s/hpux10-20.h:
 +      Move NO_TERMIO to configure.
 +
 +2012-06-12  Chong Yidong  <cyd@gnu.org>
 +
 +      * image.c (imagemagick_load_image): Use MagickFlattenImage if
 +      MagickMergeImageLayers is undefined.  Use pixel pusher loop if
 +      MagickExportImagePixels is undefined.
 +
 +2012-06-12  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * image.c (imagemagick_load_image): Remove unused label.
 +
 +2012-06-11  Glenn Morris  <rgm@gnu.org>
 +
 +      * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/darwin.h:
 +      * s/gnu-kfreebsd.h, s/gnu-linux.h, s/gnu.h, s/hpux10-20.h:
 +      * s/irix6-5.h, s/ms-w32.h, s/msdos.h, s/template.h:
 +      * s/usg5-4-common.h: Move SYSTEM_TYPE to configure.
 +
 +2012-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * alloc.c (make_byte_code): New function.
 +      (Fmake_byte_code): Use it.  Don't purify here.
 +      * lread.c (read1): Use it as well to avoid extra allocation.
 +
 +2012-06-11  Chong Yidong  <cyd@gnu.org>
 +
 +      * image.c (imagemagick_load_image): Implement transparency.
 +
 +2012-06-10  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * regex.c (at_begline_loc_p): Also recognize `(?N:' and correctly
 +      account for preceding backslashes.  (Bug#11663)
 +
 +2012-06-09  Chong Yidong  <cyd@gnu.org>
 +
 +      * term.c: Support italics in capable terminals (Bug#9652).
 +      (no_color_bit): Replace unused NC_BLINK with NC_ITALIC.
 +      (turn_on_face): Output using TS_enter_italic_mode if available.
 +      Don't handle unused blinking and alt-charset cases.
 +      (turn_off_face): Handle italic case; discard unused tty_blinking_p
 +      and tty_alt_charset_p cases.
 +      (tty_capable_p, init_tty): Support italics.
 +
 +      * termchar.h (struct tty_display_info): Add field for italics.
 +      Remove unused blink field.
 +
 +      * xfaces.c (tty_supports_face_attributes_p, realize_tty_face):
 +      Handle slant.
 +
 +      * dispextern.h: Replace unused TTY_CAP_BLINK with TTY_CAP_ITALIC.
 +      (struct face): Remove unused fields tty_dim_p, tty_blinking_p, and
 +      tty_alt_charset_p.  Add tty_italic_p.
 +
 +2012-06-09  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * dbusbind.c (XD_BASIC_DBUS_TYPE): Use dbus_type_is_valid and
 +      dbus_type_is_basic if available.
 +      (xd_extract_signed, xd_extract_unsigned): Rename from
 +      extract_signed and extract_unsigned, respectively.  Adapt callers.
 +
 +2012-06-09  Chong Yidong  <cyd@gnu.org>
 +
 +      * xfaces.c (face_for_overlay_string): Handle face remapping (Bug#2066).
 +
 +      * fringe.c (Fset_fringe_bitmap_face): Handle the noninteractive
 +      case (Bug#9752).
 +
 +2012-06-08  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * xdisp.c (vmessage): Treat frame message as multibyte.
 +      Without this change, (let ((§ 1)) (make-variable-buffer-local '§))
 +      would generate the diagnostic "Making \302\247 buffer-local while
 +      let-bound!".
 +
 +2012-06-08  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * dispnew.c (showing_window_margins_p): Undo last change, which
 +      was done due to an inadvertent commit.
 +      (adjust_frame_glyphs_for_frame_redisplay): Do call
 +      showing_window_margins_p.
 +
 +2012-06-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * eval.c (Fmake_var_non_special): New primitive.
 +      (syms_of_eval): Defsubr it.
 +      * lread.c (syms_of_lread): Mark `values' as lexically scoped.
 +
 +2012-06-08  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * dispnew.c (showing_window_margins_p): Wrap in #if 0 to prevent unused
 +      function warning (the only call is inside #if 0 since 2012-06-08T08:44:45Z!eliz@gnu.org).
 +
 +2012-06-08  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * alloc.c (allocate_vectorlike): Fix last change.
 +
 +2012-06-08  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +      Block-based vector allocation of small vectors.
 +      * 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,
 +      mark_maybe_pointer, valid_lisp_object_p) accordingly.
 +      (COMMON_MULTIPLE): Move outside #if USE_LSB_TAG.
 +      (VECTOR_BLOCK_SIZE, vroundup, VECTOR_BLOCK_BYTES),
 +      (VBLOCK_BYTES_MIN, VBLOCK_BYTES_MAX, VECTOR_MAX_FREE_LIST_INDEX),
 +      (VECTOR_FREE_LIST_FLAG, ADVANCE, VINDEX, SETUP_ON_FREE_LIST),
 +      (VECTOR_SIZE, VECTOR_IN_BLOCK): New macros.
 +      (roundup_size): New constant.
 +      (struct vector_block): New data type.
 +      (vector_blocks, vector_free_lists, zero_vector): New variables.
 +      (all_vectors): Rename to `large_vectors'.
 +      (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
 +      or equal to VBLOCK_BYTES_MAX.
 +      (Fgarbage_collect): Move all vector sweeping code to sweep_vectors.
 +      (init_alloc_once): Add call to init_vectors.
 +
 +2012-06-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * eval.c (Fmacroexpand): Stop if the macro returns the same form.
 +
 +2012-06-07  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * doprnt.c (doprnt): Truncate multibyte char correctly.
 +      Without this change, doprnt (buf, 2, "%s", FORMAT_END, AP)
 +      would mishandle a string argument "Xc" if X was a multibyte
 +      character of length 2: it would truncate after X's first byte
 +      rather than including all of X.
 +
 +2012-06-06  Chong Yidong  <cyd@gnu.org>
 +
 +      * buffer.c (word_wrap): Doc fix.
 +
 +2012-06-04  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * xdisp.c (note_mode_line_or_margin_highlight): Pacify gcc -Wall.
 +
 +2012-06-03  Glenn Morris  <rgm@gnu.org>
 +
 +      * xdisp.c (tool-bar-style): Doc fix.
 +
 +2012-06-03  Ulrich Müller  <ulm@gentoo.org>
 +
 +      * Makefile.in (PAXCTL): Define.
 +      (temacs$(EXEEXT)): Disable memory randomization for the temacs
 +      binary via PaX flags if the paxctl utility is available.
 +      (emacs$(EXEEXT), bootstrap-emacs$(EXEEXT)):
 +      Restore PaX flags to their default.  (Bug#11398)
 +
 +2012-06-03  Chong Yidong  <cyd@gnu.org>
 +
 +      * xdisp.c (decode_mode_spec_coding): Display a space for a unibyte
 +      buffer (Bug#11226).
 +
 +2012-06-03  Chong Yidong  <cyd@gnu.org>
 +
 +      * xdisp.c (calc_pixel_width_or_height): Use Fbuffer_local_value.
 +      (note_mode_line_or_margin_highlight): If there is no help echo,
 +      use mode-line-default-help-echo.  Handle the case where the mouse
 +      position is past the end of the mode line string.
 +
 +      * buffer.c (buffer_local_value_1): New function, split from
 +      Fbuffer_local_value; can return Qunbound.
 +      (Fbuffer_local_value): Use it.
 +      (Vmode_line_format): Docstring tweaks.
 +
 +2012-06-02  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * sysdep.c (system_process_attributes): Improve comment.
 +
 +2012-06-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * keyboard.c: Export real-this-command to Elisp.
 +      (syms_of_keyboard): Rename real_this_command to Vreal_this_command
 +      and DEFVAR it.  Update all users.
 +
 +2012-06-02  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * minibuf.c (Fassoc_string): Remove duplicate declaration.
 +
 +      * sysdep.c (system_process_attributes) [SOLARIS2 && HAVE_PROCFS]:
 +      Convert pctcpu and pctmem to Lisp float properly.
 +      Let the compiler fold better, as 100.0/0x8000 is exact.
 +
 +2012-06-02  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * alloc.c (CONS_BLOCK_SIZE): Account for padding at the end of
 +      cons_block.
 +
 +2012-06-01  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * xfns.c (x_set_tool_bar_lines) [USE_GTK]: Adjust to bitfield change.
 +
 +2012-06-01  Dmitry Antipov  <dmantipov@yandex.ru>
  
 -2012-05-30  Eli Zaretskii  <eliz@gnu.org>
 +      For a 'struct window', replace some Lisp_Object fields to
 +      bitfields where appropriate, remove unused fields.
 +      * window.h (struct window): Remove unused 'last_mark_x' and
 +      'last_mark_y' fields.  Rename 'mini_p' field to 'mini',
 +      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.
 +
 +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
diff --cc src/nsterm.m
Simple merge