emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 0cce362: Merge branch 'emacs-24'.


From: Paul Eggert
Subject: [Emacs-diffs] master 0cce362: Merge branch 'emacs-24'.
Date: Sat, 29 Nov 2014 07:15:49 +0000

branch: master
commit 0cce3623b169732a51f055a86fc926313b11a5ee
Merge: 9875d23 6b765b8
Author: Paul Eggert <address@hidden>
Date:   Fri Nov 28 22:55:31 2014 -0800

    Merge branch 'emacs-24'.

 .gitignore                     |  318 +++++++++++++++++++++++++++++-----------
 ChangeLog                      |   69 +++++++++-
 admin/ChangeLog                |   10 ++
 admin/charsets/.gitignore      |    2 -
 admin/notes/bugtracker         |    6 +-
 admin/notes/changelogs         |   32 ----
 admin/notes/copyright          |    6 +-
 admin/notes/newfile            |    2 +-
 admin/notes/repo               |   40 +++++-
 admin/unidata/.gitignore       |    3 -
 autogen.sh                     |   40 +++++
 build-aux/git-hooks/commit-msg |   90 +++++++++++
 build-aux/git-hooks/pre-commit |   46 ++++++
 doc/emacs/ChangeLog            |   12 ++
 doc/emacs/maintaining.texi     |   25 ++-
 doc/emacs/trouble.texi         |    6 +-
 doc/lispintro/.gitignore       |    3 -
 doc/lispref/ChangeLog          |    8 +-
 doc/lispref/intro.texi         |    2 +-
 doc/lispref/tips.texi          |    6 +-
 etc/.gitignore                 |    2 -
 etc/CONTRIBUTE                 |   16 ++-
 etc/ChangeLog                  |    8 +-
 etc/PROBLEMS                   |   10 +-
 leim/.gitignore                |    2 -
 leim/ja-dic/.gitignore         |    1 -
 lib-src/.gitignore             |    7 -
 lisp/.gitignore                |    6 -
 lisp/ChangeLog                 |  105 +++++++++++++-
 lisp/ChangeLog.12              |    2 +-
 lisp/ChangeLog.13              |    6 +-
 lisp/ChangeLog.14              |   26 ++--
 lisp/ChangeLog.15              |   26 ++--
 lisp/ChangeLog.16              |    6 +-
 lisp/ChangeLog.6               |    2 +-
 lisp/ChangeLog.7               |    5 +-
 lisp/calc/.gitignore           |    2 -
 lisp/calendar/.gitignore       |    4 -
 lisp/calendar/diary-lib.el     |    3 +-
 lisp/calendar/todo-mode.el     |   45 ++++--
 lisp/cedet/.gitignore          |    8 -
 lisp/emulation/.gitignore      |    1 -
 lisp/erc/.gitignore            |    3 -
 lisp/erc/ChangeLog             |    2 +-
 lisp/erc/ChangeLog.02          |    2 +-
 lisp/erc/ChangeLog.03          |   12 +-
 lisp/eshell/.gitignore         |    2 -
 lisp/gnus/.gitignore           |    1 -
 lisp/gnus/ChangeLog            |    5 +
 lisp/gnus/ChangeLog.1          |   24 ++--
 lisp/gnus/ChangeLog.2          |   62 ++++----
 lisp/gnus/auth-source.el       |   34 ++--
 lisp/international/.gitignore  |   16 --
 lisp/language/.gitignore       |    1 -
 lisp/leim/.gitignore           |    2 -
 lisp/leim/quail/.gitignore     |   22 ---
 lisp/mail/.gitignore           |    1 -
 lisp/mh-e/.gitignore           |    3 -
 lisp/mh-e/ChangeLog            |    2 +-
 lisp/net/.gitignore            |    1 -
 lisp/net/tramp-adb.el          |    3 +-
 lisp/net/tramp-cache.el        |    2 +-
 lisp/net/tramp-compat.el       |    3 +-
 lisp/net/tramp-sh.el           |   13 +-
 lisp/net/tramp-smb.el          |    5 +-
 lisp/net/tramp.el              |   31 ++---
 lisp/nxml/.gitignore           |    2 -
 lisp/org/ChangeLog             |    2 +-
 lisp/outline.el                |   17 ++-
 lisp/play/.gitignore           |    1 -
 lisp/progmodes/.gitignore      |    1 -
 lisp/progmodes/python.el       |   39 ++++--
 lisp/term/.gitignore           |    1 -
 lisp/textmodes/.gitignore      |    1 -
 lisp/textmodes/makeinfo.el     |   11 +-
 lisp/url/.gitignore            |    4 -
 lisp/vc/vc-bzr.el              |    2 +-
 lisp/vc/vc-git.el              |   30 +++--
 lisp/vc/vc-hg.el               |    2 +-
 lisp/vc/vc.el                  |    8 +-
 nt/.gitignore                  |    5 -
 nt/ChangeLog                   |    4 +-
 src/.gitignore                 |    9 -
 src/ChangeLog                  |   23 +++
 src/ChangeLog.11               |   18 +-
 src/ChangeLog.2                |    6 +-
 src/ChangeLog.5                |  158 ++++++++++----------
 src/Makefile.in                |    2 +-
 src/keyboard.c                 |    2 +-
 src/w32fns.c                   |    9 +-
 src/xdisp.c                    |   12 ++
 test/ChangeLog                 |   11 ++
 test/automated/python-tests.el |   89 +++++++-----
 93 files changed, 1131 insertions(+), 609 deletions(-)

diff --cc .gitignore
index b5eda43,989bbb0..8e8a032
--- a/.gitignore
+++ b/.gitignore
@@@ -63,58 -68,190 +68,193 @@@ lib/sys
  lib/time.h
  lib/unistd.h
  lib/warn-on-use.h
+ src/buildobj.h
+ src/globals.h
+ 
+ # Lisp-level sources built by 'make'.
+ leim/changed.misc
+ leim/changed.tit
+ lisp/**/*cus-load.el
+ lisp/**/*loaddefs.el
+ lisp/cedet/semantic/bovine/c-by.el
+ lisp/cedet/semantic/bovine/make-by.el
+ lisp/cedet/semantic/bovine/scm-by.el
+ lisp/cedet/semantic/wisent/javat-wy.el
+ lisp/cedet/semantic/wisent/js-wy.el
+ lisp/cedet/semantic/wisent/python-wy.el
+ lisp/cedet/srecode/srt-wy.el
+ lisp/eshell/esh-groups.el
+ lisp/finder-inf.el
+ lisp/leim/ja-dic/
+ lisp/leim/leim-list.el
+ lisp/leim/quail/4Corner.el
+ lisp/leim/quail/ARRAY30.el
+ lisp/leim/quail/CCDOSPY.el
+ lisp/leim/quail/CTLau.el
+ lisp/leim/quail/CTLau-b5.el
+ lisp/leim/quail/ECDICT.el
+ lisp/leim/quail/ETZY.el
+ lisp/leim/quail/PY-b5.el
+ lisp/leim/quail/PY.el
+ lisp/leim/quail/Punct.el
+ lisp/leim/quail/Punct-b5.el
+ lisp/leim/quail/QJ.el
+ lisp/leim/quail/QJ-b5.el
+ lisp/leim/quail/SW.el
+ lisp/leim/quail/TONEPY.el
+ lisp/leim/quail/ZIRANMA.el
+ lisp/leim/quail/ZOZY.el
+ lisp/leim/quail/quick-b5.el
+ lisp/leim/quail/quick-cns.el
+ lisp/leim/quail/tsang-b5.el
+ lisp/leim/quail/tsang-cns.el
+ lisp/subdirs.el
+ 
+ # Dependencies.
+ .deps/
+ deps/
+ 
+ # Logs and temporaries.
+ *.log
+ *.tmp
 -# Created by MS-DOS builds
 -src/_gdbinit
+ 
+ # Time stamps.
+ stamp_BLD
+ src/gl-stamp
+ src/stamp-h.in
+ src/stamp-h1
+ 
+ # Object files and debugging.
+ *.a
+ *.dSYM/
+ *.core
+ *.elc
+ *.o
+ *.res
+ [0-9]*.core
+ core
+ core.*[0-9]
+ oo/
+ oo-spd/
+ src/*.map
+ 
+ # Tests.
+ test/indent/*.new
+ 
+ # ctags, etags.
+ TAGS
+ 
+ # GNU global.
+ GPATH
+ GSYMS
+ GRTAGS
+ GTAGS
+ 
+ # GNU idutils.
+ ID
+ 
+ # Executables.
+ *.exe
+ a.out
+ lib-src/blessmail
+ lib-src/ctags
+ lib-src/ebrowse
+ lib-src/emacsclient
+ lib-src/etags
+ lib-src/hexl
+ lib-src/make-docfile
+ lib-src/movemail
+ lib-src/profile
+ lib-src/test-distrib
+ lib-src/update-game-score
+ nextstep/Cocoa/Emacs.base/Contents/Info.plist
+ nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj
+ nextstep/Emacs.app/
+ nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
+ nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
  src/bootstrap-emacs
- src/deps/
  src/emacs
  src/emacs-[0-9]*
- src/gl-stamp
- src/globals.h
- src/stamp-h1
  src/temacs
- src/temacs.map
- src/temacs.tmp
- doc/*/*.aux
- doc/*/*.cm
- doc/*/*.cms
- doc/*/*.cp
- doc/*/*.cps
- doc/*/*.dvi
- doc/*/*.fn
- doc/*/*.fns
- doc/*/*.html
- doc/*/*.ky
- doc/*/*.kys
- doc/*/*.log
- doc/*/*.op
- doc/*/*.ops
- doc/*/*.pdf
- doc/*/*.pg
- doc/*/*.pgs
- doc/*/*.pj
- doc/*/*.pjs
- doc/*/*.ps
- doc/*/*.sc
- doc/*/*.scs
- doc/*/*.tg
- doc/*/*.tgs
- doc/*/*.tmp
- doc/*/*.toc
- doc/*/*.tp
- doc/*/*.tps
- doc/*/*.vr
- doc/*/*.vrs
- doc/*/texput.log
- doc/misc/cc-mode.ss
- lib/.deps/
- lisp/international/uni-brackets.el
- lwlib/deps/
- lwlib/liblw.a
- leim/changed.misc
- leim/changed.tit
- nt/emacs.rc
- nt/emacsclient.rc
  
