]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:34:04 +0000 (12:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:34:04 +0000 (12:34 -0700)
a094732 * etc/PROBLEMS: Say that HP-UX cc doesn't work.
1925dd9 Fix duplicate wording in Emacs manual
6de8429 * lisp/paren.el (show-paren--default, show-paren-function): A...
2d671fd Fix wording in Emacs manual
a8766a2 Document how to customize input methods
6eb8995 * lisp/net/eww.el (eww-reload): Doc fix.  (Bug#25981)
aceac95 Fix warning message about native completion (Bug#25984)
a314c1f Clarify documentation of 'raise' and 'height' display specs
f366f6e Mention problems with GPaste in PROBLEMS
6e788ef ; etc/PROBLEMS: Explain about the python+libedit problem (Bug...
6406618 Fix doc strings in info.el
c1ed152 ; * src/keyboard.c (Fposn_at_point): Fix last change.
eed9677 Fix doc string of 'posn-at-point'
0d5957e Documentation fix in elisp reference manual

1  2 
doc/emacs/text.texi
doc/lispref/display.texi
etc/PROBLEMS
lisp/info.el
lisp/net/eww.el
lisp/paren.el
lisp/progmodes/python.el
src/keyboard.c

Simple merge
Simple merge
diff --cc etc/PROBLEMS
Simple merge
diff --cc lisp/info.el
Simple merge
diff --cc lisp/net/eww.el
Simple merge
diff --cc lisp/paren.el
Simple merge
Simple merge
diff --cc src/keyboard.c
Simple merge