Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Jan 2013 16:13:04 +0000 (08:13 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Jan 2013 16:13:04 +0000 (08:13 -0800)
400 files changed:
1  2 
ChangeLog
Makefile.in
README
admin/ChangeLog
admin/admin.el
admin/merge-gnulib
admin/notes/copyright
autogen/configure
configure.ac
doc/emacs/ChangeLog
doc/emacs/maintaining.texi
doc/emacs/misc.texi
doc/emacs/trouble.texi
doc/lispintro/ChangeLog
doc/lispintro/emacs-lisp-intro.texi
doc/lispref/ChangeLog
doc/lispref/customize.texi
doc/lispref/display.texi
doc/lispref/elisp.texi
doc/lispref/files.texi
doc/lispref/internals.texi
doc/lispref/loading.texi
doc/lispref/os.texi
doc/lispref/symbols.texi
doc/lispref/tips.texi
doc/lispref/windows.texi
doc/man/ChangeLog
doc/misc/ChangeLog
doc/misc/Makefile.in
doc/misc/ada-mode.texi
doc/misc/calc.texi
doc/misc/cl.texi
doc/misc/ebrowse.texi
doc/misc/ediff.texi
doc/misc/erc.texi
doc/misc/ert.texi
doc/misc/eshell.texi
doc/misc/eudc.texi
doc/misc/gnus.texi
doc/misc/idlwave.texi
doc/misc/makefile.w32-in
doc/misc/mh-e.texi
doc/misc/pcl-cvs.texi
doc/misc/rcirc.texi
doc/misc/reftex.texi
doc/misc/remember.texi
doc/misc/ses.texi
doc/misc/speedbar.texi
doc/misc/srecode.texi
doc/misc/tramp.texi
doc/misc/trampver.texi
doc/misc/url.texi
doc/misc/vip.texi
doc/misc/viper.texi
doc/misc/widget.texi
doc/misc/woman.texi
etc/ChangeLog
etc/MH-E-NEWS
etc/NEWS
etc/TODO
etc/themes/tsdh-dark-theme.el
leim/ChangeLog
leim/quail/latin-ltx.el
lib-src/ChangeLog
lib-src/emacsclient.c
lib-src/etags.c
lib-src/makefile.w32-in
lib-src/movemail.c
lib-src/update-game-score.c
lib/makefile.w32-in
lisp/ChangeLog
lisp/ChangeLog.15
lisp/Makefile.in
lisp/allout.el
lisp/battery.el
lisp/bookmark.el
lisp/button.el
lisp/calc/README
lisp/calc/calc-forms.el
lisp/calc/calc.el
lisp/calendar/time-date.el
lisp/cedet/ChangeLog
lisp/cedet/semantic/fw.el
lisp/color.el
lisp/comint.el
lisp/cus-edit.el
lisp/cus-face.el
lisp/cus-start.el
lisp/custom.el
lisp/descr-text.el
lisp/desktop.el
lisp/dired-x.el
lisp/dired.el
lisp/dirtrack.el
lisp/emacs-lisp/advice.el
lisp/emacs-lisp/byte-opt.el
lisp/emacs-lisp/byte-run.el
lisp/emacs-lisp/bytecomp.el
lisp/emacs-lisp/cl-extra.el
lisp/emacs-lisp/cl-lib.el
lisp/emacs-lisp/cl-loaddefs.el
lisp/emacs-lisp/cl-macs.el
lisp/emacs-lisp/cl-seq.el
lisp/emacs-lisp/cl.el
lisp/emacs-lisp/debug.el
lisp/emacs-lisp/derived.el
lisp/emacs-lisp/edebug.el
lisp/emacs-lisp/eieio.el
lisp/emacs-lisp/elp.el
lisp/emacs-lisp/ert-x.el
lisp/emacs-lisp/ert.el
lisp/emacs-lisp/gv.el
lisp/emacs-lisp/lisp-mnt.el
lisp/emacs-lisp/lisp-mode.el
lisp/emacs-lisp/macroexp.el
lisp/emacs-lisp/trace.el
lisp/env.el
lisp/epg.el
lisp/erc/ChangeLog
lisp/erc/erc-backend.el
lisp/erc/erc-capab.el
lisp/erc/erc-dcc.el
lisp/erc/erc-ezbounce.el
lisp/erc/erc-join.el
lisp/erc/erc-log.el
lisp/erc/erc-match.el
lisp/erc/erc-netsplit.el
lisp/erc/erc-networks.el
lisp/erc/erc-notify.el
lisp/erc/erc-pcomplete.el
lisp/erc/erc-services.el
lisp/erc/erc-speedbar.el
lisp/erc/erc-track.el
lisp/erc/erc.el
lisp/eshell/em-unix.el
lisp/faces.el
lisp/ffap.el
lisp/filecache.el
lisp/files.el
lisp/find-cmd.el
lisp/frame.el
lisp/generic-x.el
lisp/gnus/ChangeLog
lisp/gnus/auth-source.el
lisp/gnus/gmm-utils.el
lisp/gnus/gnus-agent.el
lisp/gnus/gnus-art.el
lisp/gnus/gnus-bookmark.el
lisp/gnus/gnus-cite.el
lisp/gnus/gnus-dired.el
lisp/gnus/gnus-group.el
lisp/gnus/gnus-int.el
lisp/gnus/gnus-msg.el
lisp/gnus/gnus-registry.el
lisp/gnus/gnus-salt.el
lisp/gnus/gnus-score.el
lisp/gnus/gnus-spec.el
lisp/gnus/gnus-srvr.el
lisp/gnus/gnus-start.el
lisp/gnus/gnus-sum.el
lisp/gnus/gnus-sync.el
lisp/gnus/gnus-util.el
lisp/gnus/gnus.el
lisp/gnus/mail-source.el
lisp/gnus/message.el
lisp/gnus/mml2015.el
lisp/gnus/nnfolder.el
lisp/gnus/nnimap.el
lisp/gnus/nntp.el
lisp/gnus/pop3.el
lisp/gnus/shr.el
lisp/gnus/sieve-mode.el
lisp/gnus/spam-stat.el
lisp/gnus/spam.el
lisp/help-fns.el
lisp/help-macro.el
lisp/help-mode.el
lisp/hi-lock.el
lisp/hilit-chg.el
lisp/ibuffer.el
lisp/icomplete.el
lisp/ido.el
lisp/image-dired.el
lisp/image.el
lisp/imenu.el
lisp/info.el
lisp/international/mule-cmds.el
lisp/isearch.el
lisp/json.el
lisp/mail/emacsbug.el
lisp/mail/mailabbrev.el
lisp/mail/rmail.el
lisp/mail/rmailedit.el
lisp/mail/smtpmail.el
lisp/mail/unrmail.el
lisp/makefile.w32-in
lisp/mh-e/ChangeLog
lisp/mh-e/mh-comp.el
lisp/mh-e/mh-compat.el
lisp/mh-e/mh-e.el
lisp/mh-e/mh-folder.el
lisp/mh-e/mh-junk.el
lisp/mh-e/mh-letter.el
lisp/mh-e/mh-mime.el
lisp/mh-e/mh-scan.el
lisp/mh-e/mh-search.el
lisp/mh-e/mh-show.el
lisp/mh-e/mh-thread.el
lisp/minibuf-eldef.el
lisp/minibuffer.el
lisp/mpc.el
lisp/net/rcirc.el
lisp/net/tls.el
lisp/net/tramp-compat.el
lisp/net/tramp-ftp.el
lisp/net/tramp-gvfs.el
lisp/net/tramp-sh.el
lisp/net/tramp-smb.el
lisp/net/tramp.el
lisp/net/trampver.el
lisp/notifications.el
lisp/novice.el
lisp/obsolete/longlines.el
lisp/obsolete/terminal.el
lisp/org/ChangeLog
lisp/org/ob-eval.el
lisp/org/ob.el
lisp/org/org-bibtex.el
lisp/play/gamegrid.el
lisp/printing.el
lisp/profiler.el
lisp/progmodes/autoconf.el
lisp/progmodes/cc-mode.el
lisp/progmodes/compile.el
lisp/progmodes/cperl-mode.el
lisp/progmodes/etags.el
lisp/progmodes/f90.el
lisp/progmodes/grep.el
lisp/progmodes/js.el
lisp/progmodes/m4-mode.el
lisp/progmodes/make-mode.el
lisp/progmodes/perl-mode.el
lisp/progmodes/python.el
lisp/progmodes/ruby-mode.el
lisp/progmodes/scheme.el
lisp/progmodes/sh-script.el
lisp/progmodes/sql.el
lisp/server.el
lisp/ses.el
lisp/shell.el
lisp/simple.el
lisp/sort.el
lisp/speedbar.el
lisp/startup.el
lisp/subr.el
lisp/term.el
lisp/term/ns-win.el
lisp/term/w32-win.el
lisp/textmodes/css-mode.el
lisp/textmodes/fill.el
lisp/textmodes/ispell.el
lisp/textmodes/reftex-parse.el
lisp/textmodes/reftex-toc.el
lisp/textmodes/reftex.el
lisp/textmodes/sgml-mode.el
lisp/textmodes/table.el
lisp/textmodes/tex-mode.el
lisp/textmodes/texinfo.el
lisp/uniquify.el
lisp/url/ChangeLog
lisp/url/url-expand.el
lisp/url/url-http.el
lisp/url/url-misc.el
lisp/url/url-parse.el
lisp/vc/add-log.el
lisp/vc/diff-mode.el
lisp/vc/ediff-diff.el
lisp/vc/ediff-ptch.el
lisp/vc/ediff-util.el
lisp/vc/vc-dir.el
lisp/vc/vc-git.el
lisp/vc/vc-hg.el
lisp/vc/vc-hooks.el
lisp/vc/vc-svn.el
lisp/vc/vc.el
lisp/vcursor.el
lisp/view.el
lisp/window.el
lisp/woman.el
msdos/ChangeLog
msdos/sed2v2.inp
nt/ChangeLog
nt/config.nt
nt/gmake.defs
nt/inc/ms-w32.h
nt/inc/sys/socket.h
nt/inc/sys/stat.h
nt/makefile.w32-in
nt/nmake.defs
nt/zipdist.bat
oldXMenu/Activate.c
oldXMenu/ChangeLog
oldXMenu/Create.c
oldXMenu/Internal.c
src/.gdbinit
src/ChangeLog
src/Makefile.in
src/alloc.c
src/buffer.c
src/buffer.h
src/bytecode.c
src/casefiddle.c
src/category.c
src/charset.c
src/coding.c
src/coding.h
src/composite.c
src/conf_post.h
src/data.c
src/dbusbind.c
src/deps.mk
src/dired.c
src/dispextern.h
src/dispnew.c
src/doc.c
src/doprnt.c
src/editfns.c
src/emacs.c
src/eval.c
src/fileio.c
src/floatfns.c
src/font.c
src/fontset.c
src/frame.c
src/frame.h
src/fringe.c
src/gmalloc.c
src/gnutls.c
src/gtkutil.c
src/image.c
src/indent.c
src/insdel.c
src/intervals.c
src/keyboard.c
src/lisp.h
src/lread.c
src/makefile.w32-in
src/marker.c
src/minibuf.c
src/msdos.c
src/nsfns.m
src/nsfont.m
src/nsterm.h
src/nsterm.m
src/print.c
src/process.c
src/process.h
src/profiler.c
src/regex.c
src/search.c
src/sysdep.c
src/syssignal.h
src/systty.h
src/syswait.h
src/term.c
src/termchar.h
src/termhooks.h
src/terminal.c
src/textprop.c
src/unexcoff.c
src/unexcw.c
src/unexw32.c
src/vm-limit.c
src/w32.c
src/w32.h
src/w32console.c
src/w32fns.c
src/w32gui.h
src/w32inevt.c
src/w32menu.c
src/w32proc.c
src/w32term.c
src/w32term.h
src/w32xfns.c
src/window.c
src/window.h
src/xdisp.c
src/xfaces.c
src/xfns.c
src/xftfont.c
src/xmenu.c
src/xrdb.c
src/xselect.c
src/xterm.c
src/xterm.h
test/ChangeLog
test/automated/ert-tests.el
test/automated/ert-x-tests.el
test/automated/f90.el
test/automated/ruby-mode-tests.el

diff --cc ChangeLog
Simple merge
diff --cc Makefile.in
Simple merge
diff --cc README
Simple merge
diff --cc admin/ChangeLog
Simple merge
diff --cc admin/admin.el
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1,4 -1,12 +1,12 @@@
 -2012-12-29  Wolfgang Jenkner  <wjenkner@inode.at>
+ 2012-12-31  Glenn Morris  <rgm@gnu.org>
+       * customize.texi (Common Keywords, Type Keywords):
+       Replace "active field" with "button".  (Bug#13310)
+       * customize.texi (Common Keywords): Add xref.  (Bug#13311)
+       * tips.texi (Library Headers): Add cindex.
 +2012-12-30  Wolfgang Jenkner  <wjenkner@inode.at>
  
        * functions.texi (Declare Form):
        * intro.texi (A Sample Function Description):
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
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
@@@ -9,9 -9,9 +9,9 @@@
  @c %**end of header
  
  @copying
 -This file documents SES: the Simple Emacs Spreadsheet.
 +This file documents @acronym{SES}: the Simple Emacs Spreadsheet.
  
- Copyright @copyright{} 2002--2012 Free Software Foundation, Inc.
+ Copyright @copyright{} 2002--2013 Free Software Foundation, Inc.
  
  @quotation
  Permission is granted to copy, distribute and/or modify this document
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc etc/ChangeLog
Simple merge
diff --cc etc/MH-E-NEWS
@@@ -1,70 -1,8 +1,70 @@@
  * COPYRIGHT
  
- Copyright (C) 2001-201 Free Software Foundation, Inc.
+ Copyright (C) 2001-2013 Free Software Foundation, Inc.
  See the end of the file for license conditions.
  
 +* Changes in MH-E 8.4
 +
 +Version 8.4 postpones junk processing and merges in your components
 +file when re-editing a draft. A few bugs were also fixed.
 +
 +** New Features in MH-E 8.4
 +
 +*** Postpone junk processing
 +
 +The `J w' (`mh-junk-whitelist') and `J b' (`mh-junk-blacklist')
 +commands now mark the message. Like with other marks, this mark can be
 +removed with `u' (`mh-undo') and processed with `x'
 +(`mh-execute-commands'). Thanks to Ted Phelps (closes SF #2945712).
 +
 +** New Variables in MH-E 8.4
 +
 +*** mh-blacklist-msg-hook
 +
 +Hook run by `J b' (`mh-junk-blacklist') after marking each message for blacklisting.
 +
 +*** mh-whitelist-msg-hook
 +
 +Hook run by `J w' (`mh-junk-whitelist') after marking each message for whitelisting.
 +
 +*** mh-whitelist-preserves-sequences-flag
 +
 +Non-nil means that sequences are preserved when messages are
 +whitelisted.
 +
 +** New Faces in MH-E 8.4
 +
 +*** mh-folder-blacklisted
 +
 +Blacklisted message face.
 +
 +*** mh-folder-whitelisted
 +
 +Whitelisted message face.
 +
 +** Bug Fixes in MH-E 8.4
 +
 +*** mh-edit-again should add Fcc
 +
 +More generally, `mh-edit-again' now merges the components file into
 +the draft (closes SF #1708292).
 +
 +*** Loses changes when message column goes from 1 to 2 digits
 +
 +Call `mh-process-or-undo-commands' before running inc to insure we do
 +not lose any pending changes (closes SF #2321115).
 +
 +*** mh-yank-cur-msg fails in emacs 23
 +
 +Replace usage of `set-buffer' with `with-current-buffer' (closes SF
 +#2830504).
 +
 +*** Folder pack action (Fp) missing in show mode
 +
 +Add missing key binding for `mh-show-pack-folder' (closes SF #3466086).
 +
 +\f
 +
  * Changes in MH-E 8.3.1
  
  This version of MH-E fixes typos in the documentation and is packaged
diff --cc etc/NEWS
Simple merge
diff --cc etc/TODO
Simple merge
Simple merge
diff --cc leim/ChangeLog
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib-src/etags.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/ChangeLog
@@@ -1,50 -1,44 +1,91 @@@
+ 2012-12-31  Andreas Schwab  <schwab@linux-m68k.org>
+       * emacs-lisp/byte-run.el (defmacro): Use same argument parsing as
+       defun.  Don't check for DECL if DOCSTRING isn't a string.
+       (defun): Likewise.
+ 2012-12-31  Glenn Morris  <rgm@gnu.org>
+       * eshell/em-cmpl.el (eshell-pcomplete):
+       More thoroughly imitate pcomplete.  (Bug#13293)
+       * files.el (parse-colon-path): Doc fix.  (Bug#12351)
+       Return nil for empty path elements.  (Bug#13296)
+ 2012-12-31  Fabián Ezequiel Gallina  <fgallina@cuca>
+       * progmodes/python.el (python-nav-end-of-statement): Rewrite in
+       order to improve efficiency (Based on Daniel Colascione's
+       <dancol@dancol.org> patch).  (Bug#13182)
+ 2012-12-31  Glenn Morris  <rgm@gnu.org>
+       * vc/log-edit.el (log-edit-header-contents-regexp): Add doc string.
+ 2012-12-31  Fabián Ezequiel Gallina  <fgallina@cuca>
+       * progmodes/python.el: Support other commands triggering
+       python-indent-line so indentation cycling continues to work.
+       (python-indent-trigger-commands): New defcustom.
+       (python-indent-line): Use it.
+ 2012-12-31  Fabián Ezequiel Gallina  <fgallina@cuca>
+       * progmodes/python.el (python-shell-send-region): Add blank lines
+       for non sent code so backtraces remain correct.
+ 2012-12-31  Andreas Schwab  <schwab@linux-m68k.org>
+       * emacs-lisp/byte-run.el (defmacro): Don't lose final nil if
+       neither DOCSTRING nor DECL was given.  (Bug#13316)
 +2013-01-02  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * net/tramp-sh.el (tramp-sh-handle-set-file-acl): Add argument to
 +      `error' call.
 +      (tramp-do-copy-or-rename-file): Ignore errors when calling
 +      `set-file-extended-attributes'.
 +
 +      * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
 +      handler for `file-acl'.
 +      (tramp-smb-handle-file-acl): New defun.
 +
 +2013-01-02  Jay Belanger  <jay.p.belanger@gmail.com>
 +
 +      * calc/README: Mention ISO 8601 week-numbering dates.
 +
 +2013-01-01  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * view.el (view-mode-enable): New argument run-view-mode-hook.
 +      Run view-mode-hook only when it's non-nil (Bug#13315).
 +      (view-mode-enter): Call view-mode-enable with run-view-mode-hook
 +      argument t.
 +
 +2012-12-31  Jürgen Hötzel  <juergen@archlinux.org>
 +
 +      * net/tramp-adb.el (tramp-adb-maybe-open-connection): Handle errors
 +      (No device connected, invalid device name). (Bug #13299)
 +
 +2012-12-31  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (window-resizable--p): Rename to window-resizable-p.
 +      (window-resize-no-error): New function.
 +
 +      * mail/rmail.el (rmail-maybe-display-summary): Restore behavior
 +      broken in fix from 2012-12-28.
 +
 +2012-12-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * subr.el (special-form-p): Don't signal errors on undef aliases.
 +
 +2012-12-31  Jay Belanger  <jay.p.belanger@gmail.com>
 +
 +      * calc/calc-forms.el (math-parse-date): Try using
 +      `math-parse-iso-date' when it looks like it might be needed.
 +      Allow times of 24:00.
 +      (math-parse-date-validate, math-parse-iso-date-validate):  Allow times
 +      of 24:00.
 +
  2012-12-30  Glenn Morris  <rgm@gnu.org>
  
        * net/mairix.el (rmail, rmail-summary-displayed, rmail-summary):
Simple merge
Simple merge
diff --cc lisp/allout.el
Simple merge
diff --cc lisp/battery.el
Simple merge
Simple merge
diff --cc lisp/button.el
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/color.el
Simple merge
diff --cc lisp/comint.el
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/custom.el
Simple merge
Simple merge
diff --cc lisp/desktop.el
Simple merge
diff --cc lisp/dired-x.el
Simple merge
diff --cc lisp/dired.el
@@@ -4295,7 -4294,7 +4295,7 @@@ instead
  ;;;***
  \f
  ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
- ;;;;;;  "dired-x" "dired-x.el" "a0a769bf895afcbb6d0e05169ef81923")
 -;;;;;;  "dired-x" "dired-x.el" "ce753ade80ea9f4e64ab3569e3a5421e")
++;;;;;;  "dired-x" "dired-x.el" "cdaacce7c861256289ba48493dd6d0ec")
  ;;; Generated autoloads from dired-x.el
  
  (autoload 'dired-jump "dired-x" "\
Simple merge
@@@ -1,6 -1,6 +1,6 @@@
 -;;; advice.el --- An overloading mechanism for Emacs Lisp functions
 +;;; advice.el --- An overloading mechanism for Emacs Lisp functions  -*- lexical-binding: t -*-
  
- ;; Copyright (C) 1993-1994, 2000-2012 Free Software Foundation, Inc.
+ ;; Copyright (C) 1993-1994, 2000-2013 Free Software Foundation, Inc.
  
  ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
  ;; Maintainer: FSF
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -11,7 -11,7 +11,7 @@@
  ;;;;;;  cl--map-overlays cl--map-intervals cl--map-keymap-recursively
  ;;;;;;  cl-notevery cl-notany cl-every cl-some cl-mapcon cl-mapcan
  ;;;;;;  cl-mapl cl-mapc cl-maplist cl-map cl--mapcar-many cl-equalp
- ;;;;;;  cl-coerce) "cl-extra" "cl-extra.el" "3ee58411735a01dd1e1d3964fdcfae70")
 -;;;;;;  cl-coerce) "cl-extra" "cl-extra.el" "6c7926a10c377679687a2ab6a4d1c186")
++;;;;;;  cl-coerce) "cl-extra" "cl-extra.el" "c5730f2a706cb1efc5fec0a790d3ca72")
  ;;; Generated autoloads from cl-extra.el
  
  (autoload 'cl-coerce "cl-extra" "\
@@@ -267,7 -267,7 +267,7 @@@ including `cl-block' and `cl-eval-when'
  ;;;;;;  cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
  ;;;;;;  cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
  ;;;;;;  cl-gensym cl--compiler-macro-cXXr cl--compiler-macro-list*)
- ;;;;;;  "cl-macs" "cl-macs.el" "d3af72b1cff3398fa1480065fc2887a2")
 -;;;;;;  "cl-macs" "cl-macs.el" "ad8afd35d8d75f5f22e7547b02bac556")
++;;;;;;  "cl-macs" "cl-macs.el" "3b4d4e869f81f0b07ab3aa08f5478c2e")
  ;;; Generated autoloads from cl-macs.el
  
  (autoload 'cl--compiler-macro-list* "cl-macs" "\
@@@ -772,7 -759,7 +772,7 @@@ surrounded by (cl-block NAME ...)
  ;;;;;;  cl-nsubstitute-if cl-nsubstitute cl-substitute-if-not cl-substitute-if
  ;;;;;;  cl-substitute cl-delete-duplicates cl-remove-duplicates cl-delete-if-not
  ;;;;;;  cl-delete-if cl-delete cl-remove-if-not cl-remove-if cl-remove
- ;;;;;;  cl-replace cl-fill cl-reduce) "cl-seq" "cl-seq.el" "4b8ddc5bea2fcc626526ce3644071568")
 -;;;;;;  cl-replace cl-fill cl-reduce) "cl-seq" "cl-seq.el" "5ce2761d9a21845a7f6a2da0e4543844")
