From: Glenn Morris <rgm@gnu.org>
Date: Sat, 4 Oct 2014 07:05:21 +0000 (-0700)
Subject: Merge from emacs-24; up to 2014-07-20T16:14:58Z!dmantipov@yandex.ru
X-Git-Tag: emacs-25.0.90~2635^2~679^2~138
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/10501882f7c23525c14f3f4712ce34f7fe335864

Merge from emacs-24; up to 2014-07-20T16:14:58Z!dmantipov@yandex.ru
---

10501882f7c23525c14f3f4712ce34f7fe335864
diff --cc doc/misc/ChangeLog
index 270ab48bcd,9c3ca5dd12..7ce5941d28
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,9 -1,13 +1,13 @@@
+ 2014-10-04  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* vip.texi (Other Vi Commands): Markup fix.
+ 
 -2014-10-02  Bastien Guerry  <bzg@gnu.org>
 +2014-10-03  Bastien Guerry  <bzg@gnu.org>
  
 -	* org.texi (Key bindings and useful functions): Fix typo.  Use the
 -	correct function's name.
 +	* org.texi (Key bindings and useful functions): Fix typo.
 +	Use the correct function's name.
  
 -2014-10-02  Michael Brand  <michael.ch.brand@gmail.com>
 +2014-10-03  Michael Brand  <michael.ch.brand@gmail.com>
  
  	* org.texi (Formula syntax for Calc): Add `f-1' to TBLFM example
  	about `nan'.
diff --cc lisp/ChangeLog
index 75dac546c0,5eb29577c9..375bfcf45d
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,34 -1,8 +1,39 @@@
+ 2014-10-04  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* frame.el (frame-monitor-attributes)
+ 	(display-monitor-attributes-list): Doc fixes.
+ 
 +2014-10-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +	Merge trivially safe differences from standalone CC-mode.
 +	* progmodes/cc-mode.el (c-initialize-cc-mode): Don't quote a symbol
 +	just to then pass it to `symbol-value'.
 +	(prog-mode): Provide fallback definition, if needed.
 +	* progmodes/cc-langs.el: Always load `cl'.  Don't load `cl-lib'.
 +	Remove "cl-" prefix accordingly.
 +	* progmodes/cc-fonts.el (c-font-lock-invalid-string): Use integerp or
 +	characterp depending on the type of characters.
 +	(c-font-lock-enum-tail): Remove unused var `start'.
 +	* progmodes/cc-engine.el: Load CL at compile-time.
 +	(c-declare-lang-variables): Use mapcan.
 +	(c-append-to-state-cache): Remove unused var `ce+1'.
 +	(c-parse-state-state): Make buffer-local.
 +	(c-ssb-lit-begin): Remove unused var `pps-end-pos'.
 +	(c-just-after-func-arglist-p): Remove unused var `end'.
 +	* progmodes/cc-defs.el: Load cc-fix if delete-dups is undefined.
 +	(c-<-as-paren-syntax, c->-as-paren-syntax): Move definition earlier.
 +	(c-make-keywords-re): Use delete-dups.
 +	(c-get-current-file): Avoid file-name-base.
 +	* progmodes/cc-cmds.el (c-electric-lt-gt): Remove unused var
 +	`close-paren-inserted'.
 +	* progmodes/cc-awk.el (c-forward-sws): Remove unused declaration.
 +
 +	* progmodes/python.el: Avoid building unneeded markers.
 +	(python-font-lock-keywords, python-indent-dedent-line)
 +	(python-fill-paren, python-shell-completion-complete-or-indent):
 +	Prefer point over point-marker.
 +	(inferior-python-mode): Remove redundant completion settings.
 +
  2014-10-03  Dmitry Gutov  <dgutov@yandex.ru>
  
  	* vc/vc-svn.el (vc-svn-ignore-completion-table): Implement.