- # Auto-generated from the corresponding *.in file.
+ # Character-set info.
+ admin/charsets/*.el
+ admin/charsets/*.map
+ admin/charsets/jisx2131-filter
+ admin/unidata/unidata.txt
+ lisp/international/charprop.el
+ lisp/international/uni-*.el
+ 
+ # Documentation.
+ *.aux
+ *.cm
+ *.cms
+ *.cp
+ *.cps
+ *.dvi
+ *.fn
+ *.fns
+ *.html
+ *.info
+ *.ky
+ *.kys
+ *.op
+ *.ops
+ *.pdf
+ !doc/lispintro/cons-*.pdf
+ !doc/lispintro/drawers.pdf
+ !doc/lispintro/lambda-*.pdf
+ !etc/refcards/gnus-logo.pdf
+ *.pg
+ *.pgs
+ *.pj
+ *.pjs
+ *.ps
+ *.sc
+ *.scs
+ *.tg
+ *.tgs
+ *.toc
+ *.tp
+ *.tps
+ *.vr
+ *.vrs
 +doc/emacs/emacsver.texi
 +doc/man/emacs.1
+ doc/misc/cc-mode.ss
+ etc/DOC
 +etc/refcards/emacsver.tex
+ info/dir
+ 
+ # Version control and locks.
+ *.orig
+ *.rej
+ *~
+ .#*
+ [0-9]*.patch
+ 
+ # Built by 'make install'.
+ etc/emacs.tmpdesktop
+ 
+ # Distribution directories.
+ /emacs-[1-9]*/
+ 
+ # Microsoft-related builds and installations.
+ *.in-h
+ _*
+ !build-aux/snippet/_Noreturn.h
+ /bin/
+ /BIN/
+ /data/
+ etc/icons/
+ lib/cxxdefs.h
+ lib/SYS/
+ /libexec/
+ /lock/
+ /README.W32
+ /share/
+ /site-lisp/
++nt/emacs.rc
++nt/emacsclient.rc
+ src/gdb.ini
+ /var/
diff --cc ChangeLog
index 9eae9e0,dba1ff3..4ab7aac
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,70 +1,78 @@@
 -2014-11-21  Paul Eggert  <address@hidden>
++2014-11-29  Paul Eggert  <address@hidden>
+ 
+       Add more of the old .bzrignore to .gitignore.
+       Plus a few more .gitignore improvements.
+       * .gitignore: Add copyright notice, since it's big enough.
+       Put exceptions immediately after the patterns they're exceptions
+       to, to make them easier to follow.
+       Give four exceptions for the Makefile pattern.
+       Ignore /confdefs.h, test/indent/*.new, TAGS, GPATH, GSYMS, GRTAGS,
+       GTAGS, ID, *.exe, some nextstep-related files,
+       jisx2131-filter, *.orig, *.rej, etc/emacs.tmpdesktop, *.in-h
+       _* (except for build-aux/snippet/_Noreturn.h), /bin/, /BIN/,
+       /data/, etc/icons/, lib/cxxdefs.h, lib/SYS/, /libexec/, /lock/,
+       /README.W32, /share/, /site-lisp/, src/gdb.ini, /var/.
+       Ignore /configure.lineno, since POSIX requires
+       LINENO only with the User Portability Utilities option.
+       Ignore *cust-load.el and *loaddefs.el only under lisp.
+       Ignore core files of various flavors.
+       Do not ignore etc/refcards/gnus-logo.pdf.
+ 
 -2014-11-21  Eli Zaretskii  <address@hidden>
++2014-11-29  Eli Zaretskii  <address@hidden>
+ 
+       * .gitignore: Add back src/_gdbinit, which is a temporary file
+       created by the MS-DOS build.
+ 
 -2014-11-20  Paul Eggert  <address@hidden>
++2014-11-29  Paul Eggert  <address@hidden>
+ 
+       Add a.out to .gitignore.
+       Suggested by Lee Duhem in:
+       http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01665.html
+       * .gitignore: Add a.out.
+       Move *.log next to *.tmp, since it's generic.
+       Put *.exe before non-generics.
+ 
 -2014-11-19  Eli Zaretskii  <address@hidden>
++2014-11-29  Eli Zaretskii  <address@hidden>
+ 
+       * .gitignore: Resurrect Windows-specific ignorables lost in last
+       changes.
+ 
 -2014-11-19  Paul Eggert  <address@hidden>
++2014-11-29  Paul Eggert  <address@hidden>
+ 
+       * .gitignore: Add /emacs-[1-9]*/, and sort better.
+ 
 -2014-11-18  Ivan Andrus  <address@hidden>
++2014-11-29  Ivan Andrus  <address@hidden>
+ 
+       * .gitignore: Add some nextstep/mac ignorables.
+ 
 -2014-11-18  Paul Eggert  <address@hidden>
++2014-11-29  Paul Eggert  <address@hidden>
+ 
+       .gitignore cleanup.
+       * .gitignore: Merge contents of subsidiary files and organize the
+       result so as to avoid duplication.  Remove no-longer needed entries.
+       * admin/charsets/.gitignore, admin/unidata/.gitignore:
+       * doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore:
+       * leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore:
+       * lisp/calc/.gitignore, lisp/calendar/.gitignore:
+       * lisp/cedet/.gitignore, lisp/emulation/.gitignore:
+       * lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore:
+       * lisp/international/.gitignore, lisp/language/.gitignore:
+       * lisp/leim/.gitignore, lisp/leim/quail/.gitignore:
+       * lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore:
+       * lisp/nxml/.gitignore, lisp/obsolete/.gitignore:
+       * lisp/play/.gitignore, lisp/progmodes/.gitignore:
+       * lisp/term/.gitignore, lisp/textmodes/.gitignore:
+       * lisp/url/.gitignore, nt/.gitignore, src/.gitignore:
+       Remove; no longer needed.
+ 
 +2014-11-29  Glenn Morris  <address@hidden>
 +
 +      * configure.ac: Simplify gnutls tests.
 +
 +2014-11-28  Stefan Monnier  <address@hidden>
 +
 +      * .gitignore: Add entries for emacsvers files.
 +
  2014-11-17  Paul Eggert  <address@hidden>
  
        Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.
@@@ -112,31 -113,11 +179,31 @@@
        corresponding commit comments.
  
        (The first .cvsignore commit was 1999-09-30T14:07:address@hidden
-       The last CVS commit was 2009-12-27T08:11:address@hidden)
+       The last CVS commit was 2009-12-27T08:11:address@hidden)
  
        Committer/author email addresses are generally correct for the
 -      transition day, not necessarily when the comit was originally
 -      made.
 +      transition day, not necessarily when the commit was originally made.
 +
 +2014-11-10  Glenn Morris  <address@hidden>
 +
 +      * configure.ac (doc/man/emacs.1): Generate it.
 +      * Makefile.in (top_bootclean): Remove doc/man/emacs.1.
 +      * make-dist: Do not distribute doc/man/emacs.1.
 +
 +      * configure.ac (etc/refcards/emacsver.tex): Generate it.
 +      * Makefile.in (etc-emacsver): New PHONY rule.
 +      (bootstrap-clean): Delete etc/refcards/emacsver.tex.
 +
 +      * configure.ac (doc/emacs/emacsver.texi): Generate it.
 +      * make-dist (doc/emacs/emacsver.texi) [update]: No longer check it.
 +
 +2014-11-08  Dani Moncayo  <address@hidden>
 +
 +      * build-aux/msys-to-w32: Simplify the initial over-engineered
 +      interface, and the implementation.
 +      * Makefile.in (epaths-force-w32): Update for the above.  Also
 +      simplify, assuming that the shell is bash (which is the case in MSYS).
 +      (msys_w32prefix_subst, msys_sed_sh_escape): Remove (no longer used).
  
  2014-11-05  Glenn Morris  <address@hidden>
  
diff --cc admin/ChangeLog
index 84aea47,82974dc..d894f76
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,8 -1,13 +1,18 @@@
 -2014-11-19  Paul Eggert  <address@hidden>
++2014-11-29  Paul Eggert  <address@hidden>
+ 
+       Lessen focus on ChangeLog files, as opposed to change log entries.
+       This is in preparation for generating the former automatically
+       from the latter.
+       * notes/bugtracker, notes/copyright, notes/newfile:
+       ChangeLog -> change log
+       * notes/changelogs: Remove, merging old contents to ...
+       * notes/repo: ... here.
+ 
 +2014-11-27  David Engster  <address@hidden>
 +
 +      * gitmerge.el: New file.
 +      * notes/git-workflow: Add documentation for using it.
 +
  2014-11-17  Oscar Fuentes  <address@hidden>
  
        * admin/CPP-DEFINES: Mention MINGW_W64.
diff --cc admin/notes/repo
index ded1032,46a9e08..97b4349
--- a/admin/notes/repo
+++ b/admin/notes/repo
@@@ -15,6 -22,21 +22,28 @@@ distributed version-control systems. Th
    files, just copy the entries you made in them to the commit message
    after the blank line.)
  
