]> code.delx.au - gnu-emacs/commit
delx.au / code / gnu-emacs / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: f822480 7c1802f)
Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Sat, 2 Apr 2016 21:51:33 +0000 (14:51 -0700)
committerJohn Wiegley <johnw@newartisans.com>
Sat, 2 Apr 2016 21:51:33 +0000 (14:51 -0700)
commit3d889773617a882fbee5992960cfe18866cddc34
tree97ab033364dc4e00f789b5826a5880a2661e3caatree
parentf82248004d0f5ef84bbe03d83467bb3c43afa765commit | diff
parent7c1802f6ffc2704ba8042c7c1c6faa73dfa210d1commit | diff
Merge from origin/emacs-25

7c1802f * doc/lispref/text.texi (Columns): Remove a nonexistent refer...
9034c50 * doc/man/emacsclient.1: Document +line:column option.
06495c9 Fix rare problems with echo-area display and multiple frames
f99b512 In M-%, avoid making buffer-local binding of text-property-de...
doc/lispref/text.texi diff1 | diff2 | blob | history
lisp/replace.el diff1 | diff2 | blob | history
src/xdisp.c diff1 | diff2 | blob | history