++;;;;;;  cl-replace cl-fill cl-reduce) "cl-seq" "cl-seq.el" "51a70dea9cbc225165a50135956609aa")
  ;;; Generated autoloads from cl-seq.el
  
  (autoload 'cl-reduce "cl-seq" "\
Simple merge
Simple merge
Simple merge
@@@ -1,6 -1,7 +1,7 @@@
 -;;; debug.el --- debuggers and related commands for Emacs
 +;;; debug.el --- debuggers and related commands for Emacs  -*- lexical-binding: t -*-
  
- ;; Copyright (C) 1985-1986, 1994, 2001-2012 Free Software Foundation, Inc.
+ ;; Copyright (C) 1985-1986, 1994, 2001-2013 Free Software Foundation,
+ ;; Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: lisp, tools, maint
Simple merge
Simple merge
Simple merge
@@@ -1,7 -1,7 +1,7 @@@
 -;;; elp.el --- Emacs Lisp Profiler
 +;;; elp.el --- Emacs Lisp Profiler  -*- lexical-binding: t -*-
  
- ;; Copyright (C) 1994-1995, 1997-1998, 2001-2012
- ;;   Free Software Foundation, Inc.
+ ;; Copyright (C) 1994-1995, 1997-1998, 2001-2013 Free Software
+ ;; Foundation, Inc.
  
  ;; Author: Barry A. Warsaw
  ;; Maintainer: FSF
@@@ -1,6 -1,6 +1,6 @@@
 -;;; ert-x.el --- Staging area for experimental extensions to ERT
 +;;; ert-x.el --- Staging area for experimental extensions to ERT  -*- lexical-binding: t -*-
  
- ;; Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc.
+ ;; Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
  
  ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
  ;;         Christian Ohler <ohler@gnu.org>
@@@ -1,6 -1,6 +1,6 @@@
 -;;; ert.el --- Emacs Lisp Regression Testing
 +;;; ert.el --- Emacs Lisp Regression Testing  -*- lexical-binding: t -*-
  
- ;; Copyright (C) 2007-2008, 2010-2012 Free Software Foundation, Inc.
+ ;; Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
  
  ;; Author: Christian Ohler <ohler@gnu.org>
  ;; Keywords: lisp, tools
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1,6 -1,6 +1,6 @@@
 -;;; trace.el --- tracing facility for Emacs Lisp functions
 +;;; trace.el --- tracing facility for Emacs Lisp functions  -*- lexical-binding: t -*-
  
- ;; Copyright (C) 1993, 1998, 2000-2012 Free Software Foundation, Inc.
+ ;; Copyright (C) 1993, 1998, 2000-2013 Free Software Foundation, Inc.
  
  ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
  ;; Maintainer: FSF
diff --cc lisp/env.el
Simple merge
diff --cc lisp/epg.el
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
diff --cc lisp/erc/erc.el
Simple merge
Simple merge
diff --cc lisp/faces.el
Simple merge
diff --cc lisp/ffap.el
Simple merge
Simple merge
diff --cc lisp/files.el
Simple merge
Simple merge
diff --cc lisp/frame.el
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
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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/hi-lock.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; hi-lock.el --- minor mode for interactive automatic highlighting
 +;;; hi-lock.el --- minor mode for interactive automatic highlighting  -*- lexical-binding: t -*-
  
- ;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
+ ;; Copyright (C) 2000-2013 Free Software Foundation, Inc.
  
  ;; Author: David M. Koppelman <koppel@ece.lsu.edu>
  ;; Keywords: faces, minor-mode, matching, display
Simple merge
diff --cc lisp/ibuffer.el
Simple merge
Simple merge
diff --cc lisp/ido.el
Simple merge
Simple merge
diff --cc lisp/image.el
Simple merge
diff --cc lisp/imenu.el
Simple merge
diff --cc lisp/info.el
Simple merge
Simple merge
diff --cc lisp/isearch.el
Simple merge
diff --cc lisp/json.el
@@@ -1,9 -1,9 +1,9 @@@
  ;;; json.el --- JavaScript Object Notation parser / generator
  
- ;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
+ ;; Copyright (C) 2006-2013 Free Software Foundation, Inc.
  
  ;; Author: Edward O'Connor <ted@oconnor.cx>
 -;; Version: 1.3
 +;; Version: 1.4
  ;; Keywords: convenience
  
  ;; This file is part of GNU Emacs.
Simple merge
Simple merge
@@@ -4577,7 -4552,7 +4577,7 @@@ encoded string (and the same mask) wil
  ;;; Start of automatically extracted autoloads.
  \f
  ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el"
- ;;;;;;  "791ea184628feb6335fe3e29f7234934")
 -;;;;;;  "1aec1d54f9767ee0fea557bbfb1d547b")
++;;;;;;  "0b056146d4775080a1847b8ce7527bc5")
  ;;; Generated autoloads from rmailedit.el
  
  (autoload 'rmail-edit-current-message "rmailedit" "\
Simple merge
Simple merge
@@@ -1,6 -1,6 +1,6 @@@
 -;;; unrmail.el --- convert Rmail Babyl files to mailbox files
 +;;; unrmail.el --- convert Rmail Babyl files to mbox files
  
- ;; Copyright (C) 1992, 2001-2012 Free Software Foundation, Inc.
+ ;; Copyright (C) 1992, 2001-2013 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: mail
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
diff --cc lisp/mpc.el
Simple merge
Simple merge
diff --cc lisp/net/tls.el
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/novice.el
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/org/ob.el
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,6 -1,6 +1,6 @@@
 -;;; perl-mode.el --- Perl code editing commands for GNU Emacs
 +;;; perl-mode.el --- Perl code editing commands for GNU Emacs  -*- coding: utf-8 -*-
  
- ;; Copyright (C) 1990, 1994, 2001-2012 Free Software Foundation, Inc.
+ ;; Copyright (C) 1990, 1994, 2001-2013 Free Software Foundation, Inc.
  
  ;; Author: William F. Mann
  ;; Maintainer: FSF
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1,6 -1,6 +1,6 @@@
 -;;; sql.el --- specialized comint.el for SQL interpreters
 +;;; sql.el --- specialized comint.el for SQL interpreters  -*- lexical-binding: t -*-
  
- ;; Copyright (C) 1998-201 Free Software Foundation, Inc.
+ ;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
  
  ;; Author: Alex Schroeder <alex@gnu.org>
  ;; Maintainer: Michael Mauger <mmaug@yahoo.com>
diff --cc lisp/server.el
Simple merge
diff --cc lisp/ses.el
Simple merge
diff --cc lisp/shell.el
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/sort.el
Simple merge
Simple merge
diff --cc lisp/startup.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc lisp/term.el
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
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
diff --cc lisp/vc/vc.el
Simple merge
diff --cc lisp/vcursor.el
Simple merge
diff --cc lisp/view.el
Simple merge
diff --cc lisp/window.el
Simple merge
diff --cc lisp/woman.el
Simple merge
diff --cc msdos/ChangeLog
Simple merge
Simple merge
diff --cc nt/ChangeLog
Simple merge
diff --cc nt/config.nt
Simple merge
diff --cc nt/gmake.defs
Simple merge
diff --cc nt/inc/ms-w32.h
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc nt/nmake.defs
Simple merge
diff --cc nt/zipdist.bat
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/.gdbinit
Simple merge
diff --cc src/ChangeLog
@@@ -1,58 -1,8 +1,62 @@@
 -2012-12-29  Andreas Schwab  <schwab@linux-m68k.org>
+ 2012-12-31  Glenn Morris  <rgm@gnu.org>
+       * keymap.c (Fkey_description): Doc fix.  (Bug#13323)
 +2013-01-02  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Simplify via eabs.
 +      * dired.c (file_name_completion):
 +      * doc.c (get_doc_string):
 +      * floatfns.c (round2):
 +      * font.c (font_score, font_delete_unmatched):
 +      * fringe.c (compute_fringe_widths):
 +      * lread.c (read_list):
 +      * minibuf.c (Ftry_completion):
 +      * term.c (tty_ins_del_lines):
 +      * xterm.c (x_draw_image_foreground, x_draw_image_foreground_1):
 +      Use eabs (x) rather than open-coding it as (x < 0 ? -x : x).
 +
 +2012-12-31  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * w32.c (unsetenv): Set up the string passed to _putenv
 +      correctly.  See
 +      http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00863.html
 +      for the bug this caused.
 +
 +2012-12-30  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * coding.c (Qmac): Now static.
 +
 +2012-12-30  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +      * gtkutil.c (TOOLBAR_TOP_WIDGET): New macro.
 +      (xg_pack_tool_bar): Use TOOLBAR_TOP_WIDGET, condition out use of
 +      handlebox_widget.  Set toolbar_in_hbox to false/true, set
 +      toolbar_is_packed to true.
 +      (xg_update_tool_bar_sizes): Use widget returned by TOOLBAR_TOP_WIDGET.
 +      (update_frame_tool_bar): Check toolbar_is_packed for packing.
 +      Show all on TOOLBAR_TOP_WIDGET.
 +      (free_frame_tool_bar): Check toolbar_is_packed.  Use widget returned
 +      by TOOLBAR_TOP_WIDGET.
 +      (xg_change_toolbar_position): Use widget returned by TOOLBAR_TOP_WIDGET.
 +      Check toolbar_is_packed.
 +      (xg_have_tear_offs, tearoff_remove, tearoff_activate): Condition on
 +      HAVE_GTK_TEAROFF_MENU_ITEM_NEW.
 +      (xg_have_tear_offs): When ! HAVE_GTK_TEAROFF_MENU_ITEM_NEW, return
 +      false.
 +      (create_menus): Create tearoff only if HAVE_GTK_TEAROFF_MENU_ITEM_NEW.
 +      (xg_update_menubar): Update title only if
 +      HAVE_GTK_TEAROFF_MENU_ITEM_NEW.
 +      (xg_update_submenu): Skip tearoff only if
 +      HAVE_GTK_TEAROFF_MENU_ITEM_NEW.
 +      (xg_initialize): Initialize xg_detached_menus only if
 +      HAVE_GTK_TEAROFF_MENU_ITEM_NEW.
 +
 +      * xterm.h (struct x_output): Surround handlebox_widget with
 +      #ifdef HAVE_GTK_HANDLE_BOX_NEW.  toolbar_is_packed is new,
 +      toolbar_in_hbox is bool.
 +
 +2012-12-30  Andreas Schwab  <schwab@linux-m68k.org>
  
        * src/Makefile.in (TEMACS_LDFLAGS2): Remove.
        (LIBS_GNUSTEP): Define.
diff --cc src/Makefile.in
Simple merge
diff --cc src/alloc.c
Simple merge
diff --cc src/buffer.c
Simple merge
diff --cc src/buffer.h
Simple merge
diff --cc src/bytecode.c
Simple merge
Simple merge
diff --cc src/category.c
Simple merge
diff --cc src/charset.c
Simple merge
diff --cc src/coding.c
Simple merge
diff --cc src/coding.h
Simple merge
diff --cc src/composite.c
Simple merge
diff --cc src/conf_post.h
Simple merge
diff --cc src/data.c
Simple merge
diff --cc src/dbusbind.c
Simple merge
diff --cc src/deps.mk
Simple merge
diff --cc src/dired.c
Simple merge
Simple merge
diff --cc src/dispnew.c
Simple merge
diff --cc src/doc.c
Simple merge
diff --cc src/doprnt.c
Simple merge
diff --cc src/editfns.c
Simple merge
diff --cc src/emacs.c
Simple merge
diff --cc src/eval.c
Simple merge
diff --cc src/fileio.c
Simple merge
diff --cc src/floatfns.c
Simple merge
diff --cc src/font.c
Simple merge
diff --cc src/fontset.c
Simple merge
diff --cc src/frame.c
Simple merge
diff --cc src/frame.h
Simple merge
diff --cc src/fringe.c
Simple merge
diff --cc src/gmalloc.c
Simple merge
diff --cc src/gnutls.c
Simple merge
diff --cc src/gtkutil.c
Simple merge
diff --cc src/image.c
Simple merge
diff --cc src/indent.c
Simple merge
diff --cc src/insdel.c
Simple merge
diff --cc src/intervals.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/lread.c
Simple merge
Simple merge
diff --cc src/marker.c
Simple merge
diff --cc src/minibuf.c
Simple merge
diff --cc src/msdos.c
Simple merge
diff --cc src/nsfns.m
Simple merge
diff --cc src/nsfont.m
Simple merge
diff --cc src/nsterm.h
Simple merge
diff --cc src/nsterm.m
Simple merge
diff --cc src/print.c
Simple merge
diff --cc src/process.c
Simple merge
diff --cc src/process.h
Simple merge
diff --cc src/profiler.c
Simple merge
diff --cc src/regex.c
Simple merge
diff --cc src/search.c
Simple merge
diff --cc src/sysdep.c
Simple merge
diff --cc src/syssignal.h
Simple merge
diff --cc src/systty.h
Simple merge
diff --cc src/syswait.h
Simple merge
diff --cc src/term.c
Simple merge
diff --cc src/termchar.h
Simple merge
diff --cc src/termhooks.h
Simple merge
diff --cc src/terminal.c
Simple merge
diff --cc src/textprop.c
Simple merge
diff --cc src/unexcoff.c
Simple merge
diff --cc src/unexcw.c
Simple merge
diff --cc src/unexw32.c
Simple merge
diff --cc src/vm-limit.c
Simple merge
diff --cc src/w32.c
Simple merge
diff --cc src/w32.h
Simple merge
Simple merge
diff --cc src/w32fns.c
Simple merge
diff --cc src/w32gui.h
Simple merge
diff --cc src/w32inevt.c
Simple merge
diff --cc src/w32menu.c
Simple merge
diff --cc src/w32proc.c
Simple merge
diff --cc src/w32term.c
Simple merge
diff --cc src/w32term.h
Simple merge
diff --cc src/w32xfns.c
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/window.h
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfaces.c
Simple merge
diff --cc src/xfns.c
Simple merge
diff --cc src/xftfont.c
Simple merge
diff --cc src/xmenu.c
Simple merge
diff --cc src/xrdb.c
Simple merge
diff --cc src/xselect.c
Simple merge
diff --cc src/xterm.c
Simple merge
diff --cc src/xterm.h
Simple merge
diff --cc test/ChangeLog
Simple merge
@@@ -1,6 -1,6 +1,6 @@@
 -;;; ert-tests.el --- ERT's self-tests
 +;;; ert-tests.el --- ERT's self-tests  -*- lexical-binding: t -*-
  
- ;; Copyright (C) 2007-2008, 2010-2012 Free Software Foundation, Inc.
+ ;; Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
  
  ;; Author: Christian Ohler <ohler@gnu.org>
  
Simple merge
Simple merge
Simple merge