+ - Preferred form for several entries with the same content:
+ 
+    * help.el (view-lossage):
+    * kmacro.el (kmacro-edit-lossage):
+    * edmacro.el (edit-kbd-macro): Fix docstring, lossage is now 300 keys.
+ 
+   (Rather than anything involving "ditto" and suchlike.)
+ 
++- Emacs generally follows the GNU coding standards when it comes to 
ChangeLogs:
++  http://www.gnu.org/prep/standards/html_node/Change-Logs.html
++  One exception is that we still sometimes quote `like-this' (as the
++  standards used to recommend) rather than 'like-this' (as they do now),
++  because `...' is so widely used elsewhere in Emacs.
++  http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00514.html
++
+ ** Unnecessary metainformation
+ 
+ There is no need to make separate change log entries for files such as
+ NEWS, MAINTAINERS, and FOR-RELEASE, or to indicate regeneration of
+ files such as 'configure'.  "There is no need" means you don't have
+ to, but you can if you want to.
+ 
  * Commit to the right branch
  
  Development normally takes places on the trunk.
diff --cc autogen.sh
index 1945e81,69812cd..614bdc7
--- a/autogen.sh
+++ b/autogen.sh
@@@ -216,7 -208,47 +216,47 @@@ autoreconf -fi -I m4 || exit $
  ## cause 'make' to needlessly run 'autoheader'.
  echo timestamp > src/stamp-h.in || exit
  
+ ## Install Git hooks, if using Git.
+ if test -d .git/hooks; then
+     tailored_hooks=
+     sample_hooks=
+ 
+     for hook in commit-msg pre-commit; do
+       cmp build-aux/git-hooks/$hook .git/hooks/$hook >/dev/null 2>&1 ||
+       tailored_hooks="$tailored_hooks $hook"
+     done
+     for hook in applypatch-msg pre-applypatch; do
+       cmp .git/hooks/$hook.sample .git/hooks/$hook >/dev/null 2>&1 ||
+       sample_hooks="$sample_hooks $hook"
+     done
+ 
+     if test -n "$tailored_hooks$sample_hooks"; then
+       echo "Installing git hooks..."
+ 
+       case `cp --help 2>/dev/null` in
+         *--backup*--verbose*)
+           cp_options='--backup=numbered --verbose';;
+         *)
+           cp_options='';;
+       esac
+ 
+       if test -n "$tailored_hooks"; then
+           for hook in $tailored_hooks; do
+               cp $cp_options build-aux/git-hooks/$hook .git/hooks || exit
+               chmod a-w .git/hooks/$hook || exit
+           done
+       fi
+ 
+       if test -n "$sample_hooks"; then
+           for hook in $sample_hooks; do
+               cp $cp_options .git/hooks/$hook.sample .git/hooks/$hook || exit
+               chmod a-w .git/hooks/$hook || exit
+           done
+       fi
+     fi
+ fi
+ 
 -echo "You can now run \`./configure'."
 +echo "You can now run './configure'."
  
  exit 0
  
diff --cc doc/emacs/ChangeLog
index 1ce7aa1,e307ff3..956f14b
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,3 -1,15 +1,15 @@@
 -2014-11-19  Paul Eggert  <address@hidden>
++2014-11-29  Paul Eggert  <address@hidden>
+ 
+       Lessen focus on ChangeLog files, as opposed to change log entries.
+       * maintaining.texi (Change Log): Mention that ChangeLog files may
+       be copied to or from a version control system.
+       * trouble.texi (Sending Patches): Point to the commit messages.
+ 
 -2014-11-19  Eli Zaretskii  <address@hidden>
++2014-11-29  Eli Zaretskii  <address@hidden>
+ 
+       * maintaining.texi (Switching Branches): Mention "C-x v r".
+       Correct commands for switching branches in various VCSs.
+ 
  2014-11-16  Tassilo Horn  <address@hidden>
  
        * misc.texi (DocView Slicing): Describe how to slice with the
diff --cc doc/lispref/ChangeLog
index 7496643,9f8461c..31a9cbf
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,52 -1,9 +1,58 @@@
 -2014-11-19  Paul Eggert  <address@hidden>
++2014-11-29  Paul Eggert  <address@hidden>
+ 
+       Lessen focus on ChangeLog files, as opposed to change log entries.
+       * intro.texi (Acknowledgments): ChangeLog file -> change log entries.
+       * tips.texi (Library Headers): Emacs uses a version control system.
+ 
 +2014-11-27  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * text.texi (Document Object Model): Mention `dom-pp'.
 +
 +2014-11-26  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * text.texi (Document Object Model): New node to document dom.el.
 +
 +2014-11-24  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * processes.texi (Network Security): Made into its own section and
 +      fleshed out.
 +      (Network Security): Mention more NSM variables.
 +      (Processes): Moved the Network Security Manager stuff to the Emacs
 +      manual.
 +
 +2014-11-23  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * processes.texi (Network): Mention the new :warn-unless-encrypted
 +      parameter to `open-network-stream'.
 +      (Network): Mention the Network Security Manager.
 +
 +2014-11-21  Ulf Jasper  <address@hidden>
 +
 +      * text.texi (Parsing HTML/XML): Document new optional parameter
 +      'discard-comments' of 'libxml-parse(html|xml)-region'.
 +
 +2014-11-18  Leo Liu  <address@hidden>
 +
 +      * functions.texi (Advising Named Functions): Document
 +      define-advice.
 +
 +2014-11-17  Paul Eggert  <address@hidden>
 +
 +      Improve time stamp handling, and be more consistent about it.
 +      * os.texi (Time of Day, Time Conversion, Time Parsing)
 +      (Processor Run Time, Time Calculations):
 +      Document the new behavior, plus be clearer about the old behavior.
 +      (Idle Timers): Take advantage of new functionality.
 +
 +2014-11-16  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * text.texi (Special Properties): Mention `inhibit-read-only'.
 +
 +2014-11-14  Paul Eggert  <address@hidden>
 +
 +      * os.texi (Time of Day):
 +      Use leading zero with 24-hour times less than 10:00.
 +
  2014-11-09  Glenn Morris  <address@hidden>
  
        * Makefile.in (version): Remove variable.
diff --cc etc/ChangeLog
index a23524a,a416c86..09dfd7f
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@@ -1,31 -1,12 +1,37 @@@
 -2014-11-19  Paul Eggert  <address@hidden>
++2014-11-29  Paul Eggert  <address@hidden>
+ 
+       Lessen focus on ChangeLog files, as opposed to change log entries.
+       * CONTRIBUTE: Give advice about git commit messages and how
+       to generate proposed patches containing them.
+ 
 +2014-11-27  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * NEWS: Mention dom.el.
 +
 +2014-11-24  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * NEWS: Mention NSM.
 +
 +2014-11-23  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * NEWS: Mention `url-request-noninteractive'.
 +
 +2014-11-19  Leo Liu  <address@hidden>
 +
 +      * NEWS: Mention new macro define-advice.
 +
 +2014-11-17  Paul Eggert  <address@hidden>
 +
 +      Improve time stamp handling, and be more consistent about it.
 +      * NEWS: Document the changes.
 +
 +2014-11-14  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * NEWS: Mention the new `M-s M-s' keystroke.
 +
  2014-11-13  Paul Eggert  <address@hidden>
  
 -      Backport fix for minor Bazaar leftovers.
 +      Fix minor Bazaar leftovers.
        Reported by Perry E. Metzger in:
        http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00745.html
        * CONTRIBUTE: More git transition.
@@@ -34,74 -15,11 +40,74 @@@
  
        * CONTRIBUTE: git transition.
  
 +2014-11-10  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * NEWS: Mention that you can have several eww buffers (bug#16211).
 +
 +2014-11-10  Glenn Morris  <address@hidden>
 +
 +      * refcards/emacsver.tex.in: Rename from emacsver.tex.
 +
 +2014-11-09  Eric Ludlam <address@hidden>
 +
 +      * srecode/doc-cpp.srt (mode): Set to c mode so this works with
 +      both C and C++.
 +
 +2014-11-05  Teodor Zlatanov  <address@hidden>
 +
 +      * NEWS: Mention `url-user-agent'.  (Bug#16498)
 +
 +2014-09-13  Christopher Schmidt  <address@hidden>
 +
 +      * NEWS: Mention prefix argument of `quick-calc'.
 +
  2014-10-20  Glenn Morris  <address@hidden>
  
 -      * Version 24.4 released.
 +      * Merge in all changes up to 24.4 release.
 +
 +2014-10-19  Jan Djärv  <address@hidden>
 +
 +      * NEWS: Teroffs and detachable tool bar for Gtk+ is gone.
 +
 +2014-10-19  Ulf Jasper  <address@hidden>
 +
 +      * images/newsticker/rss-feed.png: New.
 +
 +      * images/newsticker/rss-feed.svg: New.
 +
 +      * images/newsticker/README: Add rss-feed.png, rss-feed.svg.
 +
 +2014-10-18  Michal Nazarewicz  <address@hidden>
 +
 +      * NEWS: Mention new whitespace-mode option: big-indent.
 +
 +2014-10-15  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * NEWS: Mention multipart/related.
 +
 +2014-10-15  Eli Zaretskii  <address@hidden>
 +
 +      * NEWS: Mention the UBA implementation update.
 +
 +      * HELLO: Remove now unneeded directional control characters.
 +
 +2014-10-13  Jan Djärv  <address@hidden>
 +
 +      * NEWS: Move and clarify OSX >= 10.6.
 +
 +2014-10-12  Jan Djärv  <address@hidden>
 +
 +      * NEWS: OSX required is 10.6 or newer.
 +
 +2014-10-09  Leo Liu  <address@hidden>
 +
 +      * NEWS: Mention optional arg to terpri and new cl-lib functions.
 +
 +2014-10-05  Jan Djärv  <address@hidden>
 +
 +      * NEWS: Mention ns-use-fullscreen-animation.
  
- 2014-09-30  Bill Wohler        <address@hidden>
+ 2014-09-30  Bill Wohler  <address@hidden>
  
        Release MH-E version 8.6
  
diff --cc lisp/ChangeLog
index 782481f,8c48019..2a450a7
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,71 -1,104 +1,172 @@@
 -2014-11-27  Stephen Berman  <address@hidden>
++2014-11-29  Stephen Berman  <address@hidden>
+           Stefan Monnier  <address@hidden>
+ 
+       * outline.el (outline-move-subtree-down): Make sure we can move
+       forward to find the end of the subtree and the insertion point
+       (bug#19102).
+ 
 -2014-11-27  Leonard Randall  <address@hidden>
++2014-11-29  Leonard Randall  <address@hidden>
+ 
+       * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search
+       for comment lines non-greedy and stopping at newlines to fix stack
+       overflows with large files. [Backport]
+ 
 -2014-11-27  Fabián Ezequiel Gallina  <address@hidden>
++2014-11-29  Fabián Ezequiel Gallina  <address@hidden>
+ 
+       * progmodes/python.el (python-shell-completion-setup-code): Use
+       __builtin__ module (or builtins in Python 3) and catch all errors
+       when importing readline and rlcompleter.
+ 
 -2014-11-26  Stephen Berman  <address@hidden>
++2014-11-29  Stephen Berman  <address@hidden>
+ 
+       * calendar/todo-mode.el: Handle calling revert-buffer (bug#19187).
+       (todo-revert-buffer): New function.
+       (todo-modes-set-1): Use it as the buffer-local value of
+       revert-buffer-function.
+ 
 -2014-11-26  Stephen Berman  <address@hidden>
++2014-11-29  Stephen Berman  <address@hidden>
+ 
+       * calendar/todo-mode.el (todo-mode): If called interactively, just
+       display a message saying to call todo-show to enter Todo mode
+       (Bug#19112).
+ 
 -2014-11-24  Dmitry Gutov  <address@hidden>
++2014-11-29  Dmitry Gutov  <address@hidden>
+ 
+       * vc/vc-hg.el (vc-hg-dir-status-files): Include ignored files.
+       (Bug#18579)
+ 
+       * vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored
+       files.  (Bug#18579)
+ 
 -2014-11-23  Michael Albinus  <address@hidden>
++2014-11-29  Michael Albinus  <address@hidden>
+ 
+       * textmodes/makeinfo.el (makeinfo-buffer): Make it work also for
+       remote `buffer-file-name'.
+ 
 -2014-11-23  Leo Liu  <address@hidden>
