[Emacs-diffs] trunk r117220: Merge from emacs-24; up to r117192

[Glenn Morris]

------------------------------------------------------------
revno: 117220 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-06-01 17:18:22 -0700
message:
  Merge from emacs-24; up to r117192
removed:
  admin/mac/                     mac-20140525134240-27genuld0zq6550f-1
added:
  admin/unidata/IVD_Sequences.txt 
ivd_sequences.txt-20140526153543-9dldls3gn3m6y7rg-1
renamed:
  admin/mac/uvs.el => admin/unidata/uvs.el 
uvs.el-20140525134240-27genuld0zq6550f-2
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/FOR-RELEASE              forrelease-20091113204419-o5vbwnq5f7feedwu-3115
  admin/unidata/Makefile.in      
makefile.in-20091113204419-o5vbwnq5f7feedwu-8551
  admin/unidata/README           readme-20091113204419-o5vbwnq5f7feedwu-8379
  admin/unidata/copyright.html   
copyright.html-20091113204419-o5vbwnq5f7feedwu-8381
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/abbrevs.texi         
abbrevs.texi-20091113204419-o5vbwnq5f7feedwu-6229
  doc/emacs/macos.texi           macos.texi-20091113204419-o5vbwnq5f7feedwu-6261
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/abbrevs.texi       
abbrevs.texi-20091113204419-o5vbwnq5f7feedwu-6158
  doc/lispref/functions.texi     
functions.texi-20091113204419-o5vbwnq5f7feedwu-6182
  doc/lispref/hooks.texi         hooks.texi-20091113204419-o5vbwnq5f7feedwu-6186
  doc/lispref/text.texi          text.texi-20091113204419-o5vbwnq5f7feedwu-6215
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/abbrev.el                 abbrev.el-20091113204419-o5vbwnq5f7feedwu-281
  lisp/cus-start.el              
cusstart.el-20091113204419-o5vbwnq5f7feedwu-1100
  lisp/emacs-lisp/byte-opt.el    byteopt.el-20091113204419-o5vbwnq5f7feedwu-491
  lisp/emacs-lisp/gv.el          setf.el-20120531120738-6w8114hk2anryyud-1
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/html2text.el         
html2text.el-20091113204419-o5vbwnq5f7feedwu-3253
  lisp/international/README      readme-20091113204419-o5vbwnq5f7feedwu-8834
  lisp/leim/quail/latin-pre.el   
latinpre.el-20091113204419-o5vbwnq5f7feedwu-1214
  lisp/minibuffer.el             
minibuffer.el-20091113204419-o5vbwnq5f7feedwu-8622
  lisp/mouse.el                  mouse.el-20091113204419-o5vbwnq5f7feedwu-123
  lisp/progmodes/js.el           js.el-20091113204419-o5vbwnq5f7feedwu-10919
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403
  lisp/subr.el                   subr.el-20091113204419-o5vbwnq5f7feedwu-151
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/Makefile.in                makefile.in-20091113204419-o5vbwnq5f7feedwu-631
  src/alloc.c                    alloc.c-20091113204419-o5vbwnq5f7feedwu-252
  src/cmds.c                     cmds.c-20091113204419-o5vbwnq5f7feedwu-214
  src/conf_post.h                conf_post.h-20120730211826-q0qbxxwh2emw52hd-1
  src/fileio.c                   fileio.c-20091113204419-o5vbwnq5f7feedwu-210
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253
  src/macuvs.h                   macuvs.h-20130915173740-04lgloz0557bz98l-3
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244
  admin/unidata/uvs.el           uvs.el-20140525134240-27genuld0zq6550f-2

Diff too large for email (29315 lines, the limit is 10000).