++2014-11-29  Leo Liu  <address@hidden>
+ 
+       * calendar/diary-lib.el (calendar-mark-1): Fix thinko.
+ 
 -2014-11-22  Fabián Ezequiel Gallina  <address@hidden>
++2014-11-29  Fabián Ezequiel Gallina  <address@hidden>
+ 
+       Set PYTHONUNBUFFERED on shell startup.
+ 
+       * progmodes/python.el (python-shell-unbuffered): New var.
+       (python-shell-calculate-process-environment): Use it.
+ 
 -2014-11-22  Michael Albinus  <address@hidden>
++2014-11-29  Michael Albinus  <address@hidden>
+ 
+       * net/tramp.el (tramp-action-password): Clean password on subsequent
+       attempts even if there was no wrong password indication.  (Bug#19047)
+ 
+       * net/tramp-sh.el (tramp-get-remote-locale): Return "LC_ALL=C" as
+       fallback.
+       (tramp-open-connection-setup-interactive-shell): No need to check
+       for nil as `tramp-get-remote-locale' return value.
+ 
 -2014-11-21  Eli Zaretskii  <address@hidden>
++2014-11-29  Eli Zaretskii  <address@hidden>
+ 
+       * vc/vc-git.el (vc-git-command, vc-git--call): Bind
+       coding-system-for-read and coding-system-for-write to
+       vc-git-commits-coding-system.
+       (vc-git-previous-revision): Use "~1" instead of "^", since the
+       latter is a special character for MS-Windows system shells.
+ 
 -2014-11-20  Michael Albinus  <address@hidden>
++2014-11-29  Michael Albinus  <address@hidden>
+ 
+       Improve XEmacs compatibility.
+ 
+       * net/tramp.el (tramp-autoload-file-name-handler):
+       Wrap `temporary-file-directory' by `symbol-value', it doesn't
+       exist in XEmacs.
+       (tramp-read-passwd): Don't use `with-timeout-suspend' and
+       `with-timeout-unsuspend' if they don't exist, like in XEmacs.
+       (tramp-time-less-p, tramp-time-subtract): Remove functions.
+       (tramp-handle-file-newer-than-file-p, tramp-time-diff):
+       * net/tramp-adb.el (tramp-adb-ls-output-time-less-p):
+       * net/tramp-cache.el (tramp-get-file-property):
+       * net/tramp-smb.el (tramp-smb-handle-insert-directory):
+       Use `time-less-p' and `time-subtract, respectively.
+ 
+       * net/tramp-adb.el (top): Do not require time-date.el.
+ 
+       * net/tramp-compat.el (top): Require time-date.el for XEmacs.
+ 
+       * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+       Check, whether `utf-8' is a valid coding system.
+ 
 -2014-11-19  Eli Zaretskii  <address@hidden>
++2014-11-29  Eli Zaretskii  <address@hidden>
+ 
+       * vc/vc.el (vc-retrieve-tag): Doc fix.
+ 
 +2014-11-28  Stefan Monnier  <address@hidden>
 +
 +      * simple.el (execute-extended-command--shorter): Fix the "M-p" case
 +      (bug#19152).
 +
 +2014-11-28  Martin Rudalics  <address@hidden>
 +
 +      Fix two issues around help-window-select.  (Bug#11039) (Bug#19012)
 +      * help.el (help-window-old-frame): New variable.
 +      (help-window-select): Default to nil (Bug#11039).
 +      Rewrite doc-string.
 +      (help-window-setup): When the help window appears on another
 +      frame and `help-window-select' is non-nil, give that frame input
 +      focus too (Bug#19012).
 +      (with-help-window): Store selected frame in
 +      help-window-old-frame.
 +
 +2014-11-28  Ulf Jasper  <address@hidden>
 +
 +      * net/newst-treeview.el (newsticker--treeview-load): Take care of
 +      nil value for `newsticker-groups-filename'.
 +
 +2014-11-28  Daiki Ueno  <address@hidden>
 +
 +      * epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region)
 +      (epa-sign-region, epa-encrypt-region):
 +      Use `epg-context-set-{passphrase,progress}-callback', instead of
 +      `setf'.  This partially reverts commit 9e48a95c (bug#19150).
 +      Reported by José A. Romero L.
 +
 +2014-11-27  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * net/eww.el (eww-restore-history):
 +      Bind `inhibit-modification-hooks' instead of `after-change-functions'.
 +
 +2014-11-27  Ulf Jasper  <address@hidden>
 +
 +      * net/newst-backend.el (newsticker--parse-atom-1.0):
 +      Handle embedded (x)html in summary node.
 +
 +2014-11-27  Sam Steingold  <address@hidden>
 +
 +      * menu-bar.el (menu-bar-open): When everything else fails,
 +      use (mouse-menu-bar-map).
 +
 +2014-11-27  Ulf Jasper  <address@hidden>
 +
 +      * net/newst-treeview.el (newsticker-groups-filename):
 +      Change default value to nil.  Point out that variable is obsolete in doc
 +      string.
 +      (newsticker--treeview-load): Change wording of the questions the
 +      user is asked when `newsticker-groups-filename' is found to be
 +      used and we offer to read and remove the groups file. (bug#19165)
 +
 +2014-11-27  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * net/eww.el (eww): Record the new URL immediately, so that if the
 +      HTTP fetch fails, we have the right URL in the buffer.
 +      (eww-process-text-input): Don't shorten the input field if
 +      deleting at the last character (bug#19085).
 +      (eww-restore-history): Inhibit change functions while restoring
 +      the history.
 +      (eww-process-text-input): Fix deletion at the start of the field, too.
 +      (eww-mode): Revert mistanken removal of `buffer-disable-undo'.
 +      (eww-process-text-input): Try to keep track of the size more reliably.
 +
 +      * dom.el (dom-pp): New function.
 +
  2014-11-17  Eli Zaretskii  <address@hidden>
  
        * vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry):
@@@ -4561,451 -1235,98 +4662,451 @@@
        (bug#17818).
  
        * mouse.el (mouse-drag-line): Don't re-add to unread-comment-events,
-       since it's already done inside the loop (bug#17819).
+       since it's already done inside the loop (bug#17819).
  
 -2014-06-20  Martin Rudalics  <address@hidden>
 +2014-06-21  Martin Rudalics  <address@hidden>
 +
 +      * mouse.el (mouse-drag-line): Re-remove code initially removed
 +      on 2013-03-09 and inadvertently reintroduced on 2013-11-30
 +      (Bug#17819).
 +
 +2014-06-21  Stefan Monnier  <address@hidden>
 +
 +      * progmodes/sh-script.el (sh-smie-sh-rules): For { after &&, don't
 +      align with the surrounding parent (bug#17721).
 +
 +2014-06-21  Eli Zaretskii  <address@hidden>
 +
 +      * textmodes/texinfo.el (texinfo-mode): Set skeleton-end-newline
 +      locally to nil.
 +      (texinfo-insert-block, address@hidden)
 +      (address@hidden, address@hidden): Adjust to
 +      local setting of skeleton-end-newline by adding an explicit \n to
 +      the skeletons where appropriate.  (Bug#17801)
 +
 +2014-06-21  Stefan Monnier  <address@hidden>
 +
 +      * emacs-lisp/smie.el (smie--hanging-eolp-function): New var.
 +      (smie-indent--hanging-p): Use it.
 +      * progmodes/sh-script.el (sh-set-shell): Set it (bug#17621).
 +
 +2014-06-21  Leo Liu  <address@hidden>
 +
 +      * simple.el (read-quoted-char): Don't let help chars pop up help
 +      buffer.  (Bug#16617)
 +
 +2014-06-21  Stefan Monnier  <address@hidden>
 +
 +      * progmodes/sh-script.el (sh-smie-sh-rules): Use same rule for && as
 +      for | (bug#17621).
 +
 +      * xt-mouse.el (xterm-mouse--read-event-sequence-1000):
 +      Drop unknown events instead of burping.
 +
 +2014-06-21  Eli Zaretskii  <address@hidden>
 +
 +      * term/w32-win.el (dynamic-library-alist): Support giflib 5.1.0
 +      and later.  (Bug#17790)
 +
 +2014-06-21  Juri Linkov  <address@hidden>
 +
 +      * dired.el (dired-mark-pop-up): Let-bind display-buffer-mark-dedicated
 +      to `soft'.  (Bug#17554)
 +
 +2014-06-21  Stefan Monnier  <address@hidden>
 +
 +      * delsel.el (electric-newline-and-maybe-indent): Mark it as well
 +      (bug#17737).
 +
 +2014-06-21  Dmitry Gutov  <address@hidden>
 +
 +      * progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't fontify
 +      `!' in `!~' with `font-lock-negation-char-face'.  (Bug#17732)
 +
 +2014-06-21  Michael Albinus  <address@hidden>
 +
 +      * net/dbus.el (dbus-call-method): Push only non D-Bus events into
 +      `unread-command-events'.
 +
 +2014-06-19  William Xu  <address@hidden>
 +
 +      * progmodes/hideif.el (hif-string-to-number): Don't return float for
 +      hex integer constants (bug#17807).
 +
 +2014-06-19  Stefan Monnier  <address@hidden>
 +
 +      * international/mule-util.el (truncate-string-ellipsis): New var.
 +      (truncate-string-to-width): Use it.
 +
 +2014-06-19  Robert Brown  <address@hidden>  (tiny change)
 +
 +      * emacs-lisp/lisp-mode.el (lisp-string-after-doc-keyword-p): New fun.
 +      (lisp-string-in-doc-position-p): New function, extracted from
 +      lisp-font-lock-syntactic-face-function.
 +      (lisp-font-lock-syntactic-face-function): Use them (bug#9130).
 +
 +2014-06-19  Grégoire Jadi  <address@hidden>
 +
 +      * net/rcirc.el (rcirc-omit-mode): Fix recenter error.  (Bug#17769)
 +
 +2014-06-18  Stefan Monnier  <address@hidden>
 +
 +      * play/bubbles.el (bubbles--initialize, bubbles--show-scores)
 +      (bubbles--game-over): Don't add `intangible' properties since they
 +      didn't work anyway.
 +
 +2014-06-18  Juri Linkov  <address@hidden>
 +
 +      * vc/ediff-init.el (ediff-current-diff-Ancestor)
 +      (ediff-fine-diff-Ancestor, ediff-even-diff-A, ediff-even-diff-B)
 +      (ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A)
 +      (ediff-odd-diff-B, ediff-odd-diff-C, ediff-odd-diff-Ancestor):
 +      Add `min-colors 88' version with removed black/white foregrounds.
 +      (Bug#10181)
 +
 +2014-06-18  Juri Linkov  <address@hidden>
 +
 +      * vc/diff-mode.el (diff-changed): Empty face definition to use
 +      `diff-removed' and `diff-added' on tty as well.  (Bug#10181)
 +      (diff-context): Use darker color on light background and
 +      lighter color on dark background.
 +
 +2014-06-18  Juri Linkov  <address@hidden>
 +
 +      * vc/diff-mode.el (diff-refine-changed): Rename from
 +      `diff-refine-change' for consistency with `diff-changed'.
 +      (diff-refine-change): Add obsolete face alias.  (Bug#10181)
 +
 +      * vc/smerge-mode.el (smerge-refined-changed): Rename from
 +      `smerge-refined-change'.
 +      (smerge-refined-change): Add obsolete face alias.
 +
 +2014-06-17  Stefan Monnier  <address@hidden>
 +
 +      * rect.el (rectangle-preview): New custom.
 +      (rectangle): New group.
 +      (rectangle--pos-cols): Add `window' argument.
 +      (rectangle--string-preview-state, rectangle--string-preview-window):
 +      New vars.
 +      (rectangle--string-flush-preview, rectangle--string-erase-preview)
 +      (rectangle--space-to, rectangle--string-preview): New functions.
 +      (string-rectangle): Use them.
 +      (rectangle--inhibit-region-highlight): New var.
 +      (rectangle--highlight-for-redisplay): Obey it.  Make sure
 +      `apply-on-region' uses the point-crutches of the right window.
 +      Use :align-to rather than multiple spaces.
 +
 +2014-06-16  Andrea Rossetti  <address@hidden>  (tiny change)
 +
 +      * ruler-mode.el (ruler-mode-window-col)
 +      (ruler-mode-mouse-set-left-margin)
 +      (ruler-mode-mouse-set-right-margin): Fix calculation of column
 +      from mouse position (Bug#17768).
 +
 +2014-06-16  Ron Schnell  <address@hidden>
 +
 +      * play/dunnet.el (dun-doassign): Fix bug where UNIX variable assignment
 +      without varname or rhs causes crash.
 +      (dun-ftp): Fix bug where blank ftp password is allowed, making it
 +      impossible to win endgame.
 +      (dun-unix-verbs): Add ssh as alias to rlogin, because nobody knows what
 +      rlogin is anymore.
 +      (dun-help): Bump version number; update contact info.
 +
 +2014-06-15  Eli Barzilay  <address@hidden>
 +
 +      * calculator.el (calculator-prompt, calculator-remove-zeros)
 +      (calculator-mode-hook, calculator-operators, calculator-stack)
 +      (calculator-mode): Tweak docstring.
 +      (calculator-user-operators): Tweak docstring, fix a bug in the last
 +      example.
 +      (calculator-displayer): `std' case has an optional boolean.
 +      (calculator-displayers): Use the new boolean to group in decimal mode.
 +      (calculator-mode-map, calculator, calculator-message)
 +      (calculator-op-arity, calculator-add-operators)
 +      (calculator-string-to-number, calculator-displayer-prev)
 +      (calculator-displayer-next, calculator-remove-zeros)
 +      (calculator-eng-display, calculator-number-to-string)
 +      (calculator-update-display, calculator-last-input)
 +      (calculator-clear-fragile, calculator-digit, calculator-decimal)
 +      (calculator-exp, calculator-saved-move, calculator-clear)
 +      (calculator-copy, calculator-put-value, calculator-help)
 +      (calculator-expt, calculator-truncate): Minor code improvements.
 +      (calculator-need-3-lines): New function pulling out code from
 +      `calculator'.
 +      (calculator-get-display): Rename from `calculator-get-prompt', and
 +      improved.
 +      (calculator-push-curnum): Rename from `calculator-curnum-value', and
 +      extended for all uses of it.  All callers changed.
 +      (calculator-groupize-number): New utility for splitting a number into
 +      groups.
 +      (calculator-standard-displayer): Improve code, new optional argument to
 +      use comma-split groups, make second argument optional too to use with
 +      'left/'right inputs.  All callers changed.
 +      (calculator-reduce-stack-once): New utility, doing the meat of what
 +      `calculator-reduce-stack' used to do, much improved (mostly using
 +      `pcase' for conciseness and clarity).
 +      (calculator-reduce-stack): Now doing just the reduction loop using
 +      `calculator-reduce-stack-once'.
 +      (calculator-funcall): Improve code, make it work in v24.3.1 too.
 +      (calculator-last-input): Improve code, remove some old cruft.
 +      (calculator-quit): Kill `calculator-buffer' in electric mode too.
 +      (calculator-integer-p): Remove.
 +      (calculator-fact): Improve code, make it work on non-integer values
 +      too (using truncated numbers).
 +
 +2014-06-15  Michael Albinus  <address@hidden>
 +
 +      Sync with Tramp 2.2.10.
 +
 +      * net/tramp.el (tramp-methods): Tweak docstring.
 +      (tramp-handle-file-accessible-directory-p): Check for
 +      `file-readable-p' instead of `file-executable-p'.
 +      (tramp-check-cached-permissions):
 +      Use `tramp-compat-file-attributes'.
 +      (tramp-call-process): Add new argument VEC.  Adapt callees in all
 +      tramp*.el files.
 +
 +      * net/tramp-adb.el (tramp-adb-handle-write-region): Improve messages.
 +      (tramp-adb-maybe-open-connection): Don't set
 +      `tramp-current-*' variables.
 +
 +      * net/tramp-cache.el (tramp-flush-file-function): Do not flush
 +      file properties of temporary buffers.
 +
 +      * net/tramp-ftp.el (top): Remove special handling for URL syntax.
 +
 +      * net/tramp-gvfs.el (tramp-gvfs-methods) <sftp>: Add.
 +      (tramp-gvfs-handle-delete-file): Flush file
 +      properties, not directory properties.
 +      (tramp-gvfs-handle-file-attributes): Use `string-to-number' when
 +      reading "unix::mode".
 +      (tramp-gvfs-handle-file-name-all-completions):
 +      Use "-h" option for "gvfs-ls".
 +      (tramp-gvfs-url-file-name): `user' and `localname' could be nil.
 +      (tramp-gvfs-send-command): Simplify traces.
 +
 +      * net/tramp-sh.el (vc-handled-backends, vc-bzr-program)
 +      (vc-git-program, vc-hg-program): Declare.
 +      (tramp-methods) <sftp>: Remove.  It has never worked satisfactorily.
 +      (tramp-methods) <nc>: Add new method.
 +      (tramp-methods) <telnet>: Redirect stderr to "/dev/null".
 +      (tramp-methods) <plink, plinkx, pscp, psftp>: Improve
 +      `tramp-login-args'.
 +      (tramp-default-user-alist): Add "nc".
 +      (top): Remove completion function for "sftp".  Add completion
 +      functions for "nc" and "psftp".
 +      (tramp-do-copy-or-rename-file-out-of-band): Tweak docstring.
 +      Implement support for "nc" method.
 +      (tramp-sh-handle-expand-file-name, tramp-local-coding-commands)
 +      (tramp-remote-coding-commands, tramp-call-local-coding-command):
 +      Tweak docstring.
 +      (tramp-sh-handle-write-region): Tweak error message.
 +      (tramp-sh-handle-vc-registered): Remove backends when the remote
 +      binary does not exist.
 +      (tramp-find-inline-encoding): Do not raise an error.
 +      (tramp-make-copy-program-file-name): Tweak docstring.  Handle also
 +      the "nc" case.  Quote result also locally.
 +
 +      * net/tramp-smb.el (tramp-smb-handle-copy-directory)
 +      (tramp-smb-handle-set-file-acl): Use `start-process'.
 +      (tramp-smb-handle-insert-directory): Use progress reporter.
 +      (tramp-smb-handle-rename-file): Flush also file properties of
 +      FILENAME.
 +
 +      * net/trampver.el: Update release number.
 +
 +2014-06-15  Stefan Monnier  <address@hidden>
 +
 +      * ses.el: Miscellaneous cleanups; use lexical-binding; avoid
 +      add-to-list.
 +      (ses-localvars): Remove ses--local-printer-list, unused.
 +      (ses--metaprogramming): New macro.  Use it to defvar variables.
 +      (ses-set-localvars): Simplify.
 +      (ses--locprn, ses-cell): Use defstruct.  Change ses-cell's
 +      property-list into an alist.
 +      (ses-locprn-get-compiled, ses-locprn-compiled-aset)
 +      (ses-locprn-get-def, ses-locprn-def-aset, ses-locprn-get-number):
 +      Remove; use defstruct accessors/setters instead.
 +      (ses-cell-formula-aset, ses-cell-printer-aset)
 +      (ses-cell-references-aset): Remove, use setf instead.
 +      (ses--alist-get): New function.
 +      (ses-cell-property): Rename from ses-cell-property-get and rewrite.
 +      Use an alist instead of a plist and don't do move-to-front since the
 +      list is always short.
 +      (ses-cell-property-get-fun, ses-cell-property-delq-fun)
 +      (ses-cell-property-set-fun, ses-cell-property-set)
 +      (ses-cell-property-pop-fun, ses-cell-property-get-handle)
 +      (ses-cell-property-handle-car, ses-cell-property-handle-setcar): Remove.
 +      (ses--letref): New macro.
 +      (ses-cell-property-pop): Rewrite.
 +      (ses--cell): Rename from ses-cell and make it into a function.
 +      Make `formula' fallback on `value' if nil.
 +      (ses--local-printer): Rename from ses-local-printer and make it into
 +      a function.
 +      (ses-set-cell): Turn it into a macro so finding the accessor from the
 +      field name is done at compile time.
 +      (ses-repair-cell-reference-all): Test presence of `sym' rather than
 +      `ref' before adding `sym' to :ses-repair-reference.
 +      (ses-calculate-cell): Use ses--letref rather than
 +      ses-cell-property-get-handle.
 +      (ses-write-cells): Use a single prin1-to-string.
 +      (ses-setter-with-undo): New function.
 +      (ses-aset-with-undo, ses-set-with-undo): Rewrite using it.
 +      (ses-unset-with-undo): Remove.
 +      (ses-load): Prefer apply' over `eval'.
 +      (ses-read-printer, ses-set-column-width): Use standard "(default
 +      foo)" format.
 +
 +2014-06-15  Glenn Morris  <address@hidden>
 +
 +      * Makefile.in (leim, semantic): Use `make -C' rather than `cd && make'.
 +
 +      * progmodes/cc-langs.el: Require cl-lib.  (Bug#17463)
 +      Replace delete-duplicates and mapcan by cl- versions throughout.
 +      And cl-macroexpand-all by macroexpand-all.
 +      (delete-duplicates, mapcan, cl-macroexpand-all): No need to declare.
 +
 +2014-06-15  Eli Zaretskii  <address@hidden>
 +
 +      * subr.el (posn-col-row): Doc fix.  (Bug#17768)
 +
 +2014-06-15  Juri Linkov  <address@hidden>
 +
 +      * bindings.el: Put `ascii-character' property on keypad keys
 +      mapped to characters.  (Bug#17759)
 +
 +2014-06-15  Stefan Monnier  <address@hidden>
 +
 +      * emacs-lisp/smie.el (smie-next-sexp): Fix up "other-end" info when
 +      bumping forward into a closing paren (bug#17761).
 +
 +      * term/xterm.el (xterm--version-handler): Work around for OSX
 +      Terminal.app (bug#17607).
  
 -      * mouse.el (mouse-drag-line): Re-remove code initially removed
 -      on 2013-03-09 and inadvertently reintroduced on 2013-11-30
 -      (Bug#17819).
 +2014-06-14  Ron Schnell  <address@hidden>
  
 -2014-06-20  Stefan Monnier  <address@hidden>
 +      * play/dunnet.el (dun-describe-room, dun-mode):
 +      If a lamp is in the room, you won't be eaten by a grue.
  
 -      * progmodes/sh-script.el (sh-smie-sh-rules): For { after &&, don't
 -      align with the surrounding parent (bug#17721).
 +2014-06-13  Glenn Morris  <address@hidden>
  
 -2014-06-20  Eli Zaretskii  <address@hidden>
 +      * Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)
 +      (autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile)
 +      (compile-always): GNU make automatically passes
 +      command-line arguments to sub-makes.
  
 -      * textmodes/texinfo.el (texinfo-mode): Set skeleton-end-newline
 -      locally to nil.
 -      (texinfo-insert-block, address@hidden)
 -      (address@hidden, address@hidden): Adjust to
 -      local setting of skeleton-end-newline by adding an explicit \n to
 -      the skeletons where appropriate.  (Bug#17801)
 +      * calendar/calendar.el (calendar-generate-window):
 +      Remove pointless call to font-lock-fontify-buffer.
  
 -2014-06-20  Stefan Monnier  <address@hidden>
 +2014-06-13  Matthias Meulien  <address@hidden>
  
 -      * emacs-lisp/smie.el (smie--hanging-eolp-function): New var.
 -      (smie-indent--hanging-p): Use it.
 -      * progmodes/sh-script.el (sh-set-shell): Set it (bug#17621).
 +      * simple.el (completion-list-mode-map): Navigate with tab and backtab
 +      (bug#17767).
  
 -2014-06-20  Leo Liu  <address@hidden>
 +2014-06-13  Stefan Monnier  <address@hidden>
  
 -      * simple.el (read-quoted-char): Don't let help chars pop up help
 -      buffer.  (Bug#16617)
 +      * simple.el (set-mark-command): Simplify a bit.
  
 -2014-06-19  Stefan Monnier  <address@hidden>
 +2014-06-12  Nicolas Richard  <address@hidden>
  
 -      * progmodes/sh-script.el (sh-smie-sh-rules): Use same rule for && as
 -      for | (bug#17621).
 +      * help.el (help--key-binding-keymap): New function.
 +      (help--binding-locus): New function.
 +      (describe-key): Mention the keymap in which the binding was
 +      found. (bug#13948)
  
 -2014-06-18  Stefan Monnier  <address@hidden>
 +2014-06-12  Stefan Monnier  <address@hidden>
  
 -      * xt-mouse.el (xterm-mouse-translate-1): Fix last change (bug#17776).
 -      (xterm-mouse--read-event-sequence-1000): Drop unknown events instead of
 -      burping.
 +      * hippie-exp.el (he--all-buffers): New function.
 +      (try-expand-line-all-buffers, try-expand-list-all-buffers)
 +      (try-expand-dabbrev-all-buffers): Use it.
  
 -2014-06-18  Eli Zaretskii  <address@hidden>
 +2014-06-12  Emilio C. Lopes  <address@hidden>
  
 -      * term/w32-win.el (dynamic-library-alist): Support giflib 5.1.0
 -      and later.  (Bug#17790)
 +      * hippie-exp.el (try-expand-line-all-buffers)
 +      (try-expand-list-all-buffers, try-expand-dabbrev-all-buffers):
 +      Read hippie-expand-only-buffers and hippie-expand-ignore-buffers in the
 +      original buffer, in case they're buffer-local.
  
 -2014-06-18  Juri Linkov  <address@hidden>
 +2014-06-12  Vincent Belaïche  <address@hidden>
  
 -      * dired.el (dired-mark-pop-up): Let-bind display-buffer-mark-dedicated
 -      to `soft'.  (Bug#17554)
 +      * ses.el (ses-initial-global-parameters-re): New defconst, a
 +      specific regexp is needed now that ses.el can handle both
 +      file-format 2 --- ie. no local printers --- and 3 --- i.e. may have
 +      local printers.
 +      (ses-localvars): Add local variables needed for local printer handling.
 +      (ses-set-localvars): Handle hashmap initialisation.
 +      (ses-paramlines-plist): Add param-line for number of local printers.
 +      (ses-paramfmt-plist): New defconst, needed for code factorization
 +      between functions `ses-set-parameter' and
 +      `ses-file-format-extend-paramter-list'
 +      (ses-make-local-printer-info): New defsubst.
 +      (ses-locprn-get-compiled, ses-locprn-compiled-aset)
 +      (ses-locprn-get-def, ses-locprn-def-aset, ses-locprn-get-number)
 +      (ses-cell-printer-aset): New defmacro.
 +      (ses-local-printer-compile): New defun.
 +      (ses-local-printer): New defmacro.
 +      (ses-printer-validate, ses-call-printer): Add support for local
 +      printer functions.
 +      (ses-file-format-extend-paramter-list): New defun.
 +      (ses-set-parameter): Use const `ses-paramfmt-plist' for code
 +      factorization.
 +      (ses-load): Add support for local printer functions.
 +      (ses-read-printer): Update docstring and add support for local printer
 +      functions.
 +      (ses-refresh-local-printer, ses-define-local-printer): New defun.
 +      (ses-safe-printer): Add support for local printer functions.
  
 -2014-06-17  Stefan Monnier  <address@hidden>
 +2014-06-12  Ivan Andrus  <address@hidden>
  
 -      * delsel.el (electric-newline-and-maybe-indent): Mark it as well
 -      (bug#17737).
 +      * ffap.el (ffap-lax-url): New var (bug#17723).
 +      (ffap-url-at-point): Use it.
 +      (ffap-file-at-point): Avoid returning just "/".
  
 -2014-06-16  Dmitry Gutov  <address@hidden>
 +2014-06-12  Matthias Meulien  <address@hidden>
  
 -      * progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't fontify
 -      `!' in `!~' with `font-lock-negation-char-face'.  (Bug#17732)
 +      * progmodes/python.el (import skeleton): New skeleton (bug#17672).
 +      (python-mode-map): Bind it.
  
 -2014-06-15  Michael Albinus  <address@hidden>
 +      * progmodes/python.el (class skeleton): Don't erase last char of class
 +      name (bug#17683).
  
 -      * net/dbus.el (dbus-call-method): Push only non D-Bus events into
 -      `unread-command-events'.
 +2014-06-12  Cameron Desautels  <address@hidden>  (tiny change)
  
 -2014-06-14  Glenn Morris  <address@hidden>
 +      * help.el (where-is): Use `default' arg of completing-read (bug#17705).
  
 -      * progmodes/cc-langs.el: Require cl-lib.  (Bug#17463)
 -      Replace delete-duplicates and mapcan by cl- versions throughout.
 -      And cl-macroexpand-all by macroexpand-all.
 -      (delete-duplicates, mapcan, cl-macroexpand-all): No need to declare.
 +2014-06-12  Kevin Ryde  <address@hidden>
  
 -2014-06-14  Eli Zaretskii  <address@hidden>
 +      * files.el (auto-mode-alist): Map .ad files to xdefaults-mode
 +      (bug#17745).
  
 -      * subr.el (posn-col-row): Doc fix.  (Bug#17768)
 +2014-06-12  Stefan Monnier  <address@hidden>
  
 -2014-06-14  Juri Linkov  <address@hidden>
 +      * international/mule-cmds.el: Use lexical-binding.
 +      (ucs-names): Simplify.
  
 -      * bindings.el: Put `ascii-character' property on keypad keys
 -      mapped to characters.  (Bug#17759)
 +2014-05-18  Eric Hanchrow  <address@hidden>
  
 -2014-06-13  Stefan Monnier  <address@hidden>
 +      * progmodes/python.el (run-python): Use read-shell-command.
  
 -      * emacs-lisp/smie.el (smie-next-sexp): Fix up "other-end" info when
 -      bumping forward into a closing paren (bug#17761).
 +2014-06-11  Stefan Monnier  <address@hidden>
  
 -      * term/xterm.el (xterm--version-handler): Work around for OSX
 -      Terminal.app (bug#17607).
 +      * rect.el: Make it possible to move bounds past EOL or into TABs.
 +      (operate-on-rectangle): Use apply-on-rectangle.
 +      (rectangle--mark-crutches): New var.
 +      (rectangle--pos-cols, rectangle--col-pos, rectangle--point-col)
 +      (rectangle--crutches, rectangle--reset-crutches): New functions.
 +      (apply-on-rectangle): Obey crutches.  Avoid setq.
 +      Fix missing final iteration if end is at EOB&BOL.
 +      (rectangle-mark-mode-map): Add remap bindings for
 +      exchange-point-and-mark and char/line movements.
 +      (rectangle--*-char): New function.
 +      (rectangle-exchange-point-and-mark, rectangle-right-char)
 +      (rectangle-left-char, rectangle-forward-char)
 +      (rectangle-backward-char, rectangle-next-line)
 +      (rectangle-previous-line): New commands.
 +      (rectangle--place-cursor): New function.
 +      (rectangle--highlight-for-redisplay): Use it.  Use apply-on-rectangle.
  
  2014-06-08  Glenn Morris  <address@hidden>
  
@@@ -5562,114 -1606,8 +5663,114 @@@
        * emacs-lisp/eieio-opt.el (eieio-help-class): Correctly deal with
        methods which do not have a doc string.  (Bug#17490)
  
 +2014-05-25  Tassilo Horn  <address@hidden>
 +
 +      * textmodes/reftex-ref.el (reftex-format-special): Make it work
 +      also for AMS Math's \eqref macro.
 +
 +2014-05-25  Thien-Thi Nguyen  <address@hidden>
 +
 +      Arrange to never byte-compile the generated -pkg.el file.
 +
 +      * emacs-lisp/package.el (package-generate-description-file):
 +      Output first-line comment to set buffer-local var `no-byte-compile'.
 +      Suggested by Dmitry Gutov:
 +      <http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00401.html>.
 +
 +2014-05-25  Thien-Thi Nguyen  <address@hidden>
 +
 +      Fix bug: Properly quote args to generated -pkg.el `define-package'.
 +
 +      * emacs-lisp/package.el (package-generate-description-file):
 +      Inline `package--alist-to-plist'; rewrite to selectively
 +      quote alist values that are not self-quoting.
 +      (package--alist-to-plist): Delete func.
 +
 +2014-05-25  Andreas Schwab  <address@hidden>
 +
 +      * term/xterm.el (xterm-function-map): Add mapping for shifted
 +      keypad keys.
 +
 +2014-05-24  Daniel Colascione  <address@hidden>
 +
 +      * progmodes/subword.el (subword-find-word-boundary): Move point to
 +      correct spot before search. (Bug#17580)
 +
 +      * emacs-lisp/nadvice.el (defun): Write in eval-and-compile to avoid
 +      breaking the build.
 +
 +2014-05-24  Leo Liu  <address@hidden>
 +
 +      * calc/calc.el (math-bignum): Handle most-negative-fixnum.  (Bug#17556)
 +
 +2014-05-23  Stefan Monnier  <address@hidden>
 +
 +      * minibuffer.el (completion--sreverse): Remove.
 +      (completion--common-suffix): Use `reverse' instead.
 +      * emacs-lisp/regexp-opt.el (regexp-opt-group): Use `reverse' on strings.
 +
 +2014-05-22  Glenn Morris  <address@hidden>
 +
 +      * shell.el (shell-mode) <shell-dirstack-query>: Bypass bash aliases.
 +
 +2014-05-21  Daniel Colascione  <address@hidden>
 +
 +      * files.el (interpreter-mode-alist): Add mksh.
 +
 +      * progmodes/sh-script.el (sh-ancestor-alist): Add mksh, a pdksh
 +      derivative.
 +      (sh-alias-alist): Alias /system/bin/sh (Android's system shell) to
 +      mksh. Improve custom spec; allow regular expressions.
 +      (sh-shell): Delegate name splitting to `sh-canonicalize-shell'.
 +      (sh-after-hack-local-variables): New function.
 +      (sh-mode): Use it; respect file-local `sh-shell' variable. (bug#17333)
 +      (sh-set-shell): Use `sh-canonicalize-shell' instead of open-coding
 +      the normalization.
 +      (sh-canonicalize-shell): Rewrite to support regexes.
 +
 +2014-05-21  Leo Liu  <address@hidden>
 +
 +      * emacs-lisp/cl-lib.el (cl-endp): Fix last change.
 +
 +2014-05-19  Leo Liu  <address@hidden>
 +
 +      * emacs-lisp/cl-lib.el (cl-endp): Conform to CL's semantics.
 +
 +2014-05-18  Glenn Morris  <address@hidden>
 +
 +      * loadup.el:
 +      * play/gametree.el: `track-mouse' is always defined since 2012-11-24.
 +
 +2014-05-14  Sam Steingold  <address@hidden>
 +
 +      * progmodes/python.el (python-shell-get-or-create-process):
 +      Do not bind `current-prefix-arg' so that C-c C-z does not talk
 +      back unless requested.
 +
 +2014-05-14  Glenn Morris  <address@hidden>
 +
 +      * subr.el (with-file-modes): New macro.
 +      * printing.el (pr-save-file-modes): Make obsolete.
 +      * eshell/esh-util.el (eshell-with-file-modes): Make obsolete.
 +      * emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2):
 +      Add with-file-modes.
 +      * doc-view.el (doc-view-make-safe-dir):
 +      * epg.el (epg--start):
 +      * files.el (locate-user-emacs-file, make-temp-file)
 +      (backup-buffer-copy, move-file-to-trash):
 +      * printing.el (pr-despool-print, pr-call-process, pr-text2ps):
 +      * eshell/esh-util.el (eshell-with-private-file-modes)
 +      (eshell-make-private-directory):
 +      * net/browse-url.el (browse-url-mosaic):
 +      * obsolete/mailpost.el (post-mail-send-it):
 +      * obsolete/pgg-pgp.el (pgg-pgp-verify-region):
 +      * obsolete/pgg-pgp5.el (pgg-pgp5-verify-region):
 +      Use with-file-modes.
 +
 +      * vc/emerge.el (emerge-make-temp-file): Simplify.
 +
  2014-05-14  Stephen Berman <address@hidden>
-             Stefan Monnier  <address@hidden>
+           Stefan Monnier  <address@hidden>
  
        * minibuffer.el (completion-pcm--merge-try): Merge trailing / with
        suffix (bug#15419).
diff --cc lisp/gnus/ChangeLog
index 736cb4e,3b2a702..e2b2668
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@@ -1,29 -1,9 +1,34 @@@
 -2014-11-26  John Mastro <address@hidden>  (tiny change)
++2014-11-29  John Mastro <address@hidden>  (tiny change)
+ 
+       * auth-source.el (auth-source-macos-keychain-search-items): Return
+       result of `auth-source-macos-keychain-result-append' (bug#19074).
+ 
 -2014-11-10  Adam Sjøgren  <address@hidden>
 +2014-11-27  Katsumi Yamaoka  <address@hidden>
 +
 +      * gnus-art.el (gnus-use-idna):
 +      * gnus-sum.el (gnus-summary-idna-message):
 +      * message.el (message-use-idna):
 +      Protect against nil value for idna-program.
 +
 +      * message.el (message-use-idna): Load Mule-UCS for XEmacs 21.4.
 +
 +2014-11-25  Glenn Morris  <address@hidden>
 +
 +      * gnus-start.el (gnus-save-newsrc-file-check-timestamp):
 +      Add :version tag.
 +
 +2014-11-23  Lars Magne Ingebrigtsen  <address@hidden>
 +
 +      * pop3.el (pop3-open-server): Warn unless encrypted.
 +
 +      * nnimap.el (nnimap-open-connection-1): Warn unless encrypted.
 +
 +2014-11-17  Albert Krewinkel  <address@hidden>
 +
 +      * message.el (message-valid-fqdn-regexp): Add non-internaional new
 +      TLDs.
 +
 +2014-11-16  Adam Sjøgren  <address@hidden>
  
        * mml2015.el (mml2015-display-key-image): New variable.
  
diff --cc lisp/gnus/ChangeLog.2
index 37d1c1d,8c237ab..e54cc15
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@@ -15652,16 -15661,16 +15652,16 @@@
        * mm-util.el, message.el, rfc2047.el, gnus-sum.el, gnus-score.el:
        Sync with Emacs 21 (tag EMACS_PRETEST_21_0_100).
  
- ;;Has been fixed -- zsh.
- ;;2001-03-05  Dave Love  <address@hidden>
- ;;
- ;;    * mm-util.el (mm-mime-mule-charset-alist): Fix utf-8 case.
- ;;    Move it after definition of mm-coding-system-p.
- ;;
+       ;;Has been fixed -- zsh.
+       ;;2001-03-05  Dave Love  <address@hidden>
+       ;;
+       ;; * mm-util.el (mm-mime-mule-charset-alist): Fix utf-8 case.
+       ;; Move it after definition of mm-coding-system-p.
+       ;;
  2001-03-01  Dave Love  <address@hidden>
  
 -      * mm-util.el (mm-inhibit-file-name-handlers): Add
 -      image-file-handler.
 +      * mm-util.el (mm-inhibit-file-name-handlers):
 +      Add image-file-handler.
  
  2001-02-11  Dave Love  <address@hidden>
  
diff --cc lisp/mh-e/ChangeLog
index 242c8f0,0e28a27..d94cb99
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@@ -1,8 -1,8 +1,8 @@@
  2014-10-20  Glenn Morris  <address@hidden>
  
 -      * Version 24.4 released.
 +      * Merge in all changes up to 24.4 release.
  
- 2014-09-30  Bill Wohler        <address@hidden>
+ 2014-09-30  Bill Wohler  <address@hidden>
  
        Release MH-E version 8.6.
  
diff --cc lisp/progmodes/python.el
index 9680a4a,48d80b9..b99e195
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@@ -2113,11 -2092,19 +2121,13 @@@ uniqueness for different types of confi
    (let ((process-environment (append
                                python-shell-process-environment
                                process-environment nil))
 -        (virtualenv (if python-shell-virtualenv-path
 -                        (directory-file-name python-shell-virtualenv-path)
 +        (virtualenv (if python-shell-virtualenv-root
 +                        (directory-file-name python-shell-virtualenv-root)
                        nil)))
+     (when python-shell-unbuffered
+       (setenv "PYTHONUNBUFFERED" "1"))
      (when python-shell-extra-pythonpaths
 -      (setenv "PYTHONPATH"
 -              (format "%s%s%s"
 -                      (mapconcat 'identity
 -                                 python-shell-extra-pythonpaths
 -                                 path-separator)
 -                      path-separator
 -                      (or (getenv "PYTHONPATH") ""))))
 +      (setenv "PYTHONPATH" (python-shell-calculate-pythonpath)))
      (if (not virtualenv)
          process-environment
        (setenv "PYTHONHOME" nil)
diff --cc src/ChangeLog
index dcb4666,5ecb022..ed111bf
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,21 +1,32 @@@
 -2014-11-27  Eli Zaretskii  <address@hidden>
++2014-11-29  Eli Zaretskii  <address@hidden>
+ 
+       * xdisp.c (handle_single_display_spec): When ignoring a fringe
+       bitmap display, reset the ignore_overlay_strings_at_pos_p flag.
+       (next_element_from_buffer): When done with overlays, reset the
+       ignore_overlay_strings_at_pos_p flag.  (Bug#19201)
+ 
 -2014-11-25  Eli Zaretskii  <address@hidden>
++2014-11-29  Eli Zaretskii  <address@hidden>
+ 
+       * w32fns.c (Fw32_shell_execute): Convert forward slashes in
+       DOCUMENT to backslashes, if DOCUMENT is a file.  (Bug#19141)
+ 
 -2014-11-25  Ulrich Müller  <address@hidden>
++2014-11-29  Ulrich Müller  <address@hidden>
+ 
+       * Makefile.in (temacs$(EXEEXT)): Use consistent flag settings
+       for paxctl and setfattr. Fixes temacs startup failure with
+       grsecurity/PaX enabled Linux kernel (bug#19067).
+ 
++2014-11-29  Ulf Jasper  <address@hidden>
++
++      * nsterm.m (ns_send_appdefined): Check for application defined
++      event on Cocoa (Bug#18993).  Backport from trunk.
++
 +2014-11-27  Oscar Fuentes  <address@hidden>
 +
 +      * src/w32.c: Use MINGW_W64 instead of _W64.
 +
 +      * src/w32heap.c: Likewise.
 +
  2014-11-17  Oscar Fuentes  <address@hidden>
  
        * src/w32.c: Use MINGW_W64 instead of _W64.
diff --cc test/ChangeLog
index d0988e4,0da5f99..c2c2d9b
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,63 -1,15 +1,74 @@@
 -2014-11-22  Fabián Ezequiel Gallina  <address@hidden>
++2014-11-29  Fabián Ezequiel Gallina  <address@hidden>
+ 
+       * automated/python-tests.el
+       (python-shell-calculate-process-environment-4)
+       (python-shell-calculate-process-environment-5): New tests.
+       (python-shell-make-comint-3): Use file-equal-p.
+       (python-shell-get-or-create-process-1)
+       (python-shell-get-or-create-process-2)
+       (python-shell-get-or-create-process-3): Fix interpreter for
+       Windows (Bug#18595).
+ 
 -2014-11-15  Fabián Ezequiel Gallina  <address@hidden>
 +2014-11-21  Ulf Jasper  <address@hidden>
 +
 +      * automated/libxml-tests.el
 +      (libxml-tests--data-comments-preserved): Renamed from
 +      'libxml-tests--data'.
 +      (libxml-tests--data-comments-discarded): New.
 +      (libxml-tests): Check whether 'libxml-parse-xml-region' is
 +      discarding comments correctly.
 +
 +2014-11-17  Michal Nazarewicz  <address@hidden>
 +
 +      * automated/tildify-tests.el (tildify-test-html, tildify-test-xml):
 +      HTML and XML now use no-break space as hard space.  Update tests.
 +      (tildify-test-foreach-ignore-environments)
 +      (tildify-test-foreach-ignore-environments-early-return,
 +      (tildify-test-foreach-region)
 +      (tildify-test-foreach-region-early-return)
 +      (tildify-test-foreach-region-limit-region): New tests of
 +      `tildify-foreach-ignore-environments' and
 +      `tildify--foreach-region' functions.
 +      (with-test-foreach): New helper macro for the above tests.
 +
 +2014-11-17  Glenn Morris  <address@hidden>
 +
 +      * automated/occur-tests.el (occur-test-case, occur-test-create):
 +      In case of failure, show the actual string, rather than just nil.
 +      (occur-tests): Update for apparent change in output re control-chars.
 +
 +2014-11-17  Ulf Jasper  <address@hidden>
 +
 +      * automated/icalendar-tests.el (icalendar-tests--test-export): New
 +      optional parameter `alarms'.
 +      (icalendar-export-alarms): New test for exporting icalendar
 +      alarms.
 +      (icalendar-tests--test-cycle): Let `icalendar-export-alarms' be nil.
 +
 +2014-11-17  Ulf Jasper  <address@hidden>
 +
 +      * automated/icalendar-tests.el (icalendar-tests--test-import):
 +      Mention timezone in doc string.  Clean up.
 +      (icalendar-real-world): Add another test case for no-dst
 +      timezones.
 +
 +2014-11-16  Ulf Jasper  <address@hidden>
 +
 +      * automated/icalendar-tests.el (icalendar--parse-vtimezone): Add
 +      testcase where offsets of standard time and daylight saving time
 +      are equal.
 +      (icalendar-real-world): Fix error in test case.  Expected result
 +      was wrong when offsets of standard time and daylight saving time
 +      were equal.
 +
 +2014-11-16  Fabián Ezequiel Gallina  <address@hidden>
 +
 +      * automated/python-tests.el
 +      (python-shell-calculate-process-environment-2): Fix test.
 +      (python-shell-calculate-process-environment-1)
 +      (python-shell-calculate-process-environment-3): Cleanup.
 +
 +2014-11-16  Fabián Ezequiel Gallina  <address@hidden>
  
        * automated/python-tests.el (python-indent-dedenters-8): New test
        for Bug#18